mm-introduce-numa_emulation.patch removed from -mm tree
The quilt patch titled
Subject: mm: introduce numa_emulation
has been removed from the -mm tree. Its filename was
mm-introduce-numa_emulation.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: mm: introduce numa_emulation
Date: Wed, 7 Aug 2024 09:41:03 +0300
Move numa_emulation code from arch/x86 to mm/numa_emulation.c
This code will be later reused by arch_numa.
No functional changes.
Signed-off-by Mike Rapoport (Microsoft) <[email protected]>
Reviewed-by Jonathan Cameron <[email protected]>
Acked-by Dan Williams <[email protected]>
Cc Alexander Gordeev <[email protected]>
Cc Andreas Larsson <[email protected]>
Cc Arnd Bergmann <[email protected]>
Cc Borislav Petkov <[email protected]>
Cc Catalin Marinas <[email protected]>
Cc Christophe Leroy <[email protected]>
Cc Dave Hansen <[email protected]>
Cc David Hildenbrand <[email protected]>
Cc Davidlohr Bueso <[email protected]>
Cc David S. Miller <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
Cc Heiko Carstens <[email protected]>
Cc Huacai Chen <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc Jiaxun Yang <[email protected]>
Cc John Paul Adrian Glaubitz <[email protected]>
Cc Jonathan Corbet <[email protected]>
Cc Michael Ellerman <[email protected]>
Cc Palmer Dabbelt <[email protected]>
Cc Rafael J. Wysocki <[email protected]>
Cc Rob Herring (Arm) <[email protected]>
Cc Samuel Holland <[email protected]>
Cc Thomas Bogendoerfer <[email protected]>
Cc Thomas Gleixner <[email protected]>
Cc Vasily Gorbik <[email protected]>
Cc Will Deacon <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
arch/x86/Kconfig | 8 arch/x86/include/asm/numa.h | 12 arch/x86/mm/Makefile | 1 arch/x86/mm/numa_emulation.c | 573 --------------------------------- arch/x86/mm/numa_internal.h | 11 include/linux/numa_memblks.h | 17 mm/Kconfig | 8 mm/Makefile | 1 mm/numa_emulation.c | 571 ++++++++++++++++++++++++++++++++ 9 files changed, 597 insertions(+), 605 deletions(-)
arch/x86/include/asm/numa.h renamed from arch/x86/include/asm/numa.h~mm-introduce-numa_emulation +0 -12
@@ -65,16 +65,4 @@ static inline void init_gi_nodes(void)void debug_cpumask_set_cpu (unsigned int cpu,int node,bool enable);#endif -#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); -u64 __init numa_emu_dma_end (void ); -#else /* CONFIG_NUMA_EMU */ -static inline int numa_emu_cmdline (char *str) -{ -return -EINVAL ; -} -#endif /* CONFIG_NUMA_EMU */ -#endif /* _ASM_X86_NUMA_H */
arch/x86/Kconfig renamed from arch/x86/Kconfig~mm-introduce-numa_emulation +0 -8
@@ -1600,14 +1600,6 @@ config X86_64_ACPI_NUMA help Enable ACPI SRAT based node topology detection. -config NUMA_EMU - bool "NUMA emulation" - depends on NUMA - help - Enable NUMA emulation. A flat machine will be split - into virtual nodes when booted with "numa=fake=N", where N is the - number of nodes. This is only useful for debugging. - config NODES_SHIFT int "Maximum NUMA Nodes (as a power of 2)" if !MAXSMP range 1 10
arch/x86/mm/Makefile renamed from arch/x86/mm/Makefile~mm-introduce-numa_emulation +0 -1
@@ -57,7 +57,6 @@ obj-$(CONFIG_MMIOTRACE_TEST) += testmmio obj-$(CONFIG_NUMA) += numa.o numa_$(BITS).o obj-$(CONFIG_AMD_NUMA) += amdtopology.o obj-$(CONFIG_ACPI_NUMA) += srat.o -obj-$(CONFIG_NUMA_EMU) += numa_emulation.o obj-$(CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS) += pkeys.o obj-$(CONFIG_RANDOMIZE_MEMORY) += kaslr.o
arch/x86/mm/numa_emulation.c deleted +0 -573
573 lines not on this page · raw message
arch/x86/mm/numa_internal.h renamed from arch/x86/mm/numa_internal.h~mm-introduce-numa_emulation +0 -11
@@ -7,15 +7,4 @@void __init x86_numa_init (void ); -struct numa_meminfo ; - -#ifdef CONFIG_NUMA_EMU -void __init numa_emulation (struct numa_meminfo *numa_meminfo, -int numa_dist_cnt); -#else -static inline void numa_emulation (struct numa_meminfo *numa_meminfo, -int numa_dist_cnt) -{ } -#endif -#endif /* __X86_MM_NUMA_INTERNAL_H */
include/linux/numa_memblks.h renamed from include/linux/numa_memblks.h~mm-introduce-numa_emulation +17 -0
@@ -34,6 +34,23 @@ int __init numa_register_meminfo(structvoid __init numa_nodemask_from_meminfo (nodemask_t *nodemask,const struct numa_meminfo *mi); +#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); +u64 __init numa_emu_dma_end (void ); +void __init numa_emulation (struct numa_meminfo *numa_meminfo, +int numa_dist_cnt); +#else +static inline void numa_emulation (struct numa_meminfo *numa_meminfo, +int numa_dist_cnt) +{ } +static inline int numa_emu_cmdline (char *str) +{ +return -EINVAL ; +} +#endif /* CONFIG_NUMA_EMU */ +#endif /* CONFIG_NUMA_MEMBLKS */ #endif /* __NUMA_MEMBLKS_H */
mm/Kconfig renamed from mm/Kconfig~mm-introduce-numa_emulation +8 -0
@@ -1270,6 +1270,14 @@ config EXECMEM config NUMA_MEMBLKS bool +config NUMA_EMU + bool "NUMA emulation" + depends on NUMA_MEMBLKS + help + Enable NUMA emulation. A flat machine will be split + into virtual nodes when booted with "numa=fake=N", where N is the + number of nodes. This is only useful for debugging. + source "mm/damon/Kconfig" endmenu
mm/Makefile renamed from mm/Makefile~mm-introduce-numa_emulation +1 -0
@@ -119,6 +119,7 @@ obj-$(CONFIG_GENERIC_EARLY_IOREMAP) += e obj-$(CONFIG_CMA) += cma.o obj-$(CONFIG_NUMA) += numa.o obj-$(CONFIG_NUMA_MEMBLKS) += numa_memblks.o +obj-$(CONFIG_NUMA_EMU) += numa_emulation.o obj-$(CONFIG_MEMORY_BALLOON) += balloon_compaction.o obj-$(CONFIG_PAGE_EXTENSION) += page_ext.o obj-$(CONFIG_PAGE_TABLE_CHECK) += page_table_check.o
mm/numa_emulation.c new file +571 -0
571 lines not on this page · raw message
_
Patches currently in -mm which might be from [email protected] are