From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
To: linux-kernel@vger.kernel.org
Cc: linux-mm@kvack.org, torvalds@linux-foundation.org,
Yinghai Lu <yinghai@kernel.org>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>
Subject: [PATCH 42/43] memblock: Option for the architecture to put memblock into the .init section
Date: Fri, 6 Aug 2010 15:15:23 +1000 [thread overview]
Message-ID: <1281071724-28740-43-git-send-email-benh@kernel.crashing.org> (raw)
In-Reply-To: <1281071724-28740-1-git-send-email-benh@kernel.crashing.org>
From: Yinghai Lu <yinghai@kernel.org>
Arch code can define ARCH_DISCARD_MEMBLOCK in asm/memblock.h,
which in turns causes memblock code and data to go respectively
into the .init and .initdata sections. This will be used by the
x86 architecture.
If ARCH_DISCARD_MEMBLOCK is defined, the debugfs files to inspect
the memblock arrays after boot are not created.
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
---
include/linux/memblock.h | 8 +++++++
mm/memblock.c | 48 +++++++++++++++++++++++-----------------------
2 files changed, 32 insertions(+), 24 deletions(-)
diff --git a/include/linux/memblock.h b/include/linux/memblock.h
index c24b278..3978e6a 100644
--- a/include/linux/memblock.h
+++ b/include/linux/memblock.h
@@ -149,6 +149,14 @@ static inline unsigned long memblock_region_pages(const struct memblock_region *
region++)
+#ifdef ARCH_DISCARD_MEMBLOCK
+#define __init_memblock __init
+#define __initdata_memblock __initdata
+#else
+#define __init_memblock
+#define __initdata_memblock
+#endif
+
#endif /* CONFIG_HAVE_MEMBLOCK */
#endif /* __KERNEL__ */
diff --git a/mm/memblock.c b/mm/memblock.c
index cb520df..a17faea 100644
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -20,12 +20,12 @@
#include <linux/seq_file.h>
#include <linux/memblock.h>
-struct memblock memblock;
+struct memblock memblock __initdata_memblock;
-int memblock_debug;
-int memblock_can_resize;
-static struct memblock_region memblock_memory_init_regions[INIT_MEMBLOCK_REGIONS + 1];
-static struct memblock_region memblock_reserved_init_regions[INIT_MEMBLOCK_REGIONS + 1];
+int memblock_debug __initdata_memblock;
+int memblock_can_resize __initdata_memblock;
+static struct memblock_region memblock_memory_init_regions[INIT_MEMBLOCK_REGIONS + 1] __initdata_memblock;
+static struct memblock_region memblock_reserved_init_regions[INIT_MEMBLOCK_REGIONS + 1] __initdata_memblock;
/* inline so we don't get a warning when pr_debug is compiled out */
static inline const char *memblock_type_name(struct memblock_type *type)
@@ -42,23 +42,23 @@ static inline const char *memblock_type_name(struct memblock_type *type)
* Address comparison utilities
*/
-static phys_addr_t memblock_align_down(phys_addr_t addr, phys_addr_t size)
+static phys_addr_t __init_memblock memblock_align_down(phys_addr_t addr, phys_addr_t size)
{
return addr & ~(size - 1);
}
-static phys_addr_t memblock_align_up(phys_addr_t addr, phys_addr_t size)
+static phys_addr_t __init_memblock memblock_align_up(phys_addr_t addr, phys_addr_t size)
{
return (addr + (size - 1)) & ~(size - 1);
}
-static unsigned long memblock_addrs_overlap(phys_addr_t base1, phys_addr_t size1,
+static unsigned long __init_memblock memblock_addrs_overlap(phys_addr_t base1, phys_addr_t size1,
phys_addr_t base2, phys_addr_t size2)
{
return ((base1 < (base2 + size2)) && (base2 < (base1 + size1)));
}
-static long memblock_addrs_adjacent(phys_addr_t base1, phys_addr_t size1,
+static long __init_memblock memblock_addrs_adjacent(phys_addr_t base1, phys_addr_t size1,
phys_addr_t base2, phys_addr_t size2)
{
if (base2 == base1 + size1)
@@ -69,7 +69,7 @@ static long memblock_addrs_adjacent(phys_addr_t base1, phys_addr_t size1,
return 0;
}
-static long memblock_regions_adjacent(struct memblock_type *type,
+static long __init_memblock memblock_regions_adjacent(struct memblock_type *type,
unsigned long r1, unsigned long r2)
{
phys_addr_t base1 = type->regions[r1].base;
@@ -80,7 +80,7 @@ static long memblock_regions_adjacent(struct memblock_type *type,
return memblock_addrs_adjacent(base1, size1, base2, size2);
}
-long memblock_overlaps_region(struct memblock_type *type, phys_addr_t base, phys_addr_t size)
+long __init_memblock memblock_overlaps_region(struct memblock_type *type, phys_addr_t base, phys_addr_t size)
{
unsigned long i;
@@ -162,7 +162,7 @@ static phys_addr_t __init memblock_find_base(phys_addr_t size, phys_addr_t align
return MEMBLOCK_ERROR;
}
-static void memblock_remove_region(struct memblock_type *type, unsigned long r)
+static void __init_memblock memblock_remove_region(struct memblock_type *type, unsigned long r)
{
unsigned long i;
@@ -174,7 +174,7 @@ static void memblock_remove_region(struct memblock_type *type, unsigned long r)
}
/* Assumption: base addr of region 1 < base addr of region 2 */
-static void memblock_coalesce_regions(struct memblock_type *type,
+static void __init_memblock memblock_coalesce_regions(struct memblock_type *type,
unsigned long r1, unsigned long r2)
{
type->regions[r1].size += type->regions[r2].size;
@@ -184,7 +184,7 @@ static void memblock_coalesce_regions(struct memblock_type *type,
/* Defined below but needed now */
static long memblock_add_region(struct memblock_type *type, phys_addr_t base, phys_addr_t size);
-static int memblock_double_array(struct memblock_type *type)
+static int __init_memblock memblock_double_array(struct memblock_type *type)
{
struct memblock_region *new_array, *old_array;
phys_addr_t old_size, new_size, addr;
@@ -255,13 +255,13 @@ static int memblock_double_array(struct memblock_type *type)
return 0;
}
-extern int __weak memblock_memory_can_coalesce(phys_addr_t addr1, phys_addr_t size1,
+extern int __init_memblock __weak memblock_memory_can_coalesce(phys_addr_t addr1, phys_addr_t size1,
phys_addr_t addr2, phys_addr_t size2)
{
return 1;
}
-static long memblock_add_region(struct memblock_type *type, phys_addr_t base, phys_addr_t size)
+static long __init_memblock memblock_add_region(struct memblock_type *type, phys_addr_t base, phys_addr_t size)
{
unsigned long coalesced = 0;
long adjacent, i;
@@ -348,13 +348,13 @@ static long memblock_add_region(struct memblock_type *type, phys_addr_t base, ph
return 0;
}
-long memblock_add(phys_addr_t base, phys_addr_t size)
+long __init_memblock memblock_add(phys_addr_t base, phys_addr_t size)
{
return memblock_add_region(&memblock.memory, base, size);
}
-static long __memblock_remove(struct memblock_type *type, phys_addr_t base, phys_addr_t size)
+static long __init_memblock __memblock_remove(struct memblock_type *type, phys_addr_t base, phys_addr_t size)
{
phys_addr_t rgnbegin, rgnend;
phys_addr_t end = base + size;
@@ -402,7 +402,7 @@ static long __memblock_remove(struct memblock_type *type, phys_addr_t base, phys
return memblock_add_region(type, end, rgnend - end);
}
-long memblock_remove(phys_addr_t base, phys_addr_t size)
+long __init_memblock memblock_remove(phys_addr_t base, phys_addr_t size)
{
return __memblock_remove(&memblock.memory, base, size);
}
@@ -568,7 +568,7 @@ phys_addr_t __init memblock_phys_mem_size(void)
return memblock.memory_size;
}
-phys_addr_t memblock_end_of_DRAM(void)
+phys_addr_t __init_memblock memblock_end_of_DRAM(void)
{
int idx = memblock.memory.cnt - 1;
@@ -655,7 +655,7 @@ int memblock_is_region_memory(phys_addr_t base, phys_addr_t size)
memblock.reserved.regions[idx].size) >= (base + size);
}
-int memblock_is_region_reserved(phys_addr_t base, phys_addr_t size)
+int __init_memblock memblock_is_region_reserved(phys_addr_t base, phys_addr_t size)
{
return memblock_overlaps_region(&memblock.reserved, base, size) >= 0;
}
@@ -666,7 +666,7 @@ void __init memblock_set_current_limit(phys_addr_t limit)
memblock.current_limit = limit;
}
-static void memblock_dump(struct memblock_type *region, char *name)
+static void __init_memblock memblock_dump(struct memblock_type *region, char *name)
{
unsigned long long base, size;
int i;
@@ -682,7 +682,7 @@ static void memblock_dump(struct memblock_type *region, char *name)
}
}
-void memblock_dump_all(void)
+void __init_memblock memblock_dump_all(void)
{
if (!memblock_debug)
return;
@@ -748,7 +748,7 @@ static int __init early_memblock(char *p)
}
early_param("memblock", early_memblock);
-#ifdef CONFIG_DEBUG_FS
+#if defined(CONFIG_DEBUG_FS) && !defined(ARCH_DISCARD_MEMBLOCK)
static int memblock_debug_show(struct seq_file *m, void *private)
{
--
1.7.0.4
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2010-08-06 5:15 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-06 5:14 memblock updates Benjamin Herrenschmidt
2010-08-06 5:14 ` [PATCH 01/43] memblock: Fix memblock_is_region_reserved() to return a boolean Benjamin Herrenschmidt
2010-08-06 5:14 ` [PATCH 02/43] memblock: Rename memblock_region to memblock_type and memblock_property to memblock_region Benjamin Herrenschmidt
2010-08-06 5:14 ` [PATCH 03/43] memblock: No reason to include asm/memblock.h late Benjamin Herrenschmidt
2010-08-06 5:14 ` [PATCH 04/43] memblock: Implement memblock_is_memory and memblock_is_region_memory Benjamin Herrenschmidt
2010-08-06 5:14 ` [PATCH 05/43] memblock/arm: pfn_valid uses memblock_is_memory() Benjamin Herrenschmidt
2010-08-06 5:14 ` [PATCH 06/43] memblock/arm: Use memblock_region_is_memory() for omap fb Benjamin Herrenschmidt
2010-08-06 5:14 ` [PATCH 07/43] memblock: Introduce for_each_memblock() and new accessors Benjamin Herrenschmidt
2010-08-06 5:14 ` [PATCH 08/43] memblock/microblaze: Use " Benjamin Herrenschmidt
2010-08-06 8:52 ` Michal Simek
2010-08-06 22:50 ` Benjamin Herrenschmidt
2010-09-09 10:57 ` Michal Simek
2010-09-09 11:06 ` Stephen Rothwell
2010-09-09 11:54 ` Ingo Molnar
2010-09-10 8:18 ` Benjamin Herrenschmidt
2010-09-11 7:07 ` [PATCH] microblaze, memblock: fix compiling Yinghai Lu
2010-09-11 7:08 ` [PATCH] powerpc, memblock: fix will memblock reference Yinghai Lu
2010-09-11 7:29 ` [PATCH 08/43] memblock/microblaze: Use new accessors Ingo Molnar
2010-09-10 8:17 ` Benjamin Herrenschmidt
2010-08-06 5:14 ` [PATCH 09/43] memblock/sh: " Benjamin Herrenschmidt
2010-08-06 5:14 ` [PATCH 10/43] memblock/sparc: " Benjamin Herrenschmidt
2010-08-06 5:14 ` [PATCH 11/43] memblock/powerpc: " Benjamin Herrenschmidt
2010-08-06 5:14 ` [PATCH 12/43] memblock/arm: " Benjamin Herrenschmidt
2010-08-10 7:11 ` Russell King - ARM Linux
2010-08-06 5:14 ` [PATCH 13/43] memblock: Remove obsolete accessors Benjamin Herrenschmidt
2010-08-06 5:14 ` [PATCH 14/43] memblock: Remove memblock_find() Benjamin Herrenschmidt
2010-08-06 5:14 ` [PATCH 15/43] memblock: Remove nid_range argument, arch provides memblock_nid_range() instead Benjamin Herrenschmidt
2010-08-06 5:14 ` [PATCH 16/43] memblock: Factor the lowest level alloc function Benjamin Herrenschmidt
2010-08-06 5:14 ` [PATCH 17/43] memblock: Expose MEMBLOCK_ALLOC_ANYWHERE Benjamin Herrenschmidt
2010-08-06 5:14 ` [PATCH 18/43] memblock: Introduce default allocation limit and use it to replace explicit ones Benjamin Herrenschmidt
2010-08-06 5:15 ` [PATCH 19/43] memblock: Remove rmo_size, burry it in arch/powerpc where it belongs Benjamin Herrenschmidt
2010-08-06 5:15 ` [PATCH 20/43] memblock: Change u64 to phys_addr_t Benjamin Herrenschmidt
2010-08-06 5:15 ` [PATCH 21/43] memblock: Remove unused memblock.debug struct member Benjamin Herrenschmidt
2010-08-06 5:15 ` [PATCH 22/43] memblock: Remove memblock_type.size and add memblock.memory_size instead Benjamin Herrenschmidt
2010-08-06 5:15 ` [PATCH 23/43] memblock: Move memblock arrays to static storage in memblock.c and make their size a variable Benjamin Herrenschmidt
2010-08-06 5:15 ` [PATCH 24/43] memblock: Add debug markers at the end of the array Benjamin Herrenschmidt
2010-08-06 5:15 ` [PATCH 25/43] memblock: Make memblock_find_region() out of memblock_alloc_region() Benjamin Herrenschmidt
2010-08-06 5:15 ` [PATCH 26/43] memblock: Define MEMBLOCK_ERROR internally instead of using ~(phys_addr_t)0 Benjamin Herrenschmidt
2010-08-06 5:15 ` [PATCH 27/43] memblock: Move memblock_init() to the bottom of the file Benjamin Herrenschmidt
2010-08-06 5:15 ` [PATCH 28/43] memblock: split memblock_find_base() out of __memblock_alloc_base() Benjamin Herrenschmidt
2010-08-06 5:15 ` [PATCH 29/43] memblock: Move functions around into a more sensible order Benjamin Herrenschmidt
2010-08-06 5:15 ` [PATCH 30/43] memblock: Add array resizing support Benjamin Herrenschmidt
2010-08-06 5:15 ` [PATCH 31/43] memblock: Add arch function to control coalescing of memblock memory regions Benjamin Herrenschmidt
2010-08-06 5:15 ` [PATCH 32/43] memblock: Add "start" argument to memblock_find_base() Benjamin Herrenschmidt
2010-08-06 5:15 ` [PATCH 33/43] memblock: NUMA allocate can now use early_pfn_map Benjamin Herrenschmidt
2010-08-06 5:15 ` [PATCH 34/43] memblock: Separate memblock_alloc_nid() and memblock_alloc_try_nid() Benjamin Herrenschmidt
2010-08-06 5:15 ` [PATCH 35/43] memblock: Make memblock_alloc_try_nid() fallback to MEMBLOCK_ALLOC_ANYWHERE Benjamin Herrenschmidt
2010-08-06 5:15 ` [PATCH 36/43] memblock: Add debugfs files to dump the arrays content Benjamin Herrenschmidt
2010-08-06 5:15 ` [PATCH 37/43] memblock: Expose some memblock bits for use by x86 Benjamin Herrenschmidt
2010-08-06 5:15 ` [PATCH 38/43] memblock: Improve debug output when resizing the reserve array Benjamin Herrenschmidt
2010-08-06 5:15 ` [PATCH 39/43] memblock: Export MEMBLOCK_ERROR Benjamin Herrenschmidt
2010-08-06 5:15 ` [PATCH 40/43] memblock: Make MEMBLOCK_ERROR be 0 Benjamin Herrenschmidt
2010-08-06 5:15 ` [PATCH 41/43] memblock: Protect memblock.h with CONFIG_HAVE_MEMBLOCK Benjamin Herrenschmidt
2010-08-06 5:15 ` Benjamin Herrenschmidt [this message]
2010-08-06 5:15 ` [PATCH 43/43] memblock: Add memblock_find_in_range() Benjamin Herrenschmidt
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=1281071724-28740-43-git-send-email-benh@kernel.crashing.org \
--to=benh@kernel.crashing.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=torvalds@linux-foundation.org \
--cc=yinghai@kernel.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).