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/17] x86,memblock: Add memblock_x86_reserve_range/memblock_x86_free_range
Date: Thu, 29 Jul 2010 12:45:25 -0700 [thread overview]
Message-ID: <1280432737-1808-6-git-send-email-yinghai@kernel.org> (raw)
In-Reply-To: <1280432737-1808-1-git-send-email-yinghai@kernel.org>
they are wrappers for core versions.
they are taking start/end/name instead of base/size.
will make x86 conversion more easy
could add more debug print out
-v2: change get_max_mapped() to memblock.default_alloc_limit according to Michael
Ellerman and Ben
change to memblock_x86_reserve_range and memblock_x86_free_range according to Michael Ellerman
-v3: call check_and_double after reserve/free, so could avoid to use
find_memblock_area. Suggested by Michael Ellerman
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
---
arch/x86/include/asm/memblock.h | 3 +++
arch/x86/mm/memblock.c | 22 ++++++++++++++++++++++
2 files changed, 25 insertions(+), 0 deletions(-)
diff --git a/arch/x86/include/asm/memblock.h b/arch/x86/include/asm/memblock.h
index 69cf853..e11ddf0 100644
--- a/arch/x86/include/asm/memblock.h
+++ b/arch/x86/include/asm/memblock.h
@@ -6,4 +6,7 @@
u64 memblock_x86_find_in_range_size(u64 start, u64 *sizep, u64 align);
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);
+
#endif
diff --git a/arch/x86/mm/memblock.c b/arch/x86/mm/memblock.c
index 8101084..9829eaf 100644
--- a/arch/x86/mm/memblock.c
+++ b/arch/x86/mm/memblock.c
@@ -114,3 +114,25 @@ void __init memblock_x86_to_bootmem(u64 start, u64 end)
memblock_reserve_reserved_regions();
}
#endif
+
+void __init memblock_x86_reserve_range(u64 start, u64 end, char *name)
+{
+ if (start == end)
+ return;
+
+ if (WARN_ONCE(start > end, "memblock_x86_reserve_range: wrong range [%#llx, %#llx]\n", start, end))
+ return;
+
+ memblock_reserve(start, end - start);
+}
+
+void __init memblock_x86_free_range(u64 start, u64 end)
+{
+ if (start == end)
+ return;
+
+ if (WARN_ONCE(start > end, "memblock_x86_free_range: wrong range [%#llx, %#llx]\n", start, end))
+ return;
+
+ memblock_free(start, end - start);
+}
--
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/17] x86,memblock: Add memblock_x86_reserve_range/memblock_x86_free_range
Date: Thu, 29 Jul 2010 12:45:25 -0700 [thread overview]
Message-ID: <1280432737-1808-6-git-send-email-yinghai@kernel.org> (raw)
Message-ID: <20100729194525.MlfUUJwL6kNpAzE2YLxnFuZH0CssoU5JL6mAAXHdp2s@z> (raw)
In-Reply-To: <1280432737-1808-1-git-send-email-yinghai@kernel.org>
they are wrappers for core versions.
they are taking start/end/name instead of base/size.
will make x86 conversion more easy
could add more debug print out
-v2: change get_max_mapped() to memblock.default_alloc_limit according to Michael
Ellerman and Ben
change to memblock_x86_reserve_range and memblock_x86_free_range according to Michael Ellerman
-v3: call check_and_double after reserve/free, so could avoid to use
find_memblock_area. Suggested by Michael Ellerman
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
---
arch/x86/include/asm/memblock.h | 3 +++
arch/x86/mm/memblock.c | 22 ++++++++++++++++++++++
2 files changed, 25 insertions(+), 0 deletions(-)
diff --git a/arch/x86/include/asm/memblock.h b/arch/x86/include/asm/memblock.h
index 69cf853..e11ddf0 100644
--- a/arch/x86/include/asm/memblock.h
+++ b/arch/x86/include/asm/memblock.h
@@ -6,4 +6,7 @@
u64 memblock_x86_find_in_range_size(u64 start, u64 *sizep, u64 align);
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);
+
#endif
diff --git a/arch/x86/mm/memblock.c b/arch/x86/mm/memblock.c
index 8101084..9829eaf 100644
--- a/arch/x86/mm/memblock.c
+++ b/arch/x86/mm/memblock.c
@@ -114,3 +114,25 @@ void __init memblock_x86_to_bootmem(u64 start, u64 end)
memblock_reserve_reserved_regions();
}
#endif
+
+void __init memblock_x86_reserve_range(u64 start, u64 end, char *name)
+{
+ if (start == end)
+ return;
+
+ if (WARN_ONCE(start > end, "memblock_x86_reserve_range: wrong range [%#llx, %#llx]\n", start, end))
+ return;
+
+ memblock_reserve(start, end - start);
+}
+
+void __init memblock_x86_free_range(u64 start, u64 end)
+{
+ if (start == end)
+ return;
+
+ if (WARN_ONCE(start > end, "memblock_x86_free_range: wrong range [%#llx, %#llx]\n", start, end))
+ return;
+
+ memblock_free(start, end - start);
+}
--
1.6.4.2
next prev parent reply other threads:[~2010-07-29 19:45 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-29 19:45 [PATCH -v27 00/17] Use memblock with x86 Yinghai Lu
2010-07-29 19:45 ` Yinghai Lu
2010-07-29 19:45 ` [PATCH 01/17] memblock: Add memblock_free/reserve_reserved_regions() Yinghai Lu
2010-07-29 19:45 ` Yinghai Lu
2010-07-29 19:45 ` [PATCH 02/17] x86, memblock: Add memblock_x86_find_in_range_size() Yinghai Lu
2010-07-29 19:45 ` Yinghai Lu
2010-07-29 19:45 ` [PATCH 03/17] bootmem, x86: Add weak version of reserve_bootmem_generic Yinghai Lu
2010-07-29 19:45 ` Yinghai Lu
2010-07-29 19:45 ` [PATCH 04/17] x86, memblock: Add memblock_x86_to_bootmem() Yinghai Lu
2010-07-29 19:45 ` Yinghai Lu
2010-07-29 19:45 ` Yinghai Lu [this message]
2010-07-29 19:45 ` [PATCH 05/17] x86,memblock: Add memblock_x86_reserve_range/memblock_x86_free_range Yinghai Lu
2010-07-29 19:45 ` [PATCH 06/17] x86, memblock: Add get_free_all_memory_range() Yinghai Lu
2010-07-29 19:45 ` Yinghai Lu
2010-07-29 19:45 ` [PATCH 07/17] x86, memblock: Add memblock_x86_register_active_regions() and memblock_x86_hole_size() Yinghai Lu
2010-07-29 19:45 ` Yinghai Lu
2010-07-29 19:45 ` [PATCH 08/17] memblock: Add find_memory_core_early() Yinghai Lu
2010-07-29 19:45 ` Yinghai Lu
2010-07-29 19:45 ` [PATCH 09/17] x86, memblock: Add memblock_x86_find_in_range_node() Yinghai Lu
2010-07-29 19:45 ` Yinghai Lu
2010-07-29 19:45 ` [PATCH 10/17] x86, memblock: Add memblock_x86_free_memory_in_range() Yinghai Lu
2010-07-29 19:45 ` Yinghai Lu
2010-07-29 19:45 ` [PATCH 11/17] x86, memblock: Add memblock_x86_memory_in_range() Yinghai Lu
2010-07-29 19:45 ` Yinghai Lu
2010-07-29 19:45 ` [PATCH 12/17] x86, memblock: Use memblock_debug to control debug message print out Yinghai Lu
2010-07-29 19:45 ` Yinghai Lu
2010-07-29 19:45 ` [PATCH 13/17] x86: Use memblock to replace early_res Yinghai Lu
2010-07-29 19:45 ` Yinghai Lu
2010-07-29 19:45 ` [PATCH 14/17] x86: Replace e820_/_early string with memblock_ Yinghai Lu
2010-07-29 19:45 ` Yinghai Lu
2010-07-29 19:45 ` [PATCH 15/17] x86: Remove not used early_res code Yinghai Lu
2010-07-29 19:45 ` Yinghai Lu
2010-07-29 19:45 ` [PATCH 16/17] x86, memblock: Use memblock_memory_size()/memblock_free_memory_size() to get correct dma_reserve Yinghai Lu
2010-07-29 19:45 ` Yinghai Lu
2010-07-29 19:45 ` [PATCH 17/17] x86: remove old bootmem code Yinghai Lu
2010-07-29 19:45 ` Yinghai Lu
2010-07-31 7:15 ` [PATCH 01/17 -v2] memblock: Add memblock_free/reserve_reserved_regions() Yinghai Lu
2010-07-31 7:15 ` 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=1280432737-1808-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).