01 Nov, 2011
3 commits
-
Quiet the following sparse noise in this file:
warning: symbol 'memblock_overlaps_region' was not declared. Should it be static?
Signed-off-by: H Hartley Sweeten
Cc: Yinghai Lu
Cc: "H. Peter Anvin"
Cc: Benjamin Herrenschmidt
Cc: Tomi Valkeinen
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds -
warning: function 'memblock_memory_can_coalesce'
with external linkage has definition.Signed-off-by: Jonghwan Choi
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds -
SPARC32 require access to the start address. Add a new helper
memblock_start_of_DRAM() to give access to the address of the first
memblock - which contains the lowest address.The awkward name was chosen to match the already present
memblock_end_of_DRAM().Signed-off-by: Sam Ravnborg
Cc: "David S. Miller"
Cc: Yinghai Lu
Acked-by: Tejun Heo
Cc: "H. Peter Anvin"
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds
26 Jul, 2011
1 commit
-
RED_INACTIVE is a slab thing, and reusing it for memblock was
inappropriate, because memblock is dealing with phys_addr_t's which have a
Kconfigurable sizeof().Create a new poison type for this application. Fixes the sparse warning
warning: cast truncates bits from constant value (9f911029d74e35b becomes 9d74e35b)
Reported-by: H Hartley Sweeten
Tested-by: H Hartley Sweeten
Acked-by: Pekka Enberg
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds
23 Mar, 2011
1 commit
-
Currently memblock_reserve() or memblock_free() don't handle overlaps of
any kind. There is some special casing for coalescing exactly adjacent
regions but that's about it.This is annoying because typically memblock_reserve() is used to mark
regions passed by the firmware as reserved and we all know how much we can
trust our firmwares...Also, with the current code, if we do something it doesn't handle right
such as trying to memblock_reserve() a large range spanning multiple
existing smaller reserved regions for example, or doing overlapping
reservations, it can silently corrupt the internal region array, causing
odd errors much later on, such as allocations returning reserved regions
etc...This patch rewrites the underlying functions that add or remove a region
to the arrays. The new code is a lot more robust as it fully handles
overlapping regions. It's also, imho, simpler than the previous
implementation.In addition, while doing so, I found a bug where if we fail to double the
array while adding a region, we would remove the last region of the array
rather than the region we just allocated. This fixes it too.Signed-off-by: Benjamin Herrenschmidt
Acked-by: Yinghai Lu
Cc: Ingo Molnar
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds
12 Feb, 2011
1 commit
-
While applying patch to use memblock to find aperture for 64bit x86.
Ingo found system with 1g + force_iommu> No AGP bridge found
> Node 0: aperture @ 38000000 size 32 MB
> Aperture pointing to e820 RAM. Ignoring.
> Your BIOS doesn't leave a aperture memory hole
> Please enable the IOMMU option in the BIOS setup
> This costs you 64 MB of RAM
> Cannot allocate aperture memory hole (0,65536K)the corresponding code:
addr = memblock_find_in_range(0, 1ULL<< 0xffffffff) {
printk(KERN_ERR
"Cannot allocate aperture memory hole (%lx,%uK)\n",
addr, aper_size>>10);
return 0;
}
memblock_x86_reserve_range(addr, addr + aper_size, "aperture64")fails because memblock core code align the size with 512M. That could
make size way too big.So don't align the size in that case.
actually __memblock_alloc_base, the another caller already align that
before calling that function.BTW. x86 does not use __memblock_alloc_base...
Signed-off-by: Yinghai Lu
Cc: Ingo Molnar
Cc: David Miller
Cc: "H. Peter Anvin"
Cc: Benjamin Herrenschmidt
Cc: Dave Airlie
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds
21 Jan, 2011
1 commit
-
memblock_is_region_memory() uses reserved memblocks to search for the
given region, while it should use the memory memblocks.I encountered the problem with OMAP's framebuffer ram allocation.
Normally the ram is allocated dynamically, and this function is not
called. However, if we want to pass the framebuffer from the bootloader
to the kernel (to retain the boot image), this function is used to check
the validity of the kernel parameters for the framebuffer ram area.Signed-off-by: Tomi Valkeinen
Acked-by: Yinghai Lu
Cc: Benjamin Herrenschmidt
Cc: "H. Peter Anvin"
Cc: Ingo Molnar
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds
12 Oct, 2010
2 commits
-
Stephen found
WARNING: mm/built-in.o(.text+0x25ab8): Section mismatch in reference from the function memblock_find_base() to the function .init.text:memblock_find_region()
The function memblock_find_base() references
the function __init memblock_find_region().
This is often because memblock_find_base lacks a __init
annotation or the annotation of memblock_find_region is wrong.So let memblock_find_region() to use __init_memblock instead of __init
directly.Also fix one function that did not have __init* to be __init_memblock.
Reported-by: Stephen Rothwell
Signed-off-by: Yinghai Lu
LKML-Reference:
Signed-off-by: H. Peter Anvin -
The Xen setup code needs to call memblock_x86_reserve_range() very early,
so allow it to initialize the memblock subsystem before doing so. The
second memblock_init() is ignored.Signed-off-by: Jeremy Fitzhardinge
Cc: Yinghai Lu
Cc: Benjamin Herrenschmidt
LKML-Reference:
Signed-off-by: H. Peter Anvin
06 Oct, 2010
1 commit
-
When trying to find huge range for crashkernel, get
[ 0.000000] ------------[ cut here ]------------
[ 0.000000] WARNING: at arch/x86/mm/memblock.c:248 memblock_x86_reserve_range+0x40/0x7a()
[ 0.000000] Hardware name: Sun Fire x4800
[ 0.000000] memblock_x86_reserve_range: wrong range [0xffffffff37000000, 0x137000000)
[ 0.000000] Modules linked in:
[ 0.000000] Pid: 0, comm: swapper Not tainted 2.6.36-rc5-tip-yh-01876-g1cac214-dirty #59
[ 0.000000] Call Trace:
[ 0.000000] [] ? memblock_x86_reserve_range+0x40/0x7a
[ 0.000000] [] warn_slowpath_common+0x85/0x9e
[ 0.000000] [] warn_slowpath_fmt+0x6e/0x70
[ 0.000000] [] ? memblock_find_region+0x40/0x78
[ 0.000000] [] ? memblock_find_base+0x9a/0xb9
[ 0.000000] [] memblock_x86_reserve_range+0x40/0x7a
[ 0.000000] [] setup_arch+0x99d/0xb2a
[ 0.000000] [] ? trace_hardirqs_off+0xd/0xf
[ 0.000000] [] ? _raw_spin_unlock_irqrestore+0x3d/0x4c
[ 0.000000] [] start_kernel+0xde/0x3f1
[ 0.000000] [] x86_64_start_reservations+0xa0/0xa4
[ 0.000000] [] x86_64_start_kernel+0x106/0x10d
[ 0.000000] ---[ end trace a7919e7f17c0a725 ]---
[ 0.000000] Reserving 8192MB of memory at 17592186041200MB for crashkernel (System RAM: 526336MB)This is caused by a wraparound in the test due to size > end;
explicitly check for this condition and fail.Signed-off-by: Yinghai Lu
LKML-Reference:
Signed-off-by: H. Peter Anvin
16 Sep, 2010
1 commit
-
Stephen found a bunch of section mismatch warnings with the
new memblock changes.Use __init_memblock to replace __init in memblock.c and remove
__init in memblock.h. We should not use __init in header files.Reported-by: Stephen Rothwell
Tested-by: Stephen Rothwell
Signed-off-by: Yinghai Lu
Cc: Peter Zijlstra
Cc: Benjamin Herrenschmidt
LKML-Reference:
Signed-off-by: Ingo Molnar
28 Aug, 2010
1 commit
-
So we can avoid export memblock_reserved_init_regions()
Suggested by Ben.-v2: use __init_memblock attribute
Signed-off-by: Yinghai Lu
Cc: Benjamin Herrenschmidt
Signed-off-by: H. Peter Anvin
05 Aug, 2010
28 commits
-
This is a wrapper for memblock_find_base() using slightly different
arguments (start,end instead of start,size for example) in order to
make it easier to convert existing arch/x86 code.Signed-off-by: Yinghai Lu
Signed-off-by: Benjamin Herrenschmidt -
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
Signed-off-by: Benjamin Herrenschmidt -
And ensure we don't hand out 0 as a valid allocation. We put the
low limit at PAGE_SIZE arbitrarily.Signed-off-by: Benjamin Herrenschmidt
-
will used by x86 memblock_x86_find_in_range_node and nobootmem replacement
Signed-off-by: Yinghai Lu
Signed-off-by: Benjamin Herrenschmidt -
Print out the location info in addition to which array is being
resized. Also use memblocK_dbg() to put that under control of
the memblock_debug flag.Signed-off-by: Yinghai Lu
Signed-off-by: Benjamin Herrenschmidt -
This exposes memblock_debug and associated memblock_dbg() macro,
along with memblock_can_resize so that x86 can use these when
ported to use memblockSigned-off-by: Yinghai Lu
Signed-off-by: Benjamin Herrenschmidt -
Signed-off-by: Benjamin Herrenschmidt
-
memblock_alloc_nid() used to fallback to allocating anywhere by using
memblock_alloc() as a fallback.However, some of my previous patches limit memblock_alloc() to the region
covered by MEMBLOCK_ALLOC_ACCESSIBLE which is not quite what we want
for memblock_alloc_try_nid().So we fix it by explicitely using MEMBLOCK_ALLOC_ANYWHERE.
Not that so far only sparc uses memblock_alloc_nid() and it hasn't been updated
to clamp the accessible zone yet. Thus the temporary "breakage" should have
no effect.Signed-off-by: Benjamin Herrenschmidt
-
The former is now strict, it will fail if it cannot honor the allocation
within the node, while the later implements the previous semantic which
falls back to allocating anywhere.Signed-off-by: Benjamin Herrenschmidt
-
We now provide a default (weak) implementation of memblock_nid_range()
which uses the early_pfn_map[] if CONFIG_ARCH_POPULATES_NODE_MAP
is set. Sparc still needs to use its own method due to the way
the pages can be scattered between nodes.This implementation is inefficient due to our main algorithm and
callback construct wanting to work on an ascending addresses bases
while early_pfn_map[] would rather work with nid's (it's unsorted
at that stage). But it should work and we can look into improving
it subsequently, possibly using arch compile options to chose a
different algorithm alltogether.Signed-off-by: Benjamin Herrenschmidt
-
To constraint the search of a region between two boundaries,
which will be used by the new NUMA aware allocator among others.Signed-off-by: Benjamin Herrenschmidt
-
Some archs such as ARM want to avoid coalescing accross things such
as the lowmem/highmem boundary or similar. This provides the option
to control it via an arch callback for which a weak default is provided
which always allows coalescing.Signed-off-by: Benjamin Herrenschmidt
-
When one of the array gets full, we resize it. After much thinking and
a few iterations of that code, I went back to on-demand resizing using
the (new) internal memblock_find_base() function, which is pretty much what
Yinghai initially proposed, though there some differences in the details.To work this relies on the default alloc limit being set sensibly by
the architecture.Signed-off-by: Benjamin Herrenschmidt
-
Some shuffling is needed for doing array resize so we may as well
put some sense into the ordering of the functions in the whole memblock.c
file. No code change. Added some comments.Signed-off-by: Benjamin Herrenschmidt
-
This will be used by the array resize code and might prove useful
to some arch code as well at which point it can be made non-static.Also add comment as to why aligning size is important
Signed-off-by: Benjamin Herrenschmidt
---v2. Fix loss of size alignment
v3. Fix result code -
It's a real PITA to have to search for it in the middle
Signed-off-by: Benjamin Herrenschmidt
-
Signed-off-by: Benjamin Herrenschmidt
-
This function will be used to locate a free area to put the new memblock
arrays when attempting to resize them. memblock_alloc_region() is gone,
the two callsites now call memblock_add_region().Signed-off-by: Benjamin Herrenschmidt
---
v2. Fix membase_alloc_nid_region() conversion -
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
-
This is in preparation for having resizable arrays.
Note that we still allocate one more than needed, this is unchanged from
the previous implementation.Signed-off-by: Benjamin Herrenschmidt
-
Right now, both the "memory" and "reserved" memblock_type structures have
a "size" member. It represents the calculated memory size in the former
case and is unused in the latter.This moves it out to the main memblock structure instead
Signed-off-by: Benjamin Herrenschmidt
-
Let's not waste space and cycles on archs that don't support >32-bit
physical address space.Signed-off-by: Benjamin Herrenschmidt
-
The RMA (RMO is a misnomer) is a concept specific to ppc64 (in fact
server ppc64 though I hijack it on embedded ppc64 for similar purposes)
and represents the area of memory that can be accessed in real mode
(aka with MMU off), or on embedded, from the exception vectors (which
is bolted in the TLB) which pretty much boils down to the same thing.We take that out of the generic MEMBLOCK data structure and move it into
arch/powerpc where it belongs, renaming it to "RMA" while at it.Signed-off-by: Benjamin Herrenschmidt
-
This introduce memblock.current_limit which is used to limit allocations
from memblock_alloc() or memblock_alloc_base(..., MEMBLOCK_ALLOC_ACCESSIBLE).The old MEMBLOCK_ALLOC_ANYWHERE changes value from 0 to ~(u64)0 and can still
be used with memblock_alloc_base() to allocate really anywhere.It is -no-longer- cropped to MEMBLOCK_REAL_LIMIT which disappears.
Note to archs: I'm leaving the default limit to MEMBLOCK_ALLOC_ANYWHERE. I
strongly recommend that you ensure that you set an appropriate limit
during boot in order to guarantee that an memblock_alloc() at any time
results in something that is accessible with a simple __va().The reason is that a subsequent patch will introduce the ability for
the array to resize itself by reallocating itself. The MEMBLOCK core will
honor the current limit when performing those allocations.Signed-off-by: Benjamin Herrenschmidt
-
Signed-off-by: Benjamin Herrenschmidt
-
Signed-off-by: Benjamin Herrenschmidt
-
Signed-off-by: Benjamin Herrenschmidt
-
Nobody uses it anymore. It's semantics were ... weird
Signed-off-by: Benjamin Herrenschmidt