From: Yinghai Lu <yinghai@kernel.org>
To: Ingo Molnar <mingo@elte.hu>, Thomas Gleixner <tglx@linutronix.de>,
"H. Peter Anvin" <hpa@zytor.com>,
Andrew Morton <akpm@linux-foundation.org>,
David Miller <davem@davemloft.net>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
Johannes Weiner <hannes@cmpxchg.org>,
linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org,
Yinghai Lu <yinghai@kernel.org>,
Jan Beulich <jbeulich@novell.com>
Subject: [PATCH 39/50] x86, memblock: Add get_free_all_memory_range()
Date: Tue, 13 Jul 2010 00:10:33 -0700 [thread overview]
Message-ID: <1279005044-24777-40-git-send-email-yinghai@kernel.org> (raw)
In-Reply-To: <1279005044-24777-1-git-send-email-yinghai@kernel.org>
get_free_all_memory_range is for CONFIG_NO_BOOTMEM=y, and will be called by
free_all_memory_core_early().
It will use early_node_map aka active ranges subtract memblock.reserved to
get all free range, and those ranges will convert to slab pages.
-v4: increase range size
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Cc: Jan Beulich <jbeulich@novell.com>
---
arch/x86/include/asm/memblock.h | 2 +
arch/x86/mm/memblock.c | 102 ++++++++++++++++++++++++++++++++++++++-
2 files changed, 103 insertions(+), 1 deletions(-)
diff --git a/arch/x86/include/asm/memblock.h b/arch/x86/include/asm/memblock.h
index e11ddf0..72639ce 100644
--- a/arch/x86/include/asm/memblock.h
+++ b/arch/x86/include/asm/memblock.h
@@ -8,5 +8,7 @@ void memblock_x86_to_bootmem(u64 start, u64 end);
void memblock_x86_reserve_range(u64 start, u64 end, char *name);
void memblock_x86_free_range(u64 start, u64 end);
+struct range;
+int get_free_all_memory_range(struct range **rangep, int nodeid);
#endif
diff --git a/arch/x86/mm/memblock.c b/arch/x86/mm/memblock.c
index 80cdcf8..ab4e2dc 100644
--- a/arch/x86/mm/memblock.c
+++ b/arch/x86/mm/memblock.c
@@ -86,7 +86,107 @@ u64 __init memblock_x86_find_in_range_size(u64 start, u64 *sizep, u64 align)
return MEMBLOCK_ERROR;
}
-#ifndef CONFIG_NO_BOOTMEM
+static __init struct range *find_range_array(int count)
+{
+ u64 end, size, mem;
+ struct range *range;
+
+ size = sizeof(struct range) * count;
+ end = memblock.current_limit;
+
+ mem = memblock_find_in_range(0, end, size, sizeof(struct range));
+ if (mem == MEMBLOCK_ERROR)
+ panic("can not find more space for range array");
+
+ /*
+ * This range is tempoaray, so don't reserve it, it will not be
+ * overlapped because We will not alloccate new buffer before
+ * We discard this one
+ */
+ range = __va(mem);
+ memset(range, 0, size);
+
+ return range;
+}
+
+#ifdef CONFIG_NO_BOOTMEM
+static void __init memblock_x86_subtract_reserved(struct range *range, int az)
+{
+ int count;
+ u64 final_start, final_end;
+ struct memblock_region *r;
+
+ /* Take out region array itself at first*/
+ if (memblock.reserved.regions != memblock_reserved_init_regions)
+ memblock_free(__pa(memblock.reserved.regions), sizeof(struct memblock_region) * memblock.reserved.max);
+
+ count = memblock.reserved.cnt;
+
+ pr_info("Subtract (%d early reservations)\n", count);
+
+ for_each_memblock(reserved, r) {
+ pr_info(" [%010llx-%010llx]\n", (u64)r->base, (u64)r->base + r->size - 1);
+ final_start = PFN_DOWN(r->base);
+ final_end = PFN_UP(r->base + r->size);
+ if (final_start >= final_end)
+ continue;
+ subtract_range(range, az, final_start, final_end);
+ }
+ /* Put region array back ? */
+ if (memblock.reserved.regions != memblock_reserved_init_regions)
+ memblock_reserve(__pa(memblock.reserved.regions), sizeof(struct memblock_region) * memblock.reserved.max);
+}
+
+struct count_data {
+ int nr;
+};
+
+static int __init count_work_fn(unsigned long start_pfn,
+ unsigned long end_pfn, void *datax)
+{
+ struct count_data *data = datax;
+
+ data->nr++;
+
+ return 0;
+}
+
+static int __init count_early_node_map(int nodeid)
+{
+ struct count_data data;
+
+ data.nr = 0;
+ work_with_active_regions(nodeid, count_work_fn, &data);
+
+ return data.nr;
+}
+
+int __init get_free_all_memory_range(struct range **rangep, int nodeid)
+{
+ int count;
+ struct range *range;
+ int nr_range;
+
+ count = (memblock.reserved.cnt + count_early_node_map(nodeid)) * 2;
+
+ range = find_range_array(count);
+ nr_range = 0;
+
+ /*
+ * Use early_node_map[] and memblock.reserved.region to get range array
+ * at first
+ */
+ nr_range = add_from_early_node_map(range, count, nr_range, nodeid);
+#ifdef CONFIG_X86_32
+ subtract_range(range, count, max_low_pfn, -1ULL);
+#endif
+ memblock_x86_subtract_reserved(range, count);
+ nr_range = clean_sort_range(range, count);
+
+ *rangep = range;
+ return nr_range;
+}
+#else
void __init memblock_x86_to_bootmem(u64 start, u64 end)
{
int count;
--
1.6.4.2
WARNING: multiple messages have this Message-ID (diff)
From: Yinghai Lu <yinghai@kernel.org>
To: Ingo Molnar <mingo@elte.hu>, Thomas Gleixner <tglx@linutronix.de>,
"H. Peter Anvin" <hpa@zytor.com>,
Andrew Morton <akpm@linux-foundation.org>,
David Miller <davem@davemloft.net>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
Johannes Weiner <hannes@cmpxchg.org>,
linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org,
Yinghai Lu <yinghai@kernel.org>,
Jan Beulich <jbeulich@novell.com>
Subject: [PATCH 39/50] x86, memblock: Add get_free_all_memory_range()
Date: Tue, 13 Jul 2010 00:10:33 -0700 [thread overview]
Message-ID: <1279005044-24777-40-git-send-email-yinghai@kernel.org> (raw)
Message-ID: <20100713071033.0AcjDBWiStcPnDM7yK2lnuh3nafjmF_tDOXFVSXtPrI@z> (raw)
In-Reply-To: <1279005044-24777-1-git-send-email-yinghai@kernel.org>
get_free_all_memory_range is for CONFIG_NO_BOOTMEM=y, and will be called by
free_all_memory_core_early().
It will use early_node_map aka active ranges subtract memblock.reserved to
get all free range, and those ranges will convert to slab pages.
-v4: increase range size
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Cc: Jan Beulich <jbeulich@novell.com>
---
arch/x86/include/asm/memblock.h | 2 +
arch/x86/mm/memblock.c | 102 ++++++++++++++++++++++++++++++++++++++-
2 files changed, 103 insertions(+), 1 deletions(-)
diff --git a/arch/x86/include/asm/memblock.h b/arch/x86/include/asm/memblock.h
index e11ddf0..72639ce 100644
--- a/arch/x86/include/asm/memblock.h
+++ b/arch/x86/include/asm/memblock.h
@@ -8,5 +8,7 @@ void memblock_x86_to_bootmem(u64 start, u64 end);
void memblock_x86_reserve_range(u64 start, u64 end, char *name);
void memblock_x86_free_range(u64 start, u64 end);
+struct range;
+int get_free_all_memory_range(struct range **rangep, int nodeid);
#endif
diff --git a/arch/x86/mm/memblock.c b/arch/x86/mm/memblock.c
index 80cdcf8..ab4e2dc 100644
--- a/arch/x86/mm/memblock.c
+++ b/arch/x86/mm/memblock.c
@@ -86,7 +86,107 @@ u64 __init memblock_x86_find_in_range_size(u64 start, u64 *sizep, u64 align)
return MEMBLOCK_ERROR;
}
-#ifndef CONFIG_NO_BOOTMEM
+static __init struct range *find_range_array(int count)
+{
+ u64 end, size, mem;
+ struct range *range;
+
+ size = sizeof(struct range) * count;
+ end = memblock.current_limit;
+
+ mem = memblock_find_in_range(0, end, size, sizeof(struct range));
+ if (mem == MEMBLOCK_ERROR)
+ panic("can not find more space for range array");
+
+ /*
+ * This range is tempoaray, so don't reserve it, it will not be
+ * overlapped because We will not alloccate new buffer before
+ * We discard this one
+ */
+ range = __va(mem);
+ memset(range, 0, size);
+
+ return range;
+}
+
+#ifdef CONFIG_NO_BOOTMEM
+static void __init memblock_x86_subtract_reserved(struct range *range, int az)
+{
+ int count;
+ u64 final_start, final_end;
+ struct memblock_region *r;
+
+ /* Take out region array itself at first*/
+ if (memblock.reserved.regions != memblock_reserved_init_regions)
+ memblock_free(__pa(memblock.reserved.regions), sizeof(struct memblock_region) * memblock.reserved.max);
+
+ count = memblock.reserved.cnt;
+
+ pr_info("Subtract (%d early reservations)\n", count);
+
+ for_each_memblock(reserved, r) {
+ pr_info(" [%010llx-%010llx]\n", (u64)r->base, (u64)r->base + r->size - 1);
+ final_start = PFN_DOWN(r->base);
+ final_end = PFN_UP(r->base + r->size);
+ if (final_start >= final_end)
+ continue;
+ subtract_range(range, az, final_start, final_end);
+ }
+ /* Put region array back ? */
+ if (memblock.reserved.regions != memblock_reserved_init_regions)
+ memblock_reserve(__pa(memblock.reserved.regions), sizeof(struct memblock_region) * memblock.reserved.max);
+}
+
+struct count_data {
+ int nr;
+};
+
+static int __init count_work_fn(unsigned long start_pfn,
+ unsigned long end_pfn, void *datax)
+{
+ struct count_data *data = datax;
+
+ data->nr++;
+
+ return 0;
+}
+
+static int __init count_early_node_map(int nodeid)
+{
+ struct count_data data;
+
+ data.nr = 0;
+ work_with_active_regions(nodeid, count_work_fn, &data);
+
+ return data.nr;
+}
+
+int __init get_free_all_memory_range(struct range **rangep, int nodeid)
+{
+ int count;
+ struct range *range;
+ int nr_range;
+
+ count = (memblock.reserved.cnt + count_early_node_map(nodeid)) * 2;
+
+ range = find_range_array(count);
+ nr_range = 0;
+
+ /*
+ * Use early_node_map[] and memblock.reserved.region to get range array
+ * at first
+ */
+ nr_range = add_from_early_node_map(range, count, nr_range, nodeid);
+#ifdef CONFIG_X86_32
+ subtract_range(range, count, max_low_pfn, -1ULL);
+#endif
+ memblock_x86_subtract_reserved(range, count);
+ nr_range = clean_sort_range(range, count);
+
+ *rangep = range;
+ return nr_range;
+}
+#else
void __init memblock_x86_to_bootmem(u64 start, u64 end)
{
int count;
--
1.6.4.2
next prev parent reply other threads:[~2010-07-13 7:10 UTC|newest]
Thread overview: 103+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-13 7:09 [PATCH -v24 00/50] Use memblock with x86 Yinghai Lu
2010-07-13 7:09 ` Yinghai Lu
2010-07-13 7:09 ` [PATCH 01/50] x86, numa: fix boot without RAM on node0 again Yinghai Lu
2010-07-13 7:09 ` Yinghai Lu
2010-07-13 7:09 ` [PATCH 02/50] x86,mm: fix 32bit numa sparsemem Yinghai Lu
2010-07-13 7:09 ` Yinghai Lu
2010-07-13 7:09 ` [PATCH 03/50] lmb: rename to memblock Yinghai Lu
2010-07-13 7:09 ` [PATCH 04/50] memblock: Rename memblock_region to memblock_type and memblock_property to memblock_region Yinghai Lu
2010-07-13 7:09 ` Yinghai Lu
2010-07-13 7:09 ` [PATCH 05/50] memblock: No reason to include asm/memblock.h late Yinghai Lu
2010-07-13 7:09 ` Yinghai Lu
2010-07-13 7:10 ` [PATCH 06/50] memblock: Introduce for_each_memblock() and new accessors, and use it Yinghai Lu
2010-07-13 7:10 ` Yinghai Lu
2010-07-13 7:10 ` [PATCH 07/50] memblock: Remove nid_range argument, arch provides memblock_nid_range() instead Yinghai Lu
2010-07-13 7:10 ` Yinghai Lu
2010-07-13 7:10 ` [PATCH 08/50] memblock: Factor the lowest level alloc function Yinghai Lu
2010-07-13 7:10 ` Yinghai Lu
2010-07-13 7:10 ` [PATCH 09/50] memblock: Expose MEMBLOCK_ALLOC_ANYWHERE Yinghai Lu
2010-07-13 7:10 ` Yinghai Lu
2010-07-13 7:10 ` [PATCH 10/50] memblock: Introduce default allocation limit and use it to replace explicit ones Yinghai Lu
2010-07-13 7:10 ` Yinghai Lu
2010-07-13 7:10 ` [PATCH 11/50] memblock: Remove rmo_size, burry it in arch/powerpc where it belongs Yinghai Lu
2010-07-13 7:10 ` Yinghai Lu
2010-07-13 7:10 ` [PATCH 12/50] memblock: Change u64 to phys_addr_t Yinghai Lu
2010-07-13 7:10 ` Yinghai Lu
2010-07-13 7:10 ` [PATCH 13/50] memblock: Remove unused memblock.debug struct member Yinghai Lu
2010-07-13 7:10 ` Yinghai Lu
2010-07-13 7:10 ` [PATCH 14/50] memblock: Remove memblock_type.size and add memblock.memory_size instead Yinghai Lu
2010-07-13 7:10 ` Yinghai Lu
2010-07-13 7:10 ` [PATCH 15/50] memblock: Move memblock arrays to static storage in memblock.c and make their size a variable Yinghai Lu
2010-07-13 7:10 ` Yinghai Lu
2010-07-13 7:10 ` [PATCH 16/50] memblock: Add debug markers at the end of the array Yinghai Lu
2010-07-13 7:10 ` Yinghai Lu
2010-07-13 7:10 ` [PATCH 17/50] memblock: Make memblock_find_region() out of memblock_alloc_region() Yinghai Lu
2010-07-13 7:10 ` Yinghai Lu
2010-07-13 7:10 ` [PATCH 18/50] memblock: Define MEMBLOCK_ERROR internally instead of using ~(phys_addr_t)0 Yinghai Lu
2010-07-13 7:10 ` Yinghai Lu
2010-07-13 7:10 ` [PATCH 19/50] memblock: Move memblock_init() to the bottom of the file Yinghai Lu
2010-07-13 7:10 ` Yinghai Lu
2010-07-13 7:10 ` [PATCH 20/50] memblock: split memblock_find_base() out of __memblock_alloc_base() Yinghai Lu
2010-07-13 7:10 ` Yinghai Lu
2010-07-13 7:10 ` [PATCH 21/50] memblock: Move functions around into a more sensible order Yinghai Lu
2010-07-13 7:10 ` Yinghai Lu
2010-07-13 7:10 ` [PATCH 22/50] memblock: Add array resizing support Yinghai Lu
2010-07-13 7:10 ` Yinghai Lu
2010-07-13 7:10 ` [PATCH 23/50] memblock: Add arch function to control coalescing of memblock memory regions Yinghai Lu
2010-07-13 7:10 ` Yinghai Lu
2010-07-13 7:10 ` [PATCH 24/50] memblock: Add "start" argument to memblock_find_base() Yinghai Lu
2010-07-13 7:10 ` Yinghai Lu
2010-07-13 7:10 ` [PATCH 25/50] memblock: NUMA allocate can now use early_pfn_map Yinghai Lu
2010-07-13 7:10 ` Yinghai Lu
2010-07-13 7:10 ` [PATCH 26/50] memblock: Separate memblock_alloc_nid() and memblock_alloc_try_nid() Yinghai Lu
2010-07-13 7:10 ` Yinghai Lu
2010-07-13 7:10 ` [PATCH 27/50] memblock: Make memblock_alloc_try_nid() fallback to MEMBLOCK_ALLOC_ANYWHERE Yinghai Lu
2010-07-13 7:10 ` Yinghai Lu
2010-07-13 7:10 ` [PATCH 28/50] memblock: Add debugfs files to dump the arrays content Yinghai Lu
2010-07-13 7:10 ` Yinghai Lu
2010-07-13 7:10 ` [PATCH 29/50] memblock: Prepare x86 to use memblock to replace early_res Yinghai Lu
2010-07-13 7:10 ` Yinghai Lu
2010-07-13 7:10 ` [PATCH 30/50] memblock: Print new doubled array location info Yinghai Lu
2010-07-13 7:10 ` Yinghai Lu
2010-07-13 7:10 ` [PATCH 31/50] memblock: Export MEMBLOCK_ERROR again Yinghai Lu
2010-07-13 7:10 ` Yinghai Lu
2010-07-13 7:10 ` [PATCH 32/50] memblock: Prepare to include linux/memblock.h in core file Yinghai Lu
2010-07-13 7:10 ` Yinghai Lu
2010-07-13 7:10 ` [PATCH 33/50] memblock: Add ARCH_DISCARD_MEMBLOCK to put memblock code to .init Yinghai Lu
2010-07-13 7:10 ` Yinghai Lu
2010-07-13 7:10 ` [PATCH 34/50] memblock: Add memblock_find_in_range() Yinghai Lu
2010-07-13 7:10 ` Yinghai Lu
2010-07-13 7:10 ` [PATCH 35/50] x86, memblock: Add memblock_x86_find_in_range_size() Yinghai Lu
2010-07-13 7:10 ` Yinghai Lu
2010-07-13 7:10 ` [PATCH 36/50] bootmem, x86: Add weak version of reserve_bootmem_generic Yinghai Lu
2010-07-13 7:10 ` Yinghai Lu
2010-07-13 7:10 ` [PATCH 37/50] x86, memblock: Add memblock_x86_to_bootmem() Yinghai Lu
2010-07-13 7:10 ` Yinghai Lu
2010-07-13 7:10 ` [PATCH 38/50] x86,memblock: Add memblock_x86_reserve_range/memblock_x86_free_range Yinghai Lu
2010-07-13 7:10 ` Yinghai Lu
2010-07-13 7:10 ` Yinghai Lu [this message]
2010-07-13 7:10 ` [PATCH 39/50] x86, memblock: Add get_free_all_memory_range() Yinghai Lu
2010-07-13 7:10 ` [PATCH 40/50] x86, memblock: Add memblock_x86_register_active_regions() and memblock_x86_hole_size() Yinghai Lu
2010-07-13 7:10 ` Yinghai Lu
2010-07-13 7:10 ` [PATCH 41/50] memblock: Add find_memory_core_early() Yinghai Lu
2010-07-13 7:10 ` Yinghai Lu
2010-07-13 7:10 ` [PATCH 42/50] x86, memblock: Add memblock_x86_find_in_range_node() Yinghai Lu
2010-07-13 7:10 ` Yinghai Lu
2010-07-13 7:10 ` [PATCH 43/50] x86, memblock: Add memblock_x86_free_memory_in_range() Yinghai Lu
2010-07-13 7:10 ` Yinghai Lu
2010-07-13 7:10 ` [PATCH 44/50] x86, memblock: Add memblock_x86_memory_in_range() Yinghai Lu
2010-07-13 7:10 ` Yinghai Lu
2010-07-13 7:10 ` [PATCH 45/50] x86, memblock: Use memblock_debug to control debug message print out Yinghai Lu
2010-07-13 7:10 ` Yinghai Lu
2010-07-13 20:37 ` Bjorn Helgaas
2010-07-13 20:40 ` Yinghai Lu
2010-07-13 7:10 ` [PATCH 46/50] x86: Use memblock to replace early_res Yinghai Lu
2010-07-13 7:10 ` Yinghai Lu
2010-07-13 7:10 ` [PATCH 47/50] x86: Replace e820_/_early string with memblock_ Yinghai Lu
2010-07-13 7:10 ` Yinghai Lu
2010-07-13 7:10 ` [PATCH 48/50] x86: Remove not used early_res code Yinghai Lu
2010-07-13 7:10 ` Yinghai Lu
2010-07-13 7:10 ` [PATCH 49/50] x86, memblock: Use memblock_memory_size()/memblock_free_memory_size() to get correct dma_reserve Yinghai Lu
2010-07-13 7:10 ` Yinghai Lu
2010-07-13 7:10 ` [PATCH 50/50] x86: remove old bootmem code Yinghai Lu
2010-07-13 7:10 ` Yinghai Lu
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=1279005044-24777-40-git-send-email-yinghai@kernel.org \
--to=yinghai@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=davem@davemloft.net \
--cc=hannes@cmpxchg.org \
--cc=hpa@zytor.com \
--cc=jbeulich@novell.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.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).