x86-numa_emu-split-__apicid_to_node-update-to-a-helper-function.patch removed from -mm tree
The quilt patch titled
Subject: x86/numa_emu: split __apicid_to_node update to a helper function
has been removed from the -mm tree. Its filename was
x86-numa_emu-split-__apicid_to_node-update-to-a-helper-function.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: "Mike Rapoport (Microsoft)" <[email protected]>
Subject: x86/numa_emu: split __apicid_to_node update to a helper function
Date: Wed, 7 Aug 2024 09:40:58 +0300
This is required to make numa emulation code architecture independent so that it can be moved to generic code in following commits.
---
arch/x86/include/asm/numa.h | 2 ++ arch/x86/mm/numa.c | 22 ++++++++++++++++++++++ arch/x86/mm/numa_emulation.c | 14 +------------- 3 files changed, 25 insertions(+), 13 deletions(-)
arch/x86/include/asm/numa.h renamed from arch/x86/include/asm/numa.h~x86-numa_emu-split-__apicid_to_node-update-to-a-helper-function +2 -0
@@ -72,6 +72,8 @@ void debug_cpumask_set_cpu(int cpu, int#ifdef CONFIG_NUMA_EMU int numa_emu_cmdline (char *str); +void __init numa_emu_update_cpu_to_node (int *emu_nid_to_phys, +unsigned int nr_emu_nids);#else /* CONFIG_NUMA_EMU */ static inline int numa_emu_cmdline (char *str) {
arch/x86/mm/numa.c renamed from arch/x86/mm/numa.c~x86-numa_emu-split-__apicid_to_node-update-to-a-helper-function +22 -0
@@ -852,6 +852,28 @@ EXPORT_SYMBOL(cpumask_of_node);#endif /* !CONFIG_DEBUG_PER_CPU_MAPS */ +#ifdef CONFIG_NUMA_EMU +void __init numa_emu_update_cpu_to_node (int *emu_nid_to_phys, +unsigned int nr_emu_nids) +{ +int i, j; + +/* +* Transform __apicid_to_node table to use emulated nids by +* reverse-mapping phys_nid. The maps should always exist but fall +* back to zero just in case. +*/ +for (i =0 ; i <ARRAY_SIZE (__apicid_to_node); i++) { +if (__apicid_to_node[i] ==NUMA_NO_NODE ) +continue ; +for (j =0 ; j < nr_emu_nids; j++) +if (__apicid_to_node[i] == emu_nid_to_phys[j]) +break ; + __apicid_to_node[i] = j < nr_emu_nids ? j :0 ; + } +} +#endif /* CONFIG_NUMA_EMU */ +#ifdef CONFIG_NUMA_KEEP_MEMINFO static int meminfo_to_nid (struct numa_meminfo *mi,u64 start) {
arch/x86/mm/numa_emulation.c renamed from arch/x86/mm/numa_emulation.c~x86-numa_emu-split-__apicid_to_node-update-to-a-helper-function +1 -13
@@ -476,19 +476,7 @@ void __init numa_emulation(struct numa_m ei.blk[i].nid != NUMA_NO_NODE)node_set (ei.blk[i].nid, numa_nodes_parsed); -/* -* Transform __apicid_to_node table to use emulated nids by -* reverse-mapping phys_nid. The maps should always exist but fall -* back to zero just in case. -*/ -for (i =0 ; i <ARRAY_SIZE (__apicid_to_node); i++) { -if (__apicid_to_node[i] ==NUMA_NO_NODE ) -continue ; -for (j =0 ; j <ARRAY_SIZE (emu_nid_to_phys); j++) -if (__apicid_to_node[i] == emu_nid_to_phys[j]) -break ; - __apicid_to_node[i] = j <ARRAY_SIZE (emu_nid_to_phys) ? j :0 ; - } +numa_emu_update_cpu_to_node (emu_nid_to_phys,ARRAY_SIZE (emu_nid_to_phys));/* make sure all emulated nodes are mapped to a physical node */ for (i =0 ; i <ARRAY_SIZE (emu_nid_to_phys); i++)
_
Patches currently in -mm which might be from [email protected] are