Subject: + memblock-numa-binary-search-node-id.patch added to -mm tree
To: yinghai@xxxxxxxxxx,rja@xxxxxxx,tj@xxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Thu, 15 Aug 2013 13:43:56 -0700
The patch titled
Subject: memblock, numa: binary search node id
has been added to the -mm tree. Its filename is
memblock-numa-binary-search-node-id.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/memblock-numa-binary-search-node-id.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/memblock-numa-binary-search-node-id.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Yinghai Lu <yinghai@xxxxxxxxxx>
Subject: memblock, numa: binary search node id
Current early_pfn_to_nid() on arch that support memblock go over
memblock.memory one by one, so will take too many try near the end.
We can use existing memblock_search to find the node id for given pfn,
that could save some time on bigger system that have many entries
memblock.memory array.
Signed-off-by: Yinghai Lu <yinghai@xxxxxxxxxx>
Cc: Tejun Heo <tj@xxxxxxxxxx>
Cc: Russ Anderson <rja@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/memblock.h | 2 ++
mm/memblock.c | 18 ++++++++++++++++++
mm/page_alloc.c | 19 +++++++++----------
3 files changed, 29 insertions(+), 10 deletions(-)
diff -puN include/linux/memblock.h~memblock-numa-binary-search-node-id include/linux/memblock.h
--- a/include/linux/memblock.h~memblock-numa-binary-search-node-id
+++ a/include/linux/memblock.h
@@ -60,6 +60,8 @@ int memblock_reserve(phys_addr_t base, p
void memblock_trim_memory(phys_addr_t align);
#ifdef CONFIG_HAVE_MEMBLOCK_NODE_MAP
+int memblock_search_pfn_nid(unsigned long pfn, unsigned long *start_pfn,
+ unsigned long *end_pfn);
void __next_mem_pfn_range(int *idx, int nid, unsigned long *out_start_pfn,
unsigned long *out_end_pfn, int *out_nid);
diff -puN mm/memblock.c~memblock-numa-binary-search-node-id mm/memblock.c
--- a/mm/memblock.c~memblock-numa-binary-search-node-id
+++ a/mm/memblock.c
@@ -914,6 +914,24 @@ int __init_memblock memblock_is_memory(p
return memblock_search(&memblock.memory, addr) != -1;
}
+#ifdef CONFIG_HAVE_MEMBLOCK_NODE_MAP
+int __init_memblock memblock_search_pfn_nid(unsigned long pfn,
+ unsigned long *start_pfn, unsigned long *end_pfn)
+{
+ struct memblock_type *type = &memblock.memory;
+ int mid = memblock_search(type, (phys_addr_t)pfn << PAGE_SHIFT);
+
+ if (mid == -1)
+ return -1;
+
+ *start_pfn = type->regions[mid].base >> PAGE_SHIFT;
+ *end_pfn = (type->regions[mid].base + type->regions[mid].size)
+ >> PAGE_SHIFT;
+
+ return type->regions[mid].nid;
+}
+#endif
+
/**
* memblock_is_region_memory - check if a region is a subset of memory
* @base: base of region to check
diff -puN mm/page_alloc.c~memblock-numa-binary-search-node-id mm/page_alloc.c
--- a/mm/page_alloc.c~memblock-numa-binary-search-node-id
+++ a/mm/page_alloc.c
@@ -4307,7 +4307,7 @@ int __meminit init_currently_empty_zone(
int __meminit __early_pfn_to_nid(unsigned long pfn)
{
unsigned long start_pfn, end_pfn;
- int i, nid;
+ int nid;
/*
* NOTE: The following SMP-unsafe globals are only used early in boot
* when the kernel is running single-threaded.
@@ -4318,15 +4318,14 @@ int __meminit __early_pfn_to_nid(unsigne
if (last_start_pfn <= pfn && pfn < last_end_pfn)
return last_nid;
- for_each_mem_pfn_range(i, MAX_NUMNODES, &start_pfn, &end_pfn, &nid)
- if (start_pfn <= pfn && pfn < end_pfn) {
- last_start_pfn = start_pfn;
- last_end_pfn = end_pfn;
- last_nid = nid;
- return nid;
- }
- /* This is a memory hole */
- return -1;
+ nid = memblock_search_pfn_nid(pfn, &start_pfn, &end_pfn);
+ if (nid != -1) {
+ last_start_pfn = start_pfn;
+ last_end_pfn = end_pfn;
+ last_nid = nid;
+ }
+
+ return nid;
}
#endif /* CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID */
_
Patches currently in -mm which might be from yinghai@xxxxxxxxxx are
mm-kill-one-if-loop-in-__free_pages_bootmem.patch
memblock-numa-binary-search-node-id.patch
firmware-dmi_scan-drop-obsolete-comment.patch
linux-next.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
