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>,
Be
Cc: Johannes Weiner <hannes@cmpxchg.org>,
linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org,
Yinghai Lu <yinghai@kernel.org>
Subject: [PATCH 05/29] lmb: Add lmb_reserve_area/lmb_free_area
Date: Tue, 30 Mar 2010 04:19:39 -0700 [thread overview]
Message-ID: <1269948003-17221-6-git-send-email-yinghai@kernel.org> (raw)
In-Reply-To: <1269948003-17221-1-git-send-email-yinghai@kernel.org>
They will check if the region array is big enough.
__check_and_double_region_array will try to double the region if that array
spare slots is not big enough.
Old array will be copied to new array.
Arch code should update lmb.default_alloc_limit, so the new array have
accessiable address
-v2: change get_max_mapped() to lmb.default_alloc_limit according to Michael Ellerman and Ben
change to lmb_reserve_area and lmb_free_area according to Michael Ellerman
-v3: call check_and_double after reserve/free, so could avoid to use fin_lmb_area. Suggested by
Michael Ellerman
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
---
include/linux/lmb.h | 4 +++
mm/lmb.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 70 insertions(+), 0 deletions(-)
diff --git a/include/linux/lmb.h b/include/linux/lmb.h
index 4cf2f3b..598662f 100644
--- a/include/linux/lmb.h
+++ b/include/linux/lmb.h
@@ -33,6 +33,7 @@ struct lmb_region {
struct lmb {
unsigned long debug;
u64 rmo_size;
+ u64 default_alloc_limit;
struct lmb_region memory;
struct lmb_region reserved;
};
@@ -83,6 +84,9 @@ lmb_end_pfn(struct lmb_region *type, unsigned long region_nr)
lmb_size_pages(type, region_nr);
}
+void lmb_reserve_area(u64 start, u64 end, char *name);
+void lmb_free_area(u64 start, u64 end);
+void lmb_add_memory(u64 start, u64 end);
u64 __lmb_find_area(u64 ei_start, u64 ei_last, u64 start, u64 end,
u64 size, u64 align);
u64 lmb_find_area(u64 start, u64 end, u64 size, u64 align);
diff --git a/mm/lmb.c b/mm/lmb.c
index 30c6917..94e90b6 100644
--- a/mm/lmb.c
+++ b/mm/lmb.c
@@ -564,6 +564,72 @@ int lmb_find(struct lmb_property *res)
return -1;
}
+static void __init __check_and_double_region_array(struct lmb_region *type,
+ struct lmb_property *static_region)
+{
+ u64 size, mem;
+ struct lmb_property *new, *old;
+ unsigned long rgnsz = type->nr_regions;
+
+ /* Do we have enough slots left ? */
+ if ((rgnsz - type->cnt) > 2)
+ return;
+
+ old = type->region;
+ /* Double the array size */
+ size = sizeof(struct lmb_property) * rgnsz * 2;
+
+ mem = __lmb_alloc_base(size, sizeof(struct lmb_property), lmb.default_alloc_limit);
+ if (mem == 0)
+ panic("can not find more space for lmb.reserved.region array");
+
+ new = __va(mem);
+ /* Copy old to new */
+ memcpy(&new[0], &old[0], sizeof(struct lmb_property) * rgnsz);
+ memset(&new[rgnsz], 0, sizeof(struct lmb_property) * rgnsz);
+
+ memset(&old[0], 0, sizeof(struct lmb_property) * rgnsz);
+ type->region = new;
+ type->nr_regions = rgnsz * 2;
+ printk(KERN_DEBUG "lmb.reserved.region array is doubled to %ld at [%llx - %llx]\n",
+ type->nr_regions, mem, mem + size - 1);
+
+ /* Free old one ?*/
+ if (old != static_region)
+ lmb_free(__pa(old), sizeof(struct lmb_property) * rgnsz);
+}
+
+void __init lmb_add_memory(u64 start, u64 end)
+{
+ lmb_add_region(&lmb.memory, start, end - start);
+ __check_and_double_region_array(&lmb.memory, &lmb_memory_region[0]);
+}
+
+void __init lmb_reserve_area(u64 start, u64 end, char *name)
+{
+ if (start == end)
+ return;
+
+ if (WARN_ONCE(start > end, "lmb_reserve_area: wrong range [%#llx, %#llx]\n", start, end))
+ return;
+
+ lmb_add_region(&lmb.reserved, start, end - start);
+ __check_and_double_region_array(&lmb.reserved, &lmb_reserved_region[0]);
+}
+
+void __init lmb_free_area(u64 start, u64 end)
+{
+ if (start == end)
+ return;
+
+ if (WARN_ONCE(start > end, "lmb_free_area: wrong range [%#llx, %#llx]\n", start, end))
+ return;
+
+ /* keep punching hole, could run out of slots too */
+ lmb_free(start, end - start);
+ __check_and_double_region_array(&lmb.reserved, &lmb_reserved_region[0]);
+}
+
u64 __init __lmb_find_area(u64 ei_start, u64 ei_last, u64 start, u64 end,
u64 size, u64 align)
{
--
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>,
Linus Torvalds <torvalds@linux-foundation.org>
Cc: Johannes Weiner <hannes@cmpxchg.org>,
linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org,
Yinghai Lu <yinghai@kernel.org>
Subject: [PATCH 05/29] lmb: Add lmb_reserve_area/lmb_free_area
Date: Tue, 30 Mar 2010 04:19:39 -0700 [thread overview]
Message-ID: <1269948003-17221-6-git-send-email-yinghai@kernel.org> (raw)
Message-ID: <20100330111939.HRT9rkRRCMmwOB5JTs9Dgjosd33tR1Xq9AEWiSgmxew@z> (raw)
In-Reply-To: <1269948003-17221-1-git-send-email-yinghai@kernel.org>
They will check if the region array is big enough.
__check_and_double_region_array will try to double the region if that array
spare slots is not big enough.
Old array will be copied to new array.
Arch code should update lmb.default_alloc_limit, so the new array have
accessiable address
-v2: change get_max_mapped() to lmb.default_alloc_limit according to Michael Ellerman and Ben
change to lmb_reserve_area and lmb_free_area according to Michael Ellerman
-v3: call check_and_double after reserve/free, so could avoid to use fin_lmb_area. Suggested by
Michael Ellerman
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
---
include/linux/lmb.h | 4 +++
mm/lmb.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 70 insertions(+), 0 deletions(-)
diff --git a/include/linux/lmb.h b/include/linux/lmb.h
index 4cf2f3b..598662f 100644
--- a/include/linux/lmb.h
+++ b/include/linux/lmb.h
@@ -33,6 +33,7 @@ struct lmb_region {
struct lmb {
unsigned long debug;
u64 rmo_size;
+ u64 default_alloc_limit;
struct lmb_region memory;
struct lmb_region reserved;
};
@@ -83,6 +84,9 @@ lmb_end_pfn(struct lmb_region *type, unsigned long region_nr)
lmb_size_pages(type, region_nr);
}
+void lmb_reserve_area(u64 start, u64 end, char *name);
+void lmb_free_area(u64 start, u64 end);
+void lmb_add_memory(u64 start, u64 end);
u64 __lmb_find_area(u64 ei_start, u64 ei_last, u64 start, u64 end,
u64 size, u64 align);
u64 lmb_find_area(u64 start, u64 end, u64 size, u64 align);
diff --git a/mm/lmb.c b/mm/lmb.c
index 30c6917..94e90b6 100644
--- a/mm/lmb.c
+++ b/mm/lmb.c
@@ -564,6 +564,72 @@ int lmb_find(struct lmb_property *res)
return -1;
}
+static void __init __check_and_double_region_array(struct lmb_region *type,
+ struct lmb_property *static_region)
+{
+ u64 size, mem;
+ struct lmb_property *new, *old;
+ unsigned long rgnsz = type->nr_regions;
+
+ /* Do we have enough slots left ? */
+ if ((rgnsz - type->cnt) > 2)
+ return;
+
+ old = type->region;
+ /* Double the array size */
+ size = sizeof(struct lmb_property) * rgnsz * 2;
+
+ mem = __lmb_alloc_base(size, sizeof(struct lmb_property), lmb.default_alloc_limit);
+ if (mem == 0)
+ panic("can not find more space for lmb.reserved.region array");
+
+ new = __va(mem);
+ /* Copy old to new */
+ memcpy(&new[0], &old[0], sizeof(struct lmb_property) * rgnsz);
+ memset(&new[rgnsz], 0, sizeof(struct lmb_property) * rgnsz);
+
+ memset(&old[0], 0, sizeof(struct lmb_property) * rgnsz);
+ type->region = new;
+ type->nr_regions = rgnsz * 2;
+ printk(KERN_DEBUG "lmb.reserved.region array is doubled to %ld at [%llx - %llx]\n",
+ type->nr_regions, mem, mem + size - 1);
+
+ /* Free old one ?*/
+ if (old != static_region)
+ lmb_free(__pa(old), sizeof(struct lmb_property) * rgnsz);
+}
+
+void __init lmb_add_memory(u64 start, u64 end)
+{
+ lmb_add_region(&lmb.memory, start, end - start);
+ __check_and_double_region_array(&lmb.memory, &lmb_memory_region[0]);
+}
+
+void __init lmb_reserve_area(u64 start, u64 end, char *name)
+{
+ if (start == end)
+ return;
+
+ if (WARN_ONCE(start > end, "lmb_reserve_area: wrong range [%#llx, %#llx]\n", start, end))
+ return;
+
+ lmb_add_region(&lmb.reserved, start, end - start);
+ __check_and_double_region_array(&lmb.reserved, &lmb_reserved_region[0]);
+}
+
+void __init lmb_free_area(u64 start, u64 end)
+{
+ if (start == end)
+ return;
+
+ if (WARN_ONCE(start > end, "lmb_free_area: wrong range [%#llx, %#llx]\n", start, end))
+ return;
+
+ /* keep punching hole, could run out of slots too */
+ lmb_free(start, end - start);
+ __check_and_double_region_array(&lmb.reserved, &lmb_reserved_region[0]);
+}
+
u64 __init __lmb_find_area(u64 ei_start, u64 ei_last, u64 start, u64 end,
u64 size, u64 align)
{
--
1.6.4.2
next prev parent reply other threads:[~2010-03-30 11:22 UTC|newest]
Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-30 11:19 [PATCH -v10 00/29] use lmb with x86 Yinghai Lu
2010-03-30 11:19 ` Yinghai Lu
2010-03-30 11:19 ` [PATCH 01/29] x86: Make e820_remove_range to handle all covered case Yinghai Lu
2010-03-30 11:19 ` Yinghai Lu
2010-03-30 11:19 ` [PATCH 02/29] lmb: Move lmb.c to mm/ Yinghai Lu
2010-03-30 11:19 ` Yinghai Lu
2010-03-30 11:19 ` [PATCH 03/29] lmb: Seperate region array from lmb_region struct Yinghai Lu
2010-03-30 11:19 ` Yinghai Lu
2010-03-30 11:19 ` [PATCH 04/29] lmb: Add lmb_find_area() Yinghai Lu
2010-03-30 11:19 ` Yinghai Lu
2010-03-30 11:19 ` Yinghai Lu [this message]
2010-03-30 11:19 ` [PATCH 05/29] lmb: Add lmb_reserve_area/lmb_free_area Yinghai Lu
2010-03-30 11:19 ` [PATCH 06/29] bootmem, x86: Add weak version of reserve_bootmem_generic Yinghai Lu
2010-03-30 11:19 ` Yinghai Lu
2010-03-30 11:19 ` [PATCH 07/29] lmb: Add lmb_to_bootmem() Yinghai Lu
2010-03-30 11:19 ` Yinghai Lu
2010-03-30 11:19 ` [PATCH 08/29] lmb: Add get_free_all_memory_range() Yinghai Lu
2010-03-30 11:19 ` Yinghai Lu
2010-03-30 11:19 ` [PATCH 09/29] lmb: Add lmb_register_active_regions() and lmb_hole_size() Yinghai Lu
2010-03-30 11:19 ` Yinghai Lu
2010-03-30 11:19 ` [PATCH 10/29] lmb: Prepare to include linux/lmb.h in core file Yinghai Lu
2010-03-30 11:19 ` Yinghai Lu
2010-03-30 11:19 ` [PATCH 11/29] lmb: Add find_memory_core_early() Yinghai Lu
2010-03-30 11:19 ` Yinghai Lu
2010-03-30 11:19 ` [PATCH 12/29] lmb: Add lmb_find_area_node() Yinghai Lu
2010-03-30 11:19 ` Yinghai Lu
2010-03-30 11:19 ` [PATCH 13/29] lmb: Add lmb_free_memory_size() Yinghai Lu
2010-03-30 11:19 ` Yinghai Lu
2010-03-30 11:19 ` [PATCH 14/29] lmb: Add lmb_memory_size() Yinghai Lu
2010-03-30 11:19 ` Yinghai Lu
2010-03-30 11:19 ` [PATCH 15/29] lmb: Add lmb_reserve_area_overlap_ok() Yinghai Lu
2010-03-30 11:19 ` Yinghai Lu
2010-03-30 11:19 ` [PATCH 16/29] lmb: Use lmb_debug to control debug message print out Yinghai Lu
2010-03-30 11:19 ` Yinghai Lu
2010-03-30 11:19 ` [PATCH 17/29] lmb: Add ARCH_DISCARD_LMB to put lmb code to .init Yinghai Lu
2010-03-30 11:19 ` Yinghai Lu
2010-03-30 11:19 ` [PATCH 18/29] x86: Add sanitize_e820_map() Yinghai Lu
2010-03-30 11:19 ` Yinghai Lu
2010-03-30 11:19 ` [PATCH 19/29] lmb: Add lmb_find_area_size() Yinghai Lu
2010-03-30 11:19 ` Yinghai Lu
2010-03-30 11:19 ` [PATCH 20/29] x86: Use lmb to replace early_res Yinghai Lu
2010-03-30 11:19 ` Yinghai Lu
2010-03-30 11:19 ` [PATCH 21/29] x86: Replace e820_/_early string with lmb_ Yinghai Lu
2010-03-30 11:19 ` Yinghai Lu
2010-03-30 11:19 ` [PATCH 22/29] x86: Remove not used early_res code Yinghai Lu
2010-03-30 11:19 ` Yinghai Lu
2010-03-30 11:19 ` [PATCH 23/29] x86, lmb: Use lmb_memory_size()/lmb_free_memory_size() to get correct dma_reserve Yinghai Lu
2010-03-30 11:19 ` Yinghai Lu
2010-03-30 11:19 ` [PATCH 24/29] x86: Align e820 ram range to page Yinghai Lu
2010-03-30 11:19 ` Yinghai Lu
2010-03-30 11:19 ` [PATCH 25/29] x86: Use wake_system_ram_range instead of e820_any_mapped in agp path Yinghai Lu
2010-03-30 11:19 ` Yinghai Lu
2010-03-30 11:20 ` [PATCH 26/29] x86: Add get_centaur_ram_top() Yinghai Lu
2010-03-30 11:20 ` Yinghai Lu
2010-03-30 11:20 ` [PATCH 27/29] x86: Make e820_any_mapped to __init Yinghai Lu
2010-03-30 11:20 ` Yinghai Lu
2010-03-30 11:20 ` [PATCH 28/29] x86: Use walk_system_ream_range()instead of referring e820.map directly for tboot Yinghai Lu
2010-03-30 11:20 ` Yinghai Lu
2010-03-30 11:20 ` [PATCH 29/29] x86: make e820 to be __initdata Yinghai Lu
2010-03-30 11:20 ` 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=1269948003-17221-6-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=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=tglx@linutronix.de \
/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).