ia64-remove-custom-__early_pfn_to_nid.patch removed from -mm tree
The patch titled
Subject: ia64: remove custom __early_pfn_to_nid()
has been removed from the -mm tree. Its filename was
ia64-remove-custom-__early_pfn_to_nid.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Mike Rapoport <[email protected]>
Subject: ia64: remove custom __early_pfn_to_nid()
The ia64 implementation of __early_pfn_to_nid() essentially relies on the same data as the generic implementation.
The correspondence between memory ranges and nodes is set in memblock during early memory initialization in register_active_ranges() function.
The initialization of sparsemem that requires early_pfn_to_nid() happens later and it can use the memblock information like the other architectures.
---
arch/ia64/Kconfig | 3 --- arch/ia64/mm/numa.c | 30 ------------------------------ include/linux/mm.h | 3 --- include/linux/mmzone.h | 11 ----------- mm/page_alloc.c | 16 ++++++++++++---- 5 files changed, 12 insertions(+), 51 deletions(-)
arch/ia64/Kconfig renamed from arch/ia64/Kconfig~ia64-remove-custom-__early_pfn_to_nid +0 -3
@@ -342,9 +342,6 @@ config HOLES_IN_ZONE bool default y if VIRTUAL_MEM_MAP -config HAVE_ARCH_EARLY_PFN_TO_NID - def_bool NUMA && SPARSEMEM - config HAVE_ARCH_NODEDATA_EXTENSION def_bool y depends on NUMA
arch/ia64/mm/numa.c renamed from arch/ia64/mm/numa.c~ia64-remove-custom-__early_pfn_to_nid +0 -30
@@ -58,36 +58,6 @@ paddr_to_nid(unsigned long paddr)EXPORT_SYMBOL (paddr_to_nid);#if defined(CONFIG_SPARSEMEM ) && defined(CONFIG_NUMA ) -/* -* Because of holes evaluate on section limits. -* If the section of memory exists, then return the node where the section -* resides. Otherwise return node 0 as the default. This is used by -* SPARSEMEM to allocate the SPARSEMEM sectionmap on the NUMA node where -* the section resides. -*/ -int __meminit __early_pfn_to_nid (unsigned long pfn, -struct mminit_pfnnid_cache *state) -{ -int i, section = pfn >>PFN_SECTION_SHIFT , ssec, esec; - -if (section >= state->last_start && section < state->last_end) -return state->last_nid; - -for (i =0 ; i < num_node_memblks; i++) { - ssec = node_memblk[i].start_paddr >>PA_SECTION_SHIFT ; - esec = (node_memblk[i].start_paddr + node_memblk[i].size + - ((1L <<PA_SECTION_SHIFT ) -1 )) >>PA_SECTION_SHIFT ; -if (section >= ssec && section < esec) { - state->last_start = ssec; - state->last_end = esec; - state->last_nid = node_memblk[i].nid; -return node_memblk[i].nid; - } - } - -return -1 ; -} -void numa_clear_node (int cpu) {unmap_cpu_from_node (cpu,NUMA_NO_NODE );
include/linux/mm.h renamed from include/linux/mm.h~ia64-remove-custom-__early_pfn_to_nid +0 -3
@@ -2434,9 +2434,6 @@ static inline int early_pfn_to_nid(unsig#else /* please see mm/page_alloc.c */ extern int __meminit early_pfn_to_nid (unsigned long pfn); -/* there is a per-arch backend function. */ -extern int __meminit __early_pfn_to_nid (unsigned long pfn, -struct mminit_pfnnid_cache *state);#endif extern void set_dma_reserve (unsigned long new_dma_reserve);
include/linux/mmzone.h renamed from include/linux/mmzone.h~ia64-remove-custom-__early_pfn_to_nid +0 -11
@@ -1429,17 +1429,6 @@ void sparse_init(void);#endif /* CONFIG_SPARSEMEM */ /* -* During memory init memblocks map pfns to nids. The search is expensive and -* this caches recent lookups. The implementation of __early_pfn_to_nid -* may treat start/end as pfns or sections. -*/ -struct mminit_pfnnid_cache { -unsigned long last_start; -unsigned long last_end; -int last_nid; -}; - -/* * If it is possible to have holes within a MAX_ORDER_NR_PAGES, then we * need to check pfn validity within that MAX_ORDER_NR_PAGES block. * pfn_valid_within() should be used in this case; we optimise this away
mm/page_alloc.c renamed from mm/page_alloc.c~ia64-remove-custom-__early_pfn_to_nid +12 -4
@@ -1559,14 +1559,23 @@ void __free_pages_core(struct page *page#ifdef CONFIG_NEED_MULTIPLE_NODES -static struct mminit_pfnnid_cache early_pfnnid_cache __meminitdata; +/* +* During memory init memblocks map pfns to nids. The search is expensive and +* this caches recent lookups. The implementation of __early_pfn_to_nid +* treats start/end as pfns. +*/ +struct mminit_pfnnid_cache { +unsigned long last_start; +unsigned long last_end; +int last_nid; +}; -#ifndef CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID +static struct mminit_pfnnid_cache early_pfnnid_cache__meminitdata ;/* * Required by SPARSEMEM. Given a PFN, return what node the PFN is on. */ -int __meminit __early_pfn_to_nid(unsigned long pfn, +static int __meminit __early_pfn_to_nid (unsigned long pfn,struct mminit_pfnnid_cache *state) {unsigned long start_pfn, end_pfn;
@@ -1584,7 +1593,6 @@ int __meminit __early_pfn_to_nid(unsignereturn nid; } -#endif /* CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID */ int __meminit early_pfn_to_nid (unsigned long pfn) {
_
Patches currently in -mm which might be from [email protected] are
mm-memblock-enforce-overlap-of-memorymemblock-and-memoryreserved.patch mm-fix-initialization-of-struct-page-for-holes-in-memory-layout.patch mm-add-definition-of-pmd_page_order.patch mmap-make-mlock_future_check-global.patch set_memory-allow-set_direct_map__noflush-for-multiple-pages.patch set_memory-allow-querying-whether-set_direct_map_-is-actually-enabled.patch mm-introduce-memfd_secret-system-call-to-create-secret-memory-areas.patch secretmem-use-pmd-size-pages-to-amortize-direct-map-fragmentation.patch secretmem-add-memcg-accounting.patch pm-hibernate-disable-when-there-are-active-secretmem-users.patch arch-mm-wire-up-memfd_secret-system-call-were-relevant.patch secretmem-test-add-basic-selftest-for-memfd_secret2.patch