- Kernel - mailweb.openeuler.org

[PATCH openEuler-1.0-LTS 0/2] dhugetlb: skip unexpected migration
by Liu Shixin 26 Jan '24

26 Jan '24

Fix unexpected migration of pages from dynamic hugetlb pool. Liu Shixin (2): dhugetlb: introduce page_belong_to_dynamic_hugetlb() function dhugetlb: skip unexpected migration include/linux/hugetlb.h | 5 +++++ include/linux/migrate.h | 6 +++++- mm/compaction.c | 3 +++ mm/hugetlb.c | 16 +++++++++++----- mm/mempolicy.c | 10 ++++++++-- mm/migrate.c | 3 +++ mm/page_isolation.c | 3 ++- 7 files changed, 37 insertions(+), 9 deletions(-) -- 2.25.1

2 3

[PATCH OLK-6.6] arm64: topology: Support PHYTIUM CPU
by Zeng Heng 26 Jan '24

26 Jan '24

From: Hanjun Guo <guohanjun(a)huawei.com> hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I8Z0KI CVE: NA --------------------------- Add the support for PHYTIUM topology detect, it's better use PPTT ACPI table to report the topology, but we can live with it at now. Signed-off-by: Hanjun Guo <guohanjun(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> Reviewed-by: Xie XiuQi <xiexiuqi(a)huawei.com> Signed-off-by: Zheng Zengkai <zhengzengkai(a)huawei.com> Conflicts: drivers/base/arch_topology.c Signed-off-by: Zeng Heng <zengheng4(a)huawei.com> --- arch/arm64/include/asm/cputype.h | 1 + drivers/base/arch_topology.c | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/arch/arm64/include/asm/cputype.h b/arch/arm64/include/asm/cputype.h index 202588ad92e8..8629961ad39b 100644 --- a/arch/arm64/include/asm/cputype.h +++ b/arch/arm64/include/asm/cputype.h @@ -60,6 +60,7 @@ #define ARM_CPU_IMP_FUJITSU 0x46 #define ARM_CPU_IMP_HISI 0x48 #define ARM_CPU_IMP_APPLE 0x61 +#define ARM_CPU_IMP_PHYTIUM 0x70 #define ARM_CPU_IMP_AMPERE 0xC0 #define ARM_CPU_PART_AEM_V8 0xD0F diff --git a/drivers/base/arch_topology.c b/drivers/base/arch_topology.c index b741b5ba82bd..0db635e94492 100644 --- a/drivers/base/arch_topology.c +++ b/drivers/base/arch_topology.c @@ -862,6 +862,14 @@ void store_cpu_topology(unsigned int cpuid) cpuid_topo->core_id = cpuid; cpuid_topo->package_id = cpu_to_node(cpuid); +#if defined(CONFIG_ARM64) + if (read_cpuid_implementor() == ARM_CPU_IMP_PHYTIUM) { + cpuid_topo->thread_id = 0; + cpuid_topo->core_id = cpuid; + cpuid_topo->package_id = 0; + } +#endif + pr_debug("CPU%u: package %d core %d thread %d\n", cpuid, cpuid_topo->package_id, cpuid_topo->core_id, cpuid_topo->thread_id); -- 2.25.1

2 1

[openeuler:OLK-6.6 691/2767] binfmt_elf32.c:undefined reference to `arch_elf_adjust_prot'
by kernel test robot 25 Jan '24

25 Jan '24

tree: https://gitee.com/openeuler/kernel.git OLK-6.6 head: 6188d51075eac8cf7cf6909fec1e73fbc51aa29b commit: 7de3ab4c3dd938fae3626a6344830b018eb7ba4f [691/2767] arm64: introduce binfmt_elf32.c config: arm64-randconfig-004-20240125 (https://download.01.org/0day-ci/archive/20240125/202401252015.eYqQYSXZ-lkp@…) compiler: aarch64-linux-gcc (GCC) 13.2.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240125/202401252015.eYqQYSXZ-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/202401252015.eYqQYSXZ-lkp@intel.com/ All errors (new ones prefixed by >>): >> aarch64-linux-ld: Unexpected GOT/PLT entries detected! >> aarch64-linux-ld: Unexpected run-time procedure linkages detected! aarch64-linux-ld: arch/arm64/kernel/binfmt_elf32.o: in function `load_elf_interp': >> binfmt_elf32.c:(.text+0xa70): undefined reference to `arch_elf_adjust_prot' aarch64-linux-ld: arch/arm64/kernel/binfmt_elf32.o: in function `load_elf_binary': binfmt_elf32.c:(.text+0x1d88): undefined reference to `arch_elf_adjust_prot' -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki

1 0

[openeuler:OLK-6.6 2629/2767] include/linux/resctrl.h:291: undefined reference to `lockdep_is_cpus_held'
by kernel test robot 25 Jan '24

25 Jan '24

tree: https://gitee.com/openeuler/kernel.git OLK-6.6 head: 6188d51075eac8cf7cf6909fec1e73fbc51aa29b commit: c054efea286659a6504fdeafc0a611c6a3b124cc [2629/2767] x86/resctrl: Claim get_domain_from_cpu() for resctrl config: x86_64-randconfig-012-20240125 (https://download.01.org/0day-ci/archive/20240125/202401252038.VOiTn1TA-lkp@…) compiler: gcc-9 (Debian 9.3.0-22) 9.3.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240125/202401252038.VOiTn1TA-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/202401252038.VOiTn1TA-lkp@intel.com/ All errors (new ones prefixed by >>): ld: vmlinux.o: in function `resctrl_get_domain_from_cpu': >> include/linux/resctrl.h:291: undefined reference to `lockdep_is_cpus_held' >> ld: include/linux/resctrl.h:291: undefined reference to `lockdep_is_cpus_held' >> ld: include/linux/resctrl.h:291: undefined reference to `lockdep_is_cpus_held' vim +291 include/linux/resctrl.h 274 275 /* 276 * Caller must be in a RCU read-side critical section, or hold the 277 * cpuhp read lock to prevent the struct rdt_domain being freed. 278 */ 279 static inline struct rdt_domain * 280 resctrl_get_domain_from_cpu(int cpu, struct rdt_resource *r) 281 { 282 struct rdt_domain *d; 283 284 /* 285 * Walking r->domains, ensure it can't race with cpuhp. 286 * Because this is called via IPI by rdt_ctrl_update(), assertions 287 * about locks this thread holds will lead to false positives. Check 288 * someone is holding the CPUs lock. 289 */ 290 if (IS_ENABLED(CONFIG_LOCKDEP)) > 291 lockdep_is_cpus_held(); 292 293 list_for_each_entry_rcu(d, &r->domains, list) { 294 /* Find the domain that contains this CPU */ 295 if (cpumask_test_cpu(cpu, &d->cpu_mask)) 296 return d; 297 } 298 299 return NULL; 300 } 301 -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki

1 0

[PATCH OLK-6.6 0/1] arm64: Turn on CONFIG_IPI_AS_NMI in openeuler_defconfig
by Liao Chen 25 Jan '24

25 Jan '24

This patch turns on CONFIG_IPI_AS_NMI in openeuler_defconfig, which follows upstream commit 6188d51075ea (arm64: Add CONFIG_IPI_AS_NMI to IPI as NMI feature). CONFIG_IPI_AS_NMI=y Liao Chen (1): arm64: Turn on CONFIG_IPI_AS_NMI in openeuler_defconfig arch/arm64/configs/openeuler_defconfig | 1 + 1 file changed, 1 insertion(+) -- 2.34.1

1 0

[PATCH OLK-5.10] mm/dynamic_hugetlb: skip unexpected migration
by Liu Shixin 25 Jan '24

25 Jan '24

hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I8YUPE CVE: NA -------------------------------- With dynamic hugetlb feature, some memory is isolated in the dynamic pool. When try to compact memory, the kcompactd thread will scan all memory, althougt some memory is belonging to dynamic pool, kcompactd still try to migrate them. After migration, these memory will free to dynamic pool rather than buddy system, which results the free pages in buddy system decreased. Since it is unnecessary to compact the memory in the dynamic pool, skip migrate them to fix the problem. The same problem also existed in alloc_contig_range(), offline_pages() and numa balancing. Skip it again in these three scenarios. In addition to this, we have to consider the migration of hugepage, if a hugepage is from dynamic pool, we should not allow to migrate it. Signed-off-by: Liu Shixin <liushixin2(a)huawei.com> --- include/linux/dynamic_hugetlb.h | 4 ++-- mm/compaction.c | 4 ++++ mm/migrate.c | 7 +++++++ mm/page_isolation.c | 4 +++- 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/include/linux/dynamic_hugetlb.h b/include/linux/dynamic_hugetlb.h index eff31669e210..06b20a24dfe6 100644 --- a/include/linux/dynamic_hugetlb.h +++ b/include/linux/dynamic_hugetlb.h @@ -184,12 +184,12 @@ static inline void free_huge_page_to_dhugetlb_pool(struct page *page, bool restore_reserve) { } +#endif + static inline bool page_belong_to_dynamic_hugetlb(struct page *page) { return false; } -#endif - #endif /* CONFIG_DYNAMIC_HUGETLB */ #endif /* __LINUX_DYNAMIC_HUGETLB_H */ diff --git a/mm/compaction.c b/mm/compaction.c index bdcde6ea7f97..754734a649d5 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -23,6 +23,7 @@ #include <linux/freezer.h> #include <linux/page_owner.h> #include <linux/psi.h> +#include <linux/dynamic_hugetlb.h> #include "internal.h" #ifdef CONFIG_COMPACTION @@ -1862,6 +1863,9 @@ static isolate_migrate_t isolate_migratepages(struct compact_control *cc) if (!page) continue; + if (page_belong_to_dynamic_hugetlb(page)) + continue; + /* * If isolation recently failed, do not retry. Only check the * pageblock once. COMPACT_CLUSTER_MAX causes a pageblock diff --git a/mm/migrate.c b/mm/migrate.c index 9d40b1264a8b..c8491a744e8c 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -49,6 +49,7 @@ #include <linux/sched/mm.h> #include <linux/ptrace.h> #include <linux/oom.h> +#include <linux/dynamic_hugetlb.h> #include <asm/tlbflush.h> @@ -1611,6 +1612,9 @@ struct page *alloc_migration_target(struct page *page, unsigned long private) if (PageHuge(page)) { struct hstate *h = page_hstate(compound_head(page)); + if (page_belong_to_dynamic_hugetlb(page)) + return NULL; + gfp_mask = htlb_modify_alloc_mask(h, gfp_mask); return alloc_huge_page_nodemask(h, nid, mtc->nmask, gfp_mask); } @@ -2088,6 +2092,9 @@ static int numamigrate_isolate_page(pg_data_t *pgdat, struct page *page) if (!migrate_balanced_pgdat(pgdat, compound_nr(page))) return 0; + if (page_belong_to_dynamic_hugetlb(page)) + return 0; + if (isolate_lru_page(page)) return 0; diff --git a/mm/page_isolation.c b/mm/page_isolation.c index bddf788f45bf..48a0ee9cef0a 100644 --- a/mm/page_isolation.c +++ b/mm/page_isolation.c @@ -10,6 +10,7 @@ #include <linux/hugetlb.h> #include <linux/page_owner.h> #include <linux/migrate.h> +#include <linux/dynamic_hugetlb.h> #include "internal.h" #define CREATE_TRACE_POINTS @@ -195,7 +196,8 @@ int start_isolate_page_range(unsigned long start_pfn, unsigned long end_pfn, pfn += pageblock_nr_pages) { page = __first_valid_page(pfn, pageblock_nr_pages); if (page) { - if (set_migratetype_isolate(page, migratetype, flags)) { + if (page_belong_to_dynamic_hugetlb(page) || + set_migratetype_isolate(page, migratetype, flags)) { undo_pfn = pfn; goto undo; } -- 2.25.1

2 1

[PATCH OLK-6.6 0/2] Expose swapcache stat for memcg v1
by Liu Shixin 25 Jan '24

25 Jan '24

The first patch expose swapcache stat for memcg v1, the second patch remote unused do_memsw_account() in memcg1_stat_format(). Liu Shixin (2): memcg: expose swapcache stat for memcg v1 memcg: remove unused do_memsw_account in memcg1_stat_format Documentation/admin-guide/cgroup-v1/memory.rst | 1 + mm/memcontrol.c | 15 ++++++++------- 2 files changed, 9 insertions(+), 7 deletions(-) -- 2.25.1

1 2

[openeuler:openEuler-1.0-LTS 14777/21569] drivers/scsi/huawei/hifc/hifc_module.c:9:46: error: positional initialization of field in 'struct' declared with 'designated_init' attribute
by kernel test robot 25 Jan '24

25 Jan '24

tree: https://gitee.com/openeuler/kernel.git openEuler-1.0-LTS head: c147f19e06e08b90efa3dda49bc4dcaf06424518 commit: 7fc993d55d1b54ae40e29dfac825a18d04d644c6 [14777/21569] scsi/hifc: add hifc driver FC service module config: x86_64-randconfig-015-20240125 (https://download.01.org/0day-ci/archive/20240125/202401251601.vlpK5QPa-lkp@…) compiler: gcc-7 (Ubuntu 7.5.0-6ubuntu2) 7.5.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240125/202401251601.vlpK5QPa-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/202401251601.vlpK5QPa-lkp@intel.com/ All errors (new ones prefixed by >>): >> drivers/scsi/huawei/hifc/hifc_module.c:9:46: error: positional initialization of field in 'struct' declared with 'designated_init' attribute [-Werror=designated-init] struct unf_cm_handle_op_s hifc_cm_handle = { 0 }; ^ drivers/scsi/huawei/hifc/hifc_module.c:9:46: note: (near initialization for 'hifc_cm_handle') >> drivers/scsi/huawei/hifc/hifc_module.c:9:46: error: invalid initializer drivers/scsi/huawei/hifc/hifc_module.c:9:46: note: (near initialization for 'hifc_cm_handle.<anonymous>') cc1: some warnings being treated as errors vim +9 drivers/scsi/huawei/hifc/hifc_module.c c27fa1ef544cd5 Chenguangli 2020-11-16 8 c27fa1ef544cd5 Chenguangli 2020-11-16 @9 struct unf_cm_handle_op_s hifc_cm_handle = { 0 }; c27fa1ef544cd5 Chenguangli 2020-11-16 10 unsigned int dif_sgl_mode; c27fa1ef544cd5 Chenguangli 2020-11-16 11 unsigned int max_speed = HIFC_SPEED_32G; c27fa1ef544cd5 Chenguangli 2020-11-16 12 unsigned int accum_db_num = 1; c27fa1ef544cd5 Chenguangli 2020-11-16 13 unsigned int dif_type = 0x1; c27fa1ef544cd5 Chenguangli 2020-11-16 14 unsigned int wqe_page_size = 4096; c27fa1ef544cd5 Chenguangli 2020-11-16 15 unsigned int wqe_pre_load = 6; c27fa1ef544cd5 Chenguangli 2020-11-16 16 unsigned int combo_length_kb = 8; c27fa1ef544cd5 Chenguangli 2020-11-16 17 unsigned int cos_bit_map = 0x1f; c27fa1ef544cd5 Chenguangli 2020-11-16 18 unsigned int hifc_dif_type; c27fa1ef544cd5 Chenguangli 2020-11-16 19 unsigned int hifc_dif_enable; c27fa1ef544cd5 Chenguangli 2020-11-16 20 unsigned char hifc_guard; c27fa1ef544cd5 Chenguangli 2020-11-16 21 :::::: The code at line 9 was first introduced by commit :::::: c27fa1ef544cd563228c1e13f1a09a565cafc9d5 scsi/hifc: add hifc driver scsi module :::::: TO: Chenguangli <chenguangli2(a)huawei.com> :::::: CC: Yang Yingliang <yangyingliang(a)huawei.com> -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki

1 0

[openeuler:openEuler-1.0-LTS 13192/21567] drivers/crypto/hisilicon/qm.c:2916:39: error: 'struct device' has no member named 'numa_node'
by kernel test robot 25 Jan '24

25 Jan '24

tree: https://gitee.com/openeuler/kernel.git openEuler-1.0-LTS head: c147f19e06e08b90efa3dda49bc4dcaf06424518 commit: 73d33f5c59dc3824444baca6a458427f4de3d8fa [13192/21567] qm: Move all the same logic functions of hisilicon crypto to qm config: arm64-randconfig-004-20240123 (https://download.01.org/0day-ci/archive/20240125/202401251651.XSRrMu3C-lkp@…) compiler: aarch64-linux-gcc (GCC) 13.2.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240125/202401251651.XSRrMu3C-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/202401251651.XSRrMu3C-lkp@intel.com/ All errors (new ones prefixed by >>): drivers/crypto/hisilicon/qm.c: In function 'hisi_qm_sort_devices': >> drivers/crypto/hisilicon/qm.c:2916:39: error: 'struct device' has no member named 'numa_node' 2916 | dev_node = dev->numa_node; | ^~ vim +2916 drivers/crypto/hisilicon/qm.c 2902 2903 static int hisi_qm_sort_devices(int node, struct list_head *head, 2904 struct hisi_qm_list *qm_list) 2905 { 2906 struct hisi_qm_resource *res, *tmp; 2907 struct hisi_qm *qm; 2908 struct list_head *n; 2909 struct device *dev; 2910 int dev_node = 0; 2911 2912 list_for_each_entry(qm, &qm_list->list, list) { 2913 dev = &qm->pdev->dev; 2914 2915 if (IS_ENABLED(CONFIG_NUMA)) { > 2916 dev_node = dev->numa_node; 2917 if (dev_node < 0) 2918 dev_node = 0; 2919 } 2920 2921 if (qm_list->check && !qm_list->check(qm)) 2922 continue; 2923 2924 res = kzalloc(sizeof(*res), GFP_KERNEL); 2925 if (!res) 2926 return -ENOMEM; 2927 2928 res->qm = qm; 2929 res->distance = node_distance(dev_node, node); 2930 n = head; 2931 list_for_each_entry(tmp, head, list) { 2932 if (res->distance < tmp->distance) { 2933 n = &tmp->list; 2934 break; 2935 } 2936 } 2937 list_add_tail(&res->list, n); 2938 } 2939 2940 return 0; 2941 } 2942 -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki

1 0

[PATCH OLK-6.6] tracing: Reserve kabi fields
by Zheng Yejian 25 Jan '24

25 Jan '24

hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I8YPFE CVE: NA -------------------------------- Reserve fields in tracing related structs for possible kabi compatibility processing. Signed-off-by: Zheng Yejian <zhengyejian1(a)huawei.com> --- include/linux/ftrace.h | 3 +++ include/linux/trace_events.h | 3 +++ include/linux/tracepoint-defs.h | 2 ++ kernel/trace/ring_buffer.c | 7 +++++++ kernel/trace/trace.h | 6 ++++++ 5 files changed, 21 insertions(+) diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h index e8921871ef9a..56892db7de5c 100644 --- a/include/linux/ftrace.h +++ b/include/linux/ftrace.h @@ -21,6 +21,7 @@ #include <linux/fs.h> #include <asm/ftrace.h> +#include <linux/kabi.h> /* * If the arch supports passing the variable contents of @@ -340,6 +341,8 @@ struct ftrace_ops { unsigned long direct_call; #endif #endif + KABI_RESERVE(1) + KABI_RESERVE(2) }; extern struct ftrace_ops __rcu *ftrace_ops_list; diff --git a/include/linux/trace_events.h b/include/linux/trace_events.h index cf9f0c61796e..172cf91a45de 100644 --- a/include/linux/trace_events.h +++ b/include/linux/trace_events.h @@ -9,6 +9,7 @@ #include <linux/hardirq.h> #include <linux/perf_event.h> #include <linux/tracepoint.h> +#include <linux/kabi.h> struct trace_array; struct array_buffer; @@ -677,6 +678,8 @@ struct trace_event_file { atomic_t ref; /* ref count for opened files */ atomic_t sm_ref; /* soft-mode reference counter */ atomic_t tm_ref; /* trigger-mode reference counter */ + KABI_RESERVE(1) + KABI_RESERVE(2) }; #define __TRACE_EVENT_FLAGS(name, value) \ diff --git a/include/linux/tracepoint-defs.h b/include/linux/tracepoint-defs.h index 4dc4955f0fbf..b2b29dc8f259 100644 --- a/include/linux/tracepoint-defs.h +++ b/include/linux/tracepoint-defs.h @@ -10,6 +10,7 @@ #include <linux/atomic.h> #include <linux/static_key.h> +#include <linux/kabi.h> struct static_call_key; @@ -39,6 +40,7 @@ struct tracepoint { int (*regfunc)(void); void (*unregfunc)(void); struct tracepoint_func __rcu *funcs; + KABI_RESERVE(1) }; #ifdef CONFIG_HAVE_ARCH_PREL32_RELOCATIONS diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index f1ef4329343b..e70aa61539dc 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c @@ -28,6 +28,7 @@ #include <linux/oom.h> #include <asm/local.h> +#include <linux/kabi.h> /* * The "absolute" timestamp in the buffer is only 59 bits. @@ -537,6 +538,9 @@ struct ring_buffer_per_cpu { struct completion update_done; struct rb_irq_work irq_work; + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) }; struct trace_buffer { @@ -571,6 +575,9 @@ struct ring_buffer_iter { u64 page_stamp; struct ring_buffer_event *event; int missed_events; + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) }; #ifdef RB_TIME_32 diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h index 52123df262b2..8eebd99cbb89 100644 --- a/kernel/trace/trace.h +++ b/kernel/trace/trace.h @@ -21,6 +21,7 @@ #include <linux/workqueue.h> #include <linux/ctype.h> #include <linux/once_lite.h> +#include <linux/kabi.h> #include "pid_list.h" @@ -410,6 +411,9 @@ struct trace_array { struct cond_snapshot *cond_snapshot; #endif struct trace_func_repeats __percpu *last_func_repeats; + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) }; enum { @@ -1326,6 +1330,8 @@ struct ftrace_event_field { int size; int is_signed; int len; + KABI_RESERVE(1) + KABI_RESERVE(2) }; struct prog_entry; -- 2.25.1

1 0