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: Johannes Weiner <hannes@cmpxchg.org>,
linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org,
Benjamin Herrenschmidt <benh@kernel.crashing.org>
Subject: [PATCH 13/31] memblock: Add debug markers at the end of the array
Date: Thu, 22 Jul 2010 11:20:46 -0700 [thread overview]
Message-ID: <1279822864-17154-14-git-send-email-yinghai@kernel.org> (raw)
In-Reply-To: <1279822864-17154-1-git-send-email-yinghai@kernel.org>
From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Since we allocate one more than needed, why not do a bit of sanity checking
here to ensure we don't walk past the end of the array ?
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
---
mm/memblock.c | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/mm/memblock.c b/mm/memblock.c
index e1c5ce3..21ba089 100644
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -13,6 +13,7 @@
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/bitops.h>
+#include <linux/poison.h>
#include <linux/memblock.h>
struct memblock memblock;
@@ -112,6 +113,10 @@ void __init memblock_init(void)
memblock.reserved.regions = memblock_reserved_init_regions;
memblock.reserved.max = INIT_MEMBLOCK_REGIONS;
+ /* Write a marker in the unused last array entry */
+ memblock.memory.regions[INIT_MEMBLOCK_REGIONS].base = (phys_addr_t)RED_INACTIVE;
+ memblock.reserved.regions[INIT_MEMBLOCK_REGIONS].base = (phys_addr_t)RED_INACTIVE;
+
/* Create a dummy zero size MEMBLOCK which will get coalesced away later.
* This simplifies the memblock_add() code below...
*/
@@ -131,6 +136,12 @@ void __init memblock_analyze(void)
{
int i;
+ /* Check marker in the unused last array entry */
+ WARN_ON(memblock_memory_init_regions[INIT_MEMBLOCK_REGIONS].base
+ != (phys_addr_t)RED_INACTIVE);
+ WARN_ON(memblock_reserved_init_regions[INIT_MEMBLOCK_REGIONS].base
+ != (phys_addr_t)RED_INACTIVE);
+
memblock.memory_size = 0;
for (i = 0; i < memblock.memory.cnt; i++)
--
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
Subject: [PATCH 13/31] memblock: Add debug markers at the end of the array
Date: Thu, 22 Jul 2010 11:20:46 -0700 [thread overview]
Message-ID: <1279822864-17154-14-git-send-email-yinghai@kernel.org> (raw)
Message-ID: <20100722182046.mmY1vHuBOTi1Lk2Ap4gWiMSVWAXK2PkElkGkgfuEPHM@z> (raw)
In-Reply-To: <1279822864-17154-1-git-send-email-yinghai@kernel.org>
From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Since we allocate one more than needed, why not do a bit of sanity checking
here to ensure we don't walk past the end of the array ?
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
---
mm/memblock.c | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/mm/memblock.c b/mm/memblock.c
index e1c5ce3..21ba089 100644
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -13,6 +13,7 @@
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/bitops.h>
+#include <linux/poison.h>
#include <linux/memblock.h>
struct memblock memblock;
@@ -112,6 +113,10 @@ void __init memblock_init(void)
memblock.reserved.regions = memblock_reserved_init_regions;
memblock.reserved.max = INIT_MEMBLOCK_REGIONS;
+ /* Write a marker in the unused last array entry */
+ memblock.memory.regions[INIT_MEMBLOCK_REGIONS].base = (phys_addr_t)RED_INACTIVE;
+ memblock.reserved.regions[INIT_MEMBLOCK_REGIONS].base = (phys_addr_t)RED_INACTIVE;
+
/* Create a dummy zero size MEMBLOCK which will get coalesced away later.
* This simplifies the memblock_add() code below...
*/
@@ -131,6 +136,12 @@ void __init memblock_analyze(void)
{
int i;
+ /* Check marker in the unused last array entry */
+ WARN_ON(memblock_memory_init_regions[INIT_MEMBLOCK_REGIONS].base
+ != (phys_addr_t)RED_INACTIVE);
+ WARN_ON(memblock_reserved_init_regions[INIT_MEMBLOCK_REGIONS].base
+ != (phys_addr_t)RED_INACTIVE);
+
memblock.memory_size = 0;
for (i = 0; i < memblock.memory.cnt; i++)
--
1.6.4.2
next prev parent reply other threads:[~2010-07-22 18:20 UTC|newest]
Thread overview: 92+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-22 18:20 [PATCH -v26 00/31] generic changes for memblock Yinghai Lu
2010-07-22 18:20 ` Yinghai Lu
2010-07-22 18:20 ` [PATCH 01/31] memblock: Rename memblock_region to memblock_type and memblock_property to memblock_region Yinghai Lu
2010-07-22 18:20 ` Yinghai Lu
2010-07-22 18:20 ` [PATCH 02/31] memblock: No reason to include asm/memblock.h late Yinghai Lu
2010-07-22 18:20 ` Yinghai Lu
2010-07-22 18:20 ` [PATCH 03/31] memblock: Introduce for_each_memblock() and new accessors, and use it Yinghai Lu
2010-07-22 18:20 ` Yinghai Lu
2010-07-22 18:20 ` [PATCH 04/31] memblock: Remove nid_range argument, arch provides memblock_nid_range() instead Yinghai Lu
2010-07-22 18:20 ` Yinghai Lu
2010-07-22 18:20 ` [PATCH 05/31] memblock: Factor the lowest level alloc function Yinghai Lu
2010-07-22 18:20 ` Yinghai Lu
2010-07-22 18:20 ` [PATCH 06/31] memblock: Expose MEMBLOCK_ALLOC_ANYWHERE Yinghai Lu
2010-07-22 18:20 ` Yinghai Lu
2010-07-22 18:20 ` [PATCH 07/31] memblock: Introduce default allocation limit and use it to replace explicit ones Yinghai Lu
2010-07-22 18:20 ` Yinghai Lu
2010-07-22 18:20 ` [PATCH 08/31] memblock: Remove rmo_size, burry it in arch/powerpc where it belongs Yinghai Lu
2010-07-22 18:20 ` Yinghai Lu
2010-07-22 18:20 ` [PATCH 09/31] memblock: Change u64 to phys_addr_t Yinghai Lu
2010-07-22 18:20 ` Yinghai Lu
2010-07-22 18:20 ` [PATCH 10/31] memblock: Remove unused memblock.debug struct member Yinghai Lu
2010-07-22 18:20 ` Yinghai Lu
2010-07-22 18:20 ` [PATCH 11/31] memblock: Remove memblock_type.size and add memblock.memory_size instead Yinghai Lu
2010-07-22 18:20 ` Yinghai Lu
2010-07-22 18:20 ` [PATCH 12/31] memblock: Move memblock arrays to static storage in memblock.c and make their size a variable Yinghai Lu
2010-07-22 18:20 ` Yinghai Lu
2010-07-22 18:20 ` Yinghai Lu [this message]
2010-07-22 18:20 ` [PATCH 13/31] memblock: Add debug markers at the end of the array Yinghai Lu
2010-07-22 18:20 ` [PATCH 14/31] memblock: Make memblock_find_region() out of memblock_alloc_region() Yinghai Lu
2010-07-22 18:20 ` Yinghai Lu
2010-07-22 18:20 ` [PATCH 15/31] memblock: Define MEMBLOCK_ERROR internally instead of using ~(phys_addr_t)0 Yinghai Lu
2010-07-22 18:20 ` Yinghai Lu
2010-07-22 18:20 ` [PATCH 16/31] memblock: Move memblock_init() to the bottom of the file Yinghai Lu
2010-07-22 18:20 ` Yinghai Lu
2010-07-22 18:20 ` [PATCH 17/31] memblock: split memblock_find_base() out of __memblock_alloc_base() Yinghai Lu
2010-07-22 18:20 ` Yinghai Lu
2010-07-22 18:20 ` [PATCH 18/31] memblock: Move functions around into a more sensible order Yinghai Lu
2010-07-22 18:20 ` Yinghai Lu
2010-07-22 18:20 ` [PATCH 19/31] memblock: Add array resizing support Yinghai Lu
2010-07-22 18:20 ` Yinghai Lu
2010-07-22 18:20 ` [PATCH 20/31] memblock: Add arch function to control coalescing of memblock memory regions Yinghai Lu
2010-07-22 18:20 ` Yinghai Lu
2010-07-22 18:20 ` [PATCH 21/31] memblock: Add "start" argument to memblock_find_base() Yinghai Lu
2010-07-22 18:20 ` Yinghai Lu
2010-07-22 18:20 ` [PATCH 22/31] memblock: NUMA allocate can now use early_pfn_map Yinghai Lu
2010-07-22 18:20 ` Yinghai Lu
2010-07-22 18:20 ` [PATCH 23/31] memblock: Separate memblock_alloc_nid() and memblock_alloc_try_nid() Yinghai Lu
2010-07-22 18:20 ` Yinghai Lu
2010-07-22 18:20 ` [PATCH 24/31] memblock: Make memblock_alloc_try_nid() fallback to MEMBLOCK_ALLOC_ANYWHERE Yinghai Lu
2010-07-22 18:20 ` Yinghai Lu
2010-07-22 18:20 ` [PATCH 25/31] memblock: Add debugfs files to dump the arrays content Yinghai Lu
2010-07-22 18:20 ` Yinghai Lu
2010-07-22 18:20 ` [PATCH 26/31] memblock: Prepare x86 to use memblock to replace early_res Yinghai Lu
2010-07-22 18:20 ` Yinghai Lu
2010-07-22 18:21 ` [PATCH 27/31] memblock: Print new doubled array location info Yinghai Lu
2010-07-22 18:21 ` Yinghai Lu
2010-07-22 18:21 ` [PATCH 28/31] memblock: Export MEMBLOCK_ERROR again Yinghai Lu
2010-07-22 18:21 ` Yinghai Lu
2010-07-28 5:15 ` Benjamin Herrenschmidt
2010-07-28 5:19 ` Benjamin Herrenschmidt
2010-07-28 5:53 ` H. Peter Anvin
2010-07-28 6:01 ` David Miller
2010-07-28 6:13 ` Yinghai Lu
2010-07-28 9:29 ` Benjamin Herrenschmidt
2010-07-28 9:25 ` Benjamin Herrenschmidt
2010-07-28 6:29 ` Benjamin Herrenschmidt
2010-07-28 5:24 ` Benjamin Herrenschmidt
2010-07-22 18:21 ` [PATCH 29/31] memblock: Prepare to include linux/memblock.h in core file Yinghai Lu
2010-07-22 18:21 ` Yinghai Lu
2010-07-28 5:27 ` Benjamin Herrenschmidt
2010-07-22 18:21 ` [PATCH 30/31] memblock: Add ARCH_DISCARD_MEMBLOCK to put memblock code to .init Yinghai Lu
2010-07-22 18:21 ` Yinghai Lu
2010-07-28 5:45 ` Benjamin Herrenschmidt
2010-07-22 18:21 ` [PATCH 31/31] memblock: Add memblock_find_in_range() Yinghai Lu
2010-07-22 18:21 ` Yinghai Lu
2010-07-28 5:36 ` Benjamin Herrenschmidt
2010-07-28 6:08 ` Yinghai Lu
2010-07-28 6:38 ` H. Peter Anvin
2010-07-28 7:12 ` Yinghai Lu
2010-07-28 16:06 ` H. Peter Anvin
2010-07-28 17:02 ` James Bottomley
2010-07-28 17:53 ` H. Peter Anvin
2010-07-28 18:10 ` James Bottomley
2010-07-28 18:30 ` H. Peter Anvin
2010-07-28 19:27 ` Yinghai Lu
2010-07-28 19:58 ` H. Peter Anvin
2010-07-28 22:58 ` Ralph Campbell
2010-07-28 23:41 ` H. Peter Anvin
2010-07-28 9:27 ` Benjamin Herrenschmidt
2010-07-28 6:22 ` H. Peter Anvin
2010-07-22 21:35 ` [PATCH -v26 00/31] generic changes for memblock Benjamin Herrenschmidt
2010-07-22 22:00 ` 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=1279822864-17154-14-git-send-email-yinghai@kernel.org \
--to=yinghai@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=benh@kernel.crashing.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).