February 2024 - Kernel - mailweb.openeuler.org

[PATCH OLK-5.10 v3 0/4] tracing: Backport bugfixes
by Zheng Yejian 07 Feb '24

07 Feb '24

v2 -> v3: - Fix checkdepend failed v1 -> v2: - Fix checkformat failed Steven Rostedt (Google) (3): tracing: Increase trace array ref count on enable and filter files tracing: Have trace_event_file have ref counters tracing: Have event inject files inc the trace array ref count Zheng Yejian (1): tracing: Fix uaf issue when open the hist or hist_debug file include/linux/trace_events.h | 4 +++ kernel/trace/trace.c | 48 +++++++++++++++++++++++++++++ kernel/trace/trace.h | 6 ++++ kernel/trace/trace_events.c | 49 +++++++++++++++++++----------- kernel/trace/trace_events_filter.c | 3 ++ kernel/trace/trace_events_hist.c | 12 +++++--- kernel/trace/trace_events_inject.c | 3 +- 7 files changed, 103 insertions(+), 22 deletions(-) -- 2.25.1

2 5

[PATCH OLK-6.6 v3 0/8] kabi: Reserve KABI slots for fs module
by Long Li 07 Feb '24

07 Feb '24

Add KABI slots for fs module struct. Long Li (8): fscrypt: kabi: Reserve KABI slots for fscrypt_operations struct fanotify: kabi: Reserve KABI slots for fsnotify_* struct kernfs: kabi: Reserve KABI slots for kernfs_* struct xattr: kabi: Reserve KABI slots for xattr_handler struct fs: kabi: Reserve KABI slots for nameidata struct dax: kabi: Reserve KABI slots for dax_* struct profs: kabi: Reserve KABI slots for proc_ops struct sysfs: kabi: Reserve KABI slots for bin_attribute struct drivers/dax/super.c | 9 +++++++++ fs/kernfs/file.c | 4 ++++ fs/kernfs/kernfs-internal.h | 6 ++++++ fs/namei.c | 2 ++ include/linux/dax.h | 9 +++++++++ include/linux/fscrypt.h | 4 ++++ include/linux/fsnotify_backend.h | 14 ++++++++++++++ include/linux/kernfs.h | 10 ++++++++++ include/linux/proc_fs.h | 5 +++++ include/linux/sysfs.h | 2 ++ include/linux/xattr.h | 5 ++++- 11 files changed, 69 insertions(+), 1 deletion(-) -- 2.31.1

2 9

[PATCH OLK-6.6 v3] block: reserve kabi space for general block layer structures
by Yu Kuai 07 Feb '24

07 Feb '24

hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I8ZW7Z CVE: NA -------------------------------- | struture | size | reserves | | ----------------------------- | ------------ | -------- | | bio_integrity_payload | 96 | 4 | | bio_set | 488 | 3 | | blk_integrity_profile | 40 | 3 | | request | dynamic | 8 | | blk_mq_hw_ctx | 480 + 16对齐 | 2 | | blk_mq_tag_set | 168 | 11 | | blk_mq_queue_data | 16 | 2 | | blk_mq_ops | 144 | 6 | | blk_mq_tags | 184 | 9 | | block_device | 936 | 11 | | bio | dynamic | 8 | | blk_integrity | 16 | 2 | | gendisk | 872 | 11 | | queue_limits | 120 | 8 | | blk_independent_access_range | 80 | 2 | | blk_independent_access_ranges | 72 | 3 | | request_queue | 936 | 8 | | blk_plug | 40 | 3 | | block_device_operations | 144 | 6 | | blk_holder_ops | 16 | 6 | | io_comp_batch | 24 | 1 | Signed-off-by: Yu Kuai <yukuai3(a)huawei.com> --- include/linux/bio.h | 11 ++++++++ include/linux/blk-integrity.h | 4 +++ include/linux/blk-mq.h | 44 +++++++++++++++++++++++++++++ include/linux/blk_types.h | 21 ++++++++++++++ include/linux/blkdev.h | 52 +++++++++++++++++++++++++++++++++++ 5 files changed, 132 insertions(+) diff --git a/include/linux/bio.h b/include/linux/bio.h index 41d417ee1349..ebb008300489 100644 --- a/include/linux/bio.h +++ b/include/linux/bio.h @@ -9,6 +9,7 @@ /* struct bio, bio_vec and BIO_* flags are defined in blk_types.h */ #include <linux/blk_types.h> #include <linux/uio.h> +#include <linux/kabi.h> #define BIO_MAX_VECS 256U @@ -343,6 +344,12 @@ struct bio_integrity_payload { struct work_struct bip_work; /* I/O completion */ struct bio_vec *bip_vec; + + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) + KABI_RESERVE(4) + struct bio_vec bip_inline_vecs[];/* embedded bvec array */ }; @@ -702,6 +709,10 @@ struct bio_set { * Hot un-plug notifier for the per-cpu cache, if used */ struct hlist_node cpuhp_dead; + + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) }; static inline bool bioset_initialized(struct bio_set *bs) diff --git a/include/linux/blk-integrity.h b/include/linux/blk-integrity.h index 378b2459efe2..1eec355e999b 100644 --- a/include/linux/blk-integrity.h +++ b/include/linux/blk-integrity.h @@ -33,6 +33,10 @@ struct blk_integrity_profile { integrity_prepare_fn *prepare_fn; integrity_complete_fn *complete_fn; const char *name; + + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) }; #ifdef CONFIG_BLK_DEV_INTEGRITY diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h index 9dfee0644f9c..2f7d8aeec4a7 100644 --- a/include/linux/blk-mq.h +++ b/include/linux/blk-mq.h @@ -189,6 +189,15 @@ struct request { */ rq_end_io_fn *end_io; void *end_io_data; + + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) + KABI_RESERVE(4) + KABI_RESERVE(5) + KABI_RESERVE(6) + KABI_RESERVE(7) + KABI_RESERVE(8) }; static inline enum req_op req_op(const struct request *req) @@ -430,6 +439,9 @@ struct blk_mq_hw_ctx { * q->unused_hctx_list. */ struct list_head hctx_list; + + KABI_RESERVE(1) + KABI_RESERVE(2) }; /** @@ -516,6 +528,18 @@ struct blk_mq_tag_set { struct mutex tag_list_lock; struct list_head tag_list; struct srcu_struct *srcu; + + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) + KABI_RESERVE(4) + KABI_RESERVE(5) + KABI_RESERVE(6) + KABI_RESERVE(7) + KABI_RESERVE(8) + KABI_RESERVE(9) + KABI_RESERVE(10) + KABI_RESERVE(11) }; /** @@ -527,6 +551,9 @@ struct blk_mq_tag_set { struct blk_mq_queue_data { struct request *rq; bool last; + + KABI_RESERVE(1) + KABI_RESERVE(2) }; typedef bool (busy_tag_iter_fn)(struct request *, void *); @@ -646,6 +673,13 @@ struct blk_mq_ops { */ void (*show_rq)(struct seq_file *m, struct request *rq); #endif + + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) + KABI_RESERVE(4) + KABI_RESERVE(5) + KABI_RESERVE(6) }; enum { @@ -751,6 +785,16 @@ struct blk_mq_tags { * request pool */ spinlock_t lock; + + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) + KABI_RESERVE(4) + KABI_RESERVE(5) + KABI_RESERVE(6) + KABI_RESERVE(7) + KABI_RESERVE(8) + KABI_RESERVE(9) }; static inline struct request *blk_mq_tag_to_rq(struct blk_mq_tags *tags, diff --git a/include/linux/blk_types.h b/include/linux/blk_types.h index f571b45eba19..4630a89653a3 100644 --- a/include/linux/blk_types.h +++ b/include/linux/blk_types.h @@ -78,6 +78,17 @@ struct block_device { * path */ struct device bd_device; + + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) + KABI_RESERVE(4) + KABI_RESERVE(5) + KABI_RESERVE(6) + KABI_RESERVE(7) + KABI_RESERVE(8) + KABI_RESERVE(9) + KABI_RESERVE(10) } __randomize_layout; #define bdev_whole(_bdev) \ @@ -319,6 +330,16 @@ struct bio { struct bio_set *bi_pool; + + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) + KABI_RESERVE(4) + KABI_RESERVE(5) + KABI_RESERVE(6) + KABI_RESERVE(7) + KABI_RESERVE(8) + /* * We can inline a number of vecs at the end of the bio, to avoid * double allocations for a small number of bio_vecs. This member diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index d8a0ee46ba37..06c81d2be0c0 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -110,6 +110,9 @@ struct blk_integrity { unsigned char tuple_size; unsigned char interval_exp; unsigned char tag_size; + + KABI_RESERVE(1) + KABI_RESERVE(2) }; typedef unsigned int __bitwise blk_mode_t; @@ -211,6 +214,18 @@ struct gendisk { * devices that do not have multiple independent access ranges. */ struct blk_independent_access_ranges *ia_ranges; + + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) + KABI_RESERVE(4) + KABI_RESERVE(5) + KABI_RESERVE(6) + KABI_RESERVE(7) + KABI_RESERVE(8) + KABI_RESERVE(9) + KABI_RESERVE(10) + KABI_RESERVE(11) }; static inline bool disk_live(struct gendisk *disk) @@ -328,6 +343,15 @@ struct queue_limits { * due to possible offsets. */ unsigned int dma_alignment; + + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) + KABI_RESERVE(4) + KABI_RESERVE(5) + KABI_RESERVE(6) + KABI_RESERVE(7) + KABI_RESERVE(8) }; typedef int (*report_zones_cb)(struct blk_zone *zone, unsigned int idx, @@ -370,12 +394,20 @@ struct blk_independent_access_range { struct kobject kobj; sector_t sector; sector_t nr_sectors; + + KABI_RESERVE(1) + KABI_RESERVE(2) }; struct blk_independent_access_ranges { struct kobject kobj; bool sysfs_registered; unsigned int nr_ia_ranges; + + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) + struct blk_independent_access_range ia_range[]; }; @@ -980,6 +1012,10 @@ struct blk_plug { bool has_elevator; struct list_head cb_list; /* md requires an unplug callback */ + + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) }; struct blk_plug_cb; @@ -1412,6 +1448,13 @@ struct block_device_operations { * driver. */ int (*alternative_gpt_sector)(struct gendisk *disk, sector_t *sector); + + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) + KABI_RESERVE(4) + KABI_RESERVE(5) + KABI_RESERVE(6) }; #ifdef CONFIG_COMPAT @@ -1475,6 +1518,13 @@ struct blk_holder_ops { * Sync the file system mounted on the block device. */ void (*sync)(struct block_device *bdev); + + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) + KABI_RESERVE(4) + KABI_RESERVE(5) + KABI_RESERVE(6) }; extern const struct blk_holder_ops fs_holder_ops; @@ -1551,6 +1601,8 @@ struct io_comp_batch { struct request *req_list; bool need_ts; void (*complete)(struct io_comp_batch *); + + KABI_RESERVE(1) }; #define DEFINE_IO_COMP_BATCH(name) struct io_comp_batch name = { } -- 2.39.2

2 1

[PATCH openEuler-1.0-LTS v4 0/3] CVE-2023-52340
by Ziyang Xuan 07 Feb '24

07 Feb '24

The patchset for CVE-2023-52340. v4: - Resend. v3: - Fix kabi broken. v2: - Fix comment header. Jon Maxwell (2): ipv6: remove max_size check inline with ipv4 ipv6: Document that max_size sysctl is deprecated Ziyang Xuan (1): ipv6: fix kabi broken in struct dst_ops Documentation/networking/ip-sysctl.txt | 3 +++ net/ipv6/route.c | 10 ++++------ 2 files changed, 7 insertions(+), 6 deletions(-) -- 2.25.1

2 4

[PATCH v2 OLK-6.6 0/2] Support feature TWED
by lishusen 07 Feb '24

07 Feb '24

Configure hcr_el2 with parameter twe_delay when TWED is enabled Jingyi Wang (1): KVM: arm64: Make use of TWED feature Zengruan Ye (1): KVM: arm64: cpufeature: TWED support detection arch/arm64/Kconfig | 10 ++++++ arch/arm64/configs/openeuler_defconfig | 6 ++++ arch/arm64/include/asm/kvm_arm.h | 7 ++++ arch/arm64/include/asm/kvm_emulate.h | 44 ++++++++++++++++++++++++++ arch/arm64/include/asm/kvm_host.h | 5 +++ arch/arm64/kernel/cpufeature.c | 9 ++++++ arch/arm64/kvm/arm.c | 10 ++++++ arch/arm64/tools/cpucaps | 1 + 8 files changed, 92 insertions(+) -- 2.33.0

2 3

[PATCH v2 OLK-6.6 0/2] Support feature TWED
by lishusen 07 Feb '24

07 Feb '24

Configure hcr_el2 with parameter twe_delay when TWED is enabled Jingyi Wang (1): KVM: arm64: Make use of TWED feature Zengruan Ye (1): arm64: cpufeature: TWED support detection arch/arm64/Kconfig | 10 ++++++ arch/arm64/configs/openeuler_defconfig | 6 ++++ arch/arm64/include/asm/kvm_arm.h | 7 ++++ arch/arm64/include/asm/kvm_emulate.h | 44 ++++++++++++++++++++++++++ arch/arm64/include/asm/kvm_host.h | 5 +++ arch/arm64/kernel/cpufeature.c | 9 ++++++ arch/arm64/kvm/arm.c | 10 ++++++ arch/arm64/tools/cpucaps | 1 + 8 files changed, 92 insertions(+) -- 2.33.0

2 3

[PATCH OLK-5.10 v2 0/2] tracing: Backport bugfix
by Zheng Yejian 07 Feb '24

07 Feb '24

v1 -> v2: - Fix checkformat failed Steven Rostedt (Google) (1): tracing: Increase trace array ref count on enable and filter files Zheng Yejian (1): tracing: Fix uaf issue when open the hist or hist_debug file kernel/trace/trace.c | 33 ++++++++++++++++++++++++++++++++ kernel/trace/trace.h | 3 +++ kernel/trace/trace_events.c | 6 ++++-- kernel/trace/trace_events_hist.c | 12 ++++++++---- 4 files changed, 48 insertions(+), 6 deletions(-) -- 2.25.1

2 3

[openeuler:openEuler-1.0-LTS 21328/21616] drivers/scsi/sssraid/sssraid_os.c:1704:9: error: implicit declaration of function 'for_each_pci_msi_entry'; did you mean 'for_each_msi_entry'?
by kernel test robot 07 Feb '24

07 Feb '24

tree: https://gitee.com/openeuler/kernel.git openEuler-1.0-LTS head: 3a28772f4b29bdda924e9a5d2e3ff1ff1b23fd14 commit: 2e2a4edd9d4a725c5474dc278b090913d9b5bfd5 [21328/21616] SCSI: SSSRAID: Support 3SNIC 3S5XX serial RAID/HBA controllers config: x86_64-randconfig-r053-20240206 (https://download.01.org/0day-ci/archive/20240207/202402070803.9BXgYVmQ-lkp@…) compiler: gcc-12 (Debian 12.2.0-14) 12.2.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240207/202402070803.9BXgYVmQ-lkp@…) If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot <lkp(a)intel.com> | Closes: https://lore.kernel.org/oe-kbuild-all/202402070803.9BXgYVmQ-lkp@intel.com/ All errors (new ones prefixed by >>): drivers/scsi/sssraid/sssraid_os.c: In function 'sssraid_map_queues': >> drivers/scsi/sssraid/sssraid_os.c:1704:9: error: implicit declaration of function 'for_each_pci_msi_entry'; did you mean 'for_each_msi_entry'? [-Werror=implicit-function-declaration] 1704 | for_each_pci_msi_entry(entry, pdev) { | ^~~~~~~~~~~~~~~~~~~~~~ | for_each_msi_entry >> drivers/scsi/sssraid/sssraid_os.c:1704:44: error: expected ';' before '{' token 1704 | for_each_pci_msi_entry(entry, pdev) { | ^~ | ; drivers/scsi/sssraid/sssraid_os.c:1702:22: warning: unused variable 'node_id_array' [-Wunused-variable] 1702 | unsigned int node_id_array[100]; | ^~~~~~~~~~~~~ drivers/scsi/sssraid/sssraid_os.c:1701:28: warning: unused variable 'i' [-Wunused-variable] 1701 | u8 node_count = 0, i; | ^ drivers/scsi/sssraid/sssraid_os.c:1701:12: warning: unused variable 'node_count' [-Wunused-variable] 1701 | u8 node_count = 0, i; | ^~~~~~~~~~ drivers/scsi/sssraid/sssraid_os.c:1700:18: warning: unused variable 'queue' [-Wunused-variable] 1700 | int cpu, queue = 0; | ^~~~~ drivers/scsi/sssraid/sssraid_os.c:1700:13: warning: unused variable 'cpu' [-Wunused-variable] 1700 | int cpu, queue = 0; | ^~~ drivers/scsi/sssraid/sssraid_os.c:1699:31: warning: unused variable 'node_id_last' [-Wunused-variable] 1699 | unsigned int node_id, node_id_last = 0xFFFFFFFF; | ^~~~~~~~~~~~ drivers/scsi/sssraid/sssraid_os.c:1699:22: warning: unused variable 'node_id' [-Wunused-variable] 1699 | unsigned int node_id, node_id_last = 0xFFFFFFFF; | ^~~~~~~ drivers/scsi/sssraid/sssraid_os.c:1698:22: warning: unused variable 'nr_queues' [-Wunused-variable] 1698 | unsigned int nr_queues = tag_set->nr_hw_queues; | ^~~~~~~~~ drivers/scsi/sssraid/sssraid_os.c:1697:31: warning: unused variable 'node_mask' [-Wunused-variable] 1697 | const struct cpumask *node_mask = NULL; | ^~~~~~~~~ drivers/scsi/sssraid/sssraid_os.c:1696:23: warning: unused variable 'map' [-Wunused-variable] 1696 | unsigned int *map = tag_set->mq_map; | ^~~ drivers/scsi/sssraid/sssraid_os.c:1739:1: warning: no return statement in function returning non-void [-Wreturn-type] 1739 | } | ^ cc1: some warnings being treated as errors vim +1704 drivers/scsi/sssraid/sssraid_os.c 1689 1690 static int sssraid_map_queues(struct Scsi_Host *shost) 1691 { 1692 struct sssraid_ioc *sdioc = shost_priv(shost); 1693 struct pci_dev *pdev = sdioc->pdev; 1694 struct msi_desc *entry = NULL; 1695 struct blk_mq_tag_set *tag_set = &shost->tag_set; 1696 unsigned int *map = tag_set->mq_map; 1697 const struct cpumask *node_mask = NULL; 1698 unsigned int nr_queues = tag_set->nr_hw_queues; 1699 unsigned int node_id, node_id_last = 0xFFFFFFFF; 1700 int cpu, queue = 0; 1701 u8 node_count = 0, i; 1702 unsigned int node_id_array[100]; 1703 > 1704 for_each_pci_msi_entry(entry, pdev) { 1705 struct list_head *msi_list = &pdev->dev.msi_list; 1706 1707 if (list_is_last(msi_list, &entry->list)) 1708 goto get_next_numa_node; 1709 1710 if (entry->irq) { 1711 node_mask = entry->affinity; 1712 1713 cpu = cpumask_first(node_mask); 1714 node_id = cpu_to_node(cpu); 1715 if (node_id_last == node_id) 1716 continue; 1717 1718 for (i = 0; i < node_count; i++) { 1719 if (node_id == node_id_array[i]) 1720 goto get_next_numa_node; 1721 } 1722 node_id_array[node_count++] = node_id; 1723 node_id_last = node_id; 1724 } 1725 get_next_numa_node: 1726 continue; 1727 } 1728 1729 for (i = 0; i < node_count; i++) { 1730 node_mask = cpumask_of_node(node_id_array[i]); 1731 dbgprint(sdioc, "NUMA_node = %d\n", node_id_array[i]); 1732 for_each_cpu(cpu, node_mask) { 1733 map[cpu] = (queue < nr_queues) ? queue++ : 0; 1734 dbgprint(sdioc, "map[%d] = %d\n", cpu, map[cpu]); 1735 } 1736 } 1737 1738 return 0; 1739 } 1740 -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki

1 0

[PATCH OLK-6.6 0/3] hugetlb accounting
by Chen Ridong 07 Feb '24

07 Feb '24

Nhat Pham (3): memcontrol: add helpers for hugetlb memcg accounting memcontrol: only transfer the memcg data for migration hugetlb: memcg: account hugetlb-backed memory in memory controller Documentation/admin-guide/cgroup-v2.rst | 29 +++++ include/linux/cgroup-defs.h | 5 + include/linux/memcontrol.h | 37 +++++++ kernel/cgroup/cgroup.c | 15 ++- mm/filemap.c | 2 +- mm/hugetlb.c | 38 +++++-- mm/memcontrol.c | 141 +++++++++++++++++++++--- mm/migrate.c | 3 +- 8 files changed, 241 insertions(+), 29 deletions(-) -- 2.34.1

2 4

[openeuler:openEuler-1.0-LTS 7838/21616] drivers/net/phy/.tmp_swphy.o: warning: objtool: missing symbol for section .text
by kernel test robot 07 Feb '24

07 Feb '24

tree: https://gitee.com/openeuler/kernel.git openEuler-1.0-LTS head: 3a28772f4b29bdda924e9a5d2e3ff1ff1b23fd14 commit: d4bdc26bcd632cee393b5171345d5fa6293fe42b [7838/21616] include/asm-generic/bug.h: fix "cut here" for WARN_ON for __WARN_TAINT architectures config: x86_64-buildonly-randconfig-003-20240205 (https://download.01.org/0day-ci/archive/20240207/202402070744.YorkcsyM-lkp@…) compiler: gcc-11 (Debian 11.3.0-12) 11.3.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240207/202402070744.YorkcsyM-lkp@…) If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot <lkp(a)intel.com> | Closes: https://lore.kernel.org/oe-kbuild-all/202402070744.YorkcsyM-lkp@intel.com/ All warnings (new ones prefixed by >>): >> drivers/net/phy/.tmp_swphy.o: warning: objtool: missing symbol for section .text -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki

1 0

2024

2023

2022

2021

2020

2019

Kernel February 2024