From: Tejun Heo <tj@kernel.org>
To: mingo@redhat.com, hpa@zytor.com, tglx@linutronix.de,
benh@kernel.crashing.org, yinghai@kernel.org,
davem@davemloft.net
Cc: linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org,
x86@kernel.org, Tejun Heo <tj@kernel.org>
Subject: [PATCH 6/8] memblock: Make memblock_alloc_[try_]nid() top-down
Date: Tue, 12 Jul 2011 10:46:33 +0200 [thread overview]
Message-ID: <1310460395-30913-7-git-send-email-tj@kernel.org> (raw)
In-Reply-To: <1310460395-30913-1-git-send-email-tj@kernel.org>
NUMA aware memblock alloc functions - memblock_alloc_[try_]nid() -
weren't properly top-down because memblock_nid_range() scanned
forward. This patch reverses memblock_nid_range(), renames it to
memblock_nid_range_rev() and updates related functions to implement
proper top-down allocation.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
---
mm/memblock.c | 29 +++++++++++------------------
1 files changed, 11 insertions(+), 18 deletions(-)
diff --git a/mm/memblock.c b/mm/memblock.c
index 22cd999..447cf64 100644
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -499,27 +499,26 @@ phys_addr_t __init memblock_alloc(phys_addr_t size, phys_addr_t align)
/*
- * Additional node-local allocators. Search for node memory is bottom up
- * and walks memblock regions within that node bottom-up as well, but allocation
- * within an memblock region is top-down. XXX I plan to fix that at some stage
+ * Additional node-local top-down allocators.
*
* WARNING: Only available after early_node_map[] has been populated,
* on some architectures, that is after all the calls to add_active_range()
* have been done to populate it.
*/
-static phys_addr_t __init memblock_nid_range(phys_addr_t start, phys_addr_t end, int *nid)
+static phys_addr_t __init memblock_nid_range_rev(phys_addr_t start,
+ phys_addr_t end, int *nid)
{
#ifdef CONFIG_ARCH_POPULATES_NODE_MAP
unsigned long start_pfn, end_pfn;
int i;
for_each_mem_pfn_range(i, MAX_NUMNODES, &start_pfn, &end_pfn, nid)
- if (start >= PFN_PHYS(start_pfn) && start < PFN_PHYS(end_pfn))
- return min(end, PFN_PHYS(end_pfn));
+ if (end > PFN_PHYS(start_pfn) && end <= PFN_PHYS(end_pfn))
+ return max(start, PFN_PHYS(start_pfn));
#endif
*nid = 0;
- return end;
+ return start;
}
static phys_addr_t __init memblock_alloc_nid_region(struct memblock_region *mp,
@@ -531,21 +530,19 @@ static phys_addr_t __init memblock_alloc_nid_region(struct memblock_region *mp,
start = mp->base;
end = start + mp->size;
- start = round_up(start, align);
while (start < end) {
- phys_addr_t this_end;
+ phys_addr_t this_start;
int this_nid;
- this_end = memblock_nid_range(start, end, &this_nid);
+ this_start = memblock_nid_range_rev(start, end, &this_nid);
if (this_nid == nid) {
- phys_addr_t ret = memblock_find_region(start, this_end, size, align);
+ phys_addr_t ret = memblock_find_region(this_start, end, size, align);
if (ret &&
!memblock_add_region(&memblock.reserved, ret, size))
return ret;
}
- start = this_end;
+ end = this_start;
}
-
return 0;
}
@@ -561,11 +558,7 @@ phys_addr_t __init memblock_alloc_nid(phys_addr_t size, phys_addr_t align, int n
*/
size = round_up(size, align);
- /* We do a bottom-up search for a region with the right
- * nid since that's easier considering how memblock_nid_range()
- * works
- */
- for (i = 0; i < mem->cnt; i++) {
+ for (i = mem->cnt - 1; i >= 0; i--) {
phys_addr_t ret = memblock_alloc_nid_region(&mem->regions[i],
size, align, nid);
if (ret)
--
1.7.6
next prev parent reply other threads:[~2011-07-12 8:46 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-12 8:46 [PATCHSET x86/mm] memblock, x86: Implement for_each_mem_pfn_range() and use it to improve memblock allocator Tejun Heo
2011-07-12 8:46 ` [PATCH 1/8] bootmem: Replace work_with_active_regions() with for_each_mem_pfn_range() Tejun Heo
2011-07-12 8:46 ` Tejun Heo
2011-07-14 2:11 ` H. Peter Anvin
2011-07-14 7:44 ` Tejun Heo
2011-07-14 7:46 ` [PATCH UPDATED " Tejun Heo
2011-07-12 8:46 ` [PATCH 2/8] bootmem: Reimplement __absent_pages_in_range() using for_each_mem_pfn_range() Tejun Heo
2011-07-12 8:46 ` Tejun Heo
2011-07-12 8:46 ` [PATCH 3/8] bootmem: Use for_each_mem_pfn_range() in page_alloc.c Tejun Heo
2011-07-12 8:46 ` Tejun Heo
2011-07-12 8:46 ` [PATCH 4/8] memblock: Improve generic memblock_nid_range() using for_each_mem_pfn_range() Tejun Heo
2011-07-12 8:46 ` Tejun Heo
2011-07-12 8:46 ` [PATCH 5/8] memblock: Don't allow archs to override memblock_nid_range() Tejun Heo
2011-07-12 8:46 ` Tejun Heo
2011-07-12 8:46 ` Tejun Heo [this message]
2011-07-12 8:46 ` [PATCH 7/8] memblock: Separate out memblock_find_in_range_node() Tejun Heo
2011-07-12 8:46 ` [PATCH 8/8] memblock, x86: Replace memblock_x86_find_in_range_node() with generic memblock calls Tejun Heo
2011-07-12 8:46 ` Tejun Heo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1310460395-30913-7-git-send-email-tj@kernel.org \
--to=tj@kernel.org \
--cc=benh@kernel.crashing.org \
--cc=davem@davemloft.net \
--cc=hpa@zytor.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
--cc=yinghai@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).