linux-arch.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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 20/33] x86, lmb: Add lmb_find_area_size()
Date: Tue, 30 Mar 2010 19:17:05 -0700	[thread overview]
Message-ID: <1270001838-15857-21-git-send-email-yinghai@kernel.org> (raw)
In-Reply-To: <1270001838-15857-1-git-send-email-yinghai@kernel.org>

size is returned according free range.
Will be used to find free ranges for early_memtest and memory corruption check

Do not mess it up with mm/lmb.c yet.

Signed-off-by: Yinghai Lu <yinghai@kernel.org>
---
 arch/x86/mm/Makefile |    2 +
 arch/x86/mm/lmb.c    |   88 ++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 90 insertions(+), 0 deletions(-)
 create mode 100644 arch/x86/mm/lmb.c

diff --git a/arch/x86/mm/Makefile b/arch/x86/mm/Makefile
index a4c7683..8ab0505 100644
--- a/arch/x86/mm/Makefile
+++ b/arch/x86/mm/Makefile
@@ -26,4 +26,6 @@ obj-$(CONFIG_NUMA)		+= numa.o numa_$(BITS).o
 obj-$(CONFIG_K8_NUMA)		+= k8topology_64.o
 obj-$(CONFIG_ACPI_NUMA)		+= srat_$(BITS).o
 
+obj-$(CONFIG_HAVE_LMB)		+= lmb.o
+
 obj-$(CONFIG_MEMTEST)		+= memtest.o
diff --git a/arch/x86/mm/lmb.c b/arch/x86/mm/lmb.c
new file mode 100644
index 0000000..3229e9e
--- /dev/null
+++ b/arch/x86/mm/lmb.c
@@ -0,0 +1,88 @@
+#include <linux/kernel.h>
+#include <linux/types.h>
+#include <linux/init.h>
+#include <linux/bitops.h>
+#include <linux/lmb.h>
+#include <linux/bootmem.h>
+#include <linux/mm.h>
+#include <linux/range.h>
+
+/* Check for already reserved areas */
+static inline bool __init bad_addr_size(u64 *addrp, u64 *sizep, u64 align)
+{
+	int i;
+	u64 addr = *addrp, last;
+	u64 size = *sizep;
+	bool changed = false;
+again:
+	last = addr + size;
+	for (i = 0; i < lmb.reserved.cnt && lmb.reserved.region[i].size; i++) {
+		struct lmb_property *r = &lmb.reserved.region[i];
+		if (last > r->base && addr < r->base) {
+			size = r->base - addr;
+			changed = true;
+			goto again;
+		}
+		if (last > (r->base + r->size) && addr < (r->base + r->size)) {
+			addr = round_up(r->base + r->size, align);
+			size = last - addr;
+			changed = true;
+			goto again;
+		}
+		if (last <= (r->base + r->size) && addr >= r->base) {
+			(*sizep)++;
+			return false;
+		}
+	}
+	if (changed) {
+		*addrp = addr;
+		*sizep = size;
+	}
+	return changed;
+}
+
+static u64 __init __lmb_find_area_size(u64 ei_start, u64 ei_last, u64 start,
+			 u64 *sizep, u64 align)
+{
+	u64 addr, last;
+
+	addr = round_up(ei_start, align);
+	if (addr < start)
+		addr = round_up(start, align);
+	if (addr >= ei_last)
+		goto out;
+	*sizep = ei_last - addr;
+	while (bad_addr_size(&addr, sizep, align) && addr + *sizep <= ei_last)
+		;
+	last = addr + *sizep;
+	if (last > ei_last)
+		goto out;
+
+	return addr;
+
+out:
+	return -1ULL;
+}
+
+/*
+ * Find next free range after *start
+ */
+u64 __init lmb_find_area_size(u64 start, u64 *sizep, u64 align)
+{
+	int i;
+
+	for (i = 0; i < lmb.memory.cnt; i++) {
+		u64 ei_start = lmb.memory.region[i].base;
+		u64 ei_last = ei_start + lmb.memory.region[i].size;
+		u64 addr;
+
+		addr = __lmb_find_area_size(ei_start, ei_last, start,
+					 sizep, align);
+
+		if (addr != -1ULL)
+			return addr;
+	}
+
+	return -1ULL;
+}
+
-- 
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 20/33] x86, lmb: Add lmb_find_area_size()
Date: Tue, 30 Mar 2010 19:17:05 -0700	[thread overview]
Message-ID: <1270001838-15857-21-git-send-email-yinghai@kernel.org> (raw)
Message-ID: <20100331021705.YYBzv9RFdX2hYlMZLW4uMeYMRzI0NsDt6tXAD-qE21w@z> (raw)
In-Reply-To: <1270001838-15857-1-git-send-email-yinghai@kernel.org>

size is returned according free range.
Will be used to find free ranges for early_memtest and memory corruption check

Do not mess it up with mm/lmb.c yet.

Signed-off-by: Yinghai Lu <yinghai@kernel.org>
---
 arch/x86/mm/Makefile |    2 +
 arch/x86/mm/lmb.c    |   88 ++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 90 insertions(+), 0 deletions(-)
 create mode 100644 arch/x86/mm/lmb.c

diff --git a/arch/x86/mm/Makefile b/arch/x86/mm/Makefile
index a4c7683..8ab0505 100644
--- a/arch/x86/mm/Makefile
+++ b/arch/x86/mm/Makefile
@@ -26,4 +26,6 @@ obj-$(CONFIG_NUMA)		+= numa.o numa_$(BITS).o
 obj-$(CONFIG_K8_NUMA)		+= k8topology_64.o
 obj-$(CONFIG_ACPI_NUMA)		+= srat_$(BITS).o
 
+obj-$(CONFIG_HAVE_LMB)		+= lmb.o
+
 obj-$(CONFIG_MEMTEST)		+= memtest.o
diff --git a/arch/x86/mm/lmb.c b/arch/x86/mm/lmb.c
new file mode 100644
index 0000000..3229e9e
--- /dev/null
+++ b/arch/x86/mm/lmb.c
@@ -0,0 +1,88 @@
+#include <linux/kernel.h>
+#include <linux/types.h>
+#include <linux/init.h>
+#include <linux/bitops.h>
+#include <linux/lmb.h>
+#include <linux/bootmem.h>
+#include <linux/mm.h>
+#include <linux/range.h>
+
+/* Check for already reserved areas */
+static inline bool __init bad_addr_size(u64 *addrp, u64 *sizep, u64 align)
+{
+	int i;
+	u64 addr = *addrp, last;
+	u64 size = *sizep;
+	bool changed = false;
+again:
+	last = addr + size;
+	for (i = 0; i < lmb.reserved.cnt && lmb.reserved.region[i].size; i++) {
+		struct lmb_property *r = &lmb.reserved.region[i];
+		if (last > r->base && addr < r->base) {
+			size = r->base - addr;
+			changed = true;
+			goto again;
+		}
+		if (last > (r->base + r->size) && addr < (r->base + r->size)) {
+			addr = round_up(r->base + r->size, align);
+			size = last - addr;
+			changed = true;
+			goto again;
+		}
+		if (last <= (r->base + r->size) && addr >= r->base) {
+			(*sizep)++;
+			return false;
+		}
+	}
+	if (changed) {
+		*addrp = addr;
+		*sizep = size;
+	}
+	return changed;
+}
+
+static u64 __init __lmb_find_area_size(u64 ei_start, u64 ei_last, u64 start,
+			 u64 *sizep, u64 align)
+{
+	u64 addr, last;
+
+	addr = round_up(ei_start, align);
+	if (addr < start)
+		addr = round_up(start, align);
+	if (addr >= ei_last)
+		goto out;
+	*sizep = ei_last - addr;
+	while (bad_addr_size(&addr, sizep, align) && addr + *sizep <= ei_last)
+		;
+	last = addr + *sizep;
+	if (last > ei_last)
+		goto out;
+
+	return addr;
+
+out:
+	return -1ULL;
+}
+
+/*
+ * Find next free range after *start
+ */
+u64 __init lmb_find_area_size(u64 start, u64 *sizep, u64 align)
+{
+	int i;
+
+	for (i = 0; i < lmb.memory.cnt; i++) {
+		u64 ei_start = lmb.memory.region[i].base;
+		u64 ei_last = ei_start + lmb.memory.region[i].size;
+		u64 addr;
+
+		addr = __lmb_find_area_size(ei_start, ei_last, start,
+					 sizep, align);
+
+		if (addr != -1ULL)
+			return addr;
+	}
+
+	return -1ULL;
+}
+
-- 
1.6.4.2


  parent reply	other threads:[~2010-03-31  2:17 UTC|newest]

Thread overview: 72+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-03-31  2:16 [PATCH -v11 00/33] use lmb with x86 Yinghai Lu
2010-03-31  2:16 ` Yinghai Lu
2010-03-31  2:16 ` [PATCH 01/33] x86: Make e820_remove_range() to handle all covered case Yinghai Lu
2010-03-31  2:16   ` Yinghai Lu
2010-03-31  2:16 ` [PATCH 02/33] lmb: Move lmb.c to mm/ Yinghai Lu
2010-03-31  2:16   ` Yinghai Lu
2010-03-31  2:16 ` [PATCH 03/33] lmb: Seperate region array from lmb_region struct Yinghai Lu
2010-03-31  2:16   ` Yinghai Lu
2010-03-31  2:16 ` [PATCH 04/33] lmb: Seperate __lmb_find_base() from __lmb_alloc_base() Yinghai Lu
2010-03-31  2:16   ` Yinghai Lu
2010-03-31  2:16 ` [PATCH 05/33] lmb: Add lmb_find_area() Yinghai Lu
2010-03-31  2:16   ` Yinghai Lu
2010-03-31  2:16 ` [PATCH 06/33] lmb: Add lmb_reserve_area/lmb_free_area Yinghai Lu
2010-03-31  2:16   ` Yinghai Lu
2010-04-07 23:35   ` Michael Ellerman
2010-04-07 23:36     ` Yinghai
2010-03-31  2:16 ` [PATCH 07/33] bootmem, x86: Add weak version of reserve_bootmem_generic Yinghai Lu
2010-03-31  2:16   ` Yinghai Lu
2010-03-31  2:16 ` [PATCH 08/33] lmb: Add lmb_to_bootmem() Yinghai Lu
2010-03-31  2:16   ` Yinghai Lu
2010-03-31  2:16 ` [PATCH 09/33] lmb: Add get_free_all_memory_range() Yinghai Lu
2010-03-31  2:16   ` Yinghai Lu
2010-03-31  2:16 ` [PATCH 10/33] lmb: Add lmb_register_active_regions() and lmb_hole_size() Yinghai Lu
2010-03-31  2:16   ` Yinghai Lu
2010-03-31  2:16 ` [PATCH 11/33] lmb: Prepare to include linux/lmb.h in core file Yinghai Lu
2010-03-31  2:16   ` Yinghai Lu
2010-03-31  2:16 ` [PATCH 12/33] lmb: Add find_memory_core_early() Yinghai Lu
2010-03-31  2:16   ` Yinghai Lu
2010-03-31  2:16 ` [PATCH 13/33] lmb: Add lmb_find_area_node() Yinghai Lu
2010-03-31  2:16   ` Yinghai Lu
2010-03-31  2:16 ` [PATCH 14/33] lmb: Add lmb_free_memory_size() Yinghai Lu
2010-03-31  2:16   ` Yinghai Lu
2010-03-31  2:17 ` [PATCH 15/33] lmb: Add lmb_memory_size() Yinghai Lu
2010-03-31  2:17   ` Yinghai Lu
2010-03-31  2:17 ` [PATCH 16/33] lmb: Add lmb_reserve_area_overlap_ok() Yinghai Lu
2010-03-31  2:17   ` Yinghai Lu
2010-03-31  2:17 ` [PATCH 17/33] lmb: Use lmb_debug to control debug message print out Yinghai Lu
2010-03-31  2:17   ` Yinghai Lu
2010-03-31  2:17 ` [PATCH 18/33] lmb: Add ARCH_DISCARD_LMB to put lmb code to .init Yinghai Lu
2010-03-31  2:17   ` Yinghai Lu
2010-03-31  2:17 ` [PATCH 19/33] x86: Add sanitize_e820_map() Yinghai Lu
2010-03-31  2:17   ` Yinghai Lu
2010-03-31  2:17 ` Yinghai Lu [this message]
2010-03-31  2:17   ` [PATCH 20/33] x86, lmb: Add lmb_find_area_size() Yinghai Lu
2010-03-31  2:17 ` [PATCH 21/33] x86, lmb: Add x86 version of __lmb_find_area() Yinghai Lu
2010-03-31  2:17   ` Yinghai Lu
2010-03-31  2:17 ` [PATCH 22/33] x86: Use lmb to replace early_res Yinghai Lu
2010-03-31  2:17   ` Yinghai Lu
2010-03-31  2:17 ` [PATCH 23/33] x86: Replace e820_/_early string with lmb_ Yinghai Lu
2010-03-31  2:17   ` Yinghai Lu
2010-03-31  2:17 ` [PATCH 24/33] nobootmem: use lmb.default_alloc_limit in alloc_bootmem path Yinghai Lu
2010-03-31  2:17   ` Yinghai Lu
2010-03-31  2:17 ` [PATCH 25/33] x86, lmb: turn off ARCH_LMB_FIND_AREA Yinghai Lu
2010-03-31  2:17   ` Yinghai Lu
2010-04-07 23:38   ` Michael Ellerman
2010-04-07 23:40     ` Yinghai
2010-03-31  2:17 ` [PATCH 26/33] x86: Remove not used early_res code Yinghai Lu
2010-03-31  2:17   ` Yinghai Lu
2010-03-31  2:17 ` [PATCH 27/33] x86, lmb: Use lmb_memory_size()/lmb_free_memory_size() to get correct dma_reserve Yinghai Lu
2010-03-31  2:17   ` Yinghai Lu
2010-03-31  2:17 ` [PATCH 28/33] x86: Align e820 ram range to page Yinghai Lu
2010-03-31  2:17   ` Yinghai Lu
2010-03-31  2:17 ` [PATCH 29/33] x86: Use wake_system_ram_range instead of e820_any_mapped in agp path Yinghai Lu
2010-03-31  2:17   ` Yinghai Lu
2010-03-31  2:17 ` [PATCH 30/33] x86: Add get_centaur_ram_top() Yinghai Lu
2010-03-31  2:17   ` Yinghai Lu
2010-03-31  2:17 ` [PATCH 31/33] x86: Change e820_any_mapped() to __init Yinghai Lu
2010-03-31  2:17   ` Yinghai Lu
2010-03-31  2:17 ` [PATCH 32/33] x86: Use walk_system_ream_range() instead of referring e820.map directly for tboot Yinghai Lu
2010-03-31  2:17   ` Yinghai Lu
2010-03-31  2:17 ` [PATCH 33/33] x86: make e820 to be __initdata Yinghai Lu
2010-03-31  2:17   ` 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=1270001838-15857-21-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).