mm-make-range-to-target_node-lookup-facility-a-part-of-numa_memblks.patch removed from -mm tree
The quilt patch titled
Subject: mm: make range-to-target_node lookup facility a part of numa_memblks
has been removed from the -mm tree. Its filename was
mm-make-range-to-target_node-lookup-facility-a-part-of-numa_memblks.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: make range-to-target_node lookup facility a part of numa_memblks
Date: Wed, 7 Aug 2024 09:41:09 +0300
The x86 implementation of range-to-target_node lookup (i.e. phys_to_target_node() and memory_add_physaddr_to_nid()) relies on numa_memblks.
Since numa_memblks are now part of the generic code, move these functions from x86 to mm/numa_memblks.c and select CONFIG_NUMA_KEEP_MEMINFO when CONFIG_NUMA_MEMBLKS=y for dax and cxl.
---
arch/x86/include/asm/sparsemem.h | 9 ------ arch/x86/mm/numa.c | 38 ----------------------------- drivers/cxl/Kconfig | 2 - drivers/dax/Kconfig | 2 - include/linux/numa_memblks.h | 7 +++++ mm/numa.c | 1 mm/numa_memblks.c | 38 +++++++++++++++++++++++++++++ 7 files changed, 48 insertions(+), 49 deletions(-)
arch/x86/include/asm/sparsemem.h renamed from arch/x86/include/asm/sparsemem.h~mm-make-range-to-target_node-lookup-facility-a-part-of-numa_memblks +0 -9
@@ -31,13 +31,4 @@#endif /* CONFIG_SPARSEMEM */ -#ifndef __ASSEMBLY__ -#ifdef CONFIG_NUMA_KEEP_MEMINFO -extern int phys_to_target_node (phys_addr_t start); -#define phys_to_target_node phys_to_target_node -extern int memory_add_physaddr_to_nid (u64 start); -#define memory_add_physaddr_to_nid memory_add_physaddr_to_nid -#endif -#endif /* __ASSEMBLY__ */ -#endif /* _ASM_X86_SPARSEMEM_H */
arch/x86/mm/numa.c renamed from arch/x86/mm/numa.c~mm-make-range-to-target_node-lookup-facility-a-part-of-numa_memblks +0 -38
@@ -453,41 +453,3 @@ u64 __init numa_emu_dma_end(void) return PFN_PHYS(MAX_DMA32_PFN); }#endif /* CONFIG_NUMA_EMU */ - -#ifdef CONFIG_NUMA_KEEP_MEMINFO -static int meminfo_to_nid (struct numa_meminfo *mi,u64 start) -{ -int i; - -for (i =0 ; i < mi->nr_blks; i++) -if (mi->blk[i].start <= start && mi->blk[i].end > start) -return mi->blk[i].nid; -return NUMA_NO_NODE ; -} - -int phys_to_target_node (phys_addr_t start) -{ -int nid =meminfo_to_nid (&numa_meminfo, start); - -/* -* Prefer online nodes, but if reserved memory might be -* hot-added continue the search with reserved ranges. -*/ -if (nid !=NUMA_NO_NODE ) -return nid; - -return meminfo_to_nid (&numa_reserved_meminfo, start); -} -EXPORT_SYMBOL_GPL (phys_to_target_node); - -int memory_add_physaddr_to_nid (u64 start) -{ -int nid =meminfo_to_nid (&numa_meminfo, start); - -if (nid ==NUMA_NO_NODE ) - nid = numa_meminfo.blk[0 ].nid; -return nid; -} -EXPORT_SYMBOL_GPL (memory_add_physaddr_to_nid); - -#endif
drivers/cxl/Kconfig renamed from drivers/cxl/Kconfig~mm-make-range-to-target_node-lookup-facility-a-part-of-numa_memblks +1 -1
@@ -6,7 +6,7 @@ menuconfig CXL_BUS select FW_UPLOAD select PCI_DOE select FIRMWARE_TABLE - select NUMA_KEEP_MEMINFO if (NUMA && X86) + select NUMA_KEEP_MEMINFO if NUMA_MEMBLKS help CXL is a bus that is electrically compatible with PCI Express, but layers three protocols on that signalling (CXL.io, CXL.cache, and
drivers/dax/Kconfig renamed from drivers/dax/Kconfig~mm-make-range-to-target_node-lookup-facility-a-part-of-numa_memblks +1 -1
@@ -30,7 +30,7 @@ config DEV_DAX_PMEM config DEV_DAX_HMEM tristate "HMEM DAX: direct access to 'specific purpose' memory" depends on EFI_SOFT_RESERVE - select NUMA_KEEP_MEMINFO if (NUMA && X86) + select NUMA_KEEP_MEMINFO if NUMA_MEMBLKS default DEV_DAX help EFI 2.8 platforms, and others, may advertise 'specific purpose'
include/linux/numa_memblks.h renamed from include/linux/numa_memblks.h~mm-make-range-to-target_node-lookup-facility-a-part-of-numa_memblks +7 -0
@@ -46,6 +46,13 @@ static inline int numa_emu_cmdline(char }#endif /* CONFIG_NUMA_EMU */ +#ifdef CONFIG_NUMA_KEEP_MEMINFO +extern int phys_to_target_node (u64 start); +#define phys_to_target_node phys_to_target_node +extern int memory_add_physaddr_to_nid (u64 start); +#define memory_add_physaddr_to_nid memory_add_physaddr_to_nid +#endif /* CONFIG_NUMA_KEEP_MEMINFO */ +#endif /* CONFIG_NUMA_MEMBLKS */ #endif /* __NUMA_MEMBLKS_H */
mm/numa.c renamed from mm/numa.c~mm-make-range-to-target_node-lookup-facility-a-part-of-numa_memblks +1 -0
@@ -3,6 +3,7 @@#include <linux/memblock.h> #include <linux/printk.h> #include <linux/numa.h> +#include <linux/numa_memblks.h> struct pglist_data *node_data[MAX_NUMNODES ];EXPORT_SYMBOL (node_data);
mm/numa_memblks.c renamed from mm/numa_memblks.c~mm-make-range-to-target_node-lookup-facility-a-part-of-numa_memblks +38 -0
@@ -531,3 +531,41 @@ int __init numa_fill_memblks(u64 start, }return 0 ; } + +#ifdef CONFIG_NUMA_KEEP_MEMINFO +static int meminfo_to_nid (struct numa_meminfo *mi,u64 start) +{ +int i; + +for (i =0 ; i < mi->nr_blks; i++) +if (mi->blk[i].start <= start && mi->blk[i].end > start) +return mi->blk[i].nid; +return NUMA_NO_NODE ; +} + +int phys_to_target_node (u64 start) +{ +int nid =meminfo_to_nid (&numa_meminfo, start); + +/* +* Prefer online nodes, but if reserved memory might be +* hot-added continue the search with reserved ranges. +*/ +if (nid !=NUMA_NO_NODE ) +return nid; + +return meminfo_to_nid (&numa_reserved_meminfo, start); +} +EXPORT_SYMBOL_GPL (phys_to_target_node); + +int memory_add_physaddr_to_nid (u64 start) +{ +int nid =meminfo_to_nid (&numa_meminfo, start); + +if (nid ==NUMA_NO_NODE ) + nid = numa_meminfo.blk[0 ].nid; +return nid; +} +EXPORT_SYMBOL_GPL (memory_add_physaddr_to_nid); + +#endif /* CONFIG_NUMA_KEEP_MEMINFO */
_
Patches currently in -mm which might be from [email protected] are