linux-stable.git/mm/memblock.c, branch linux-3.16.y

memblock, memhotplug: fix wrong type in memblock_find_in_range_node().

2014-10-05T20:41:03+00:00

commit 0cfb8f0c3e21e36d4a6e472e4c419d58ba848698 upstream.

In memblock_find_in_range_node(), we defined ret as int.  But it should
be phys_addr_t because it is used to store the return value from
__memblock_find_range_bottom_up().

The bug has not been triggered because when allocating low memory near
the kernel end, the "int ret" won't turn out to be negative.  When we
started to allocate memory on other nodes, and the "int ret" could be
minus.  Then the kernel will panic.

A simple way to reproduce this: comment out the following code in
numa_init(),

        memblock_set_bottom_up(false);

and the kernel won't boot.

Reported-by: Xishi Qiu 
Signed-off-by: Tang Chen 
Tested-by: Xishi Qiu 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds 
Signed-off-by: Greg Kroah-Hartman

mm/memblock.c: call kmemleak directly from memblock_(alloc|free)

2014-06-06T23:08:17+00:00

Kmemleak could ignore memory blocks allocated via memblock_alloc()
leading to false positives during scanning.  This patch adds the
corresponding callbacks and removes kmemleak_free_* calls in
mm/nobootmem.c to avoid duplication.

The kmemleak_alloc() in mm/nobootmem.c is kept since
__alloc_memory_core_early() does not use memblock_alloc() directly.

Signed-off-by: Catalin Marinas 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

mm/memblock.c: use PFN_DOWN

2014-06-04T23:54:02+00:00

Replace ((x) >> PAGE_SHIFT) with the pfn macro.

Signed-off-by: Fabian Frederick 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

memblock: introduce memblock_alloc_range()

2014-06-04T23:53:57+00:00

This introduces memblock_alloc_range() which allocates memblock from the
specified range of physical address.  I would like to use this function
to specify the location of CMA.

Signed-off-by: Akinobu Mita 
Cc: Marek Szyprowski 
Cc: Konrad Rzeszutek Wilk 
Cc: David Woodhouse 
Cc: Don Dutile 
Cc: Thomas Gleixner 
Cc: Ingo Molnar 
Cc: "H. Peter Anvin" 
Cc: Andi Kleen 
Cc: Yinghai Lu 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

mm/memblock: add physical memory list

2014-05-20T06:58:39+00:00

Add the physmem list to the memblock structure. This list only exists
if HAVE_MEMBLOCK_PHYS_MAP is selected and contains the unmodified
list of physically available memory. It differs from the memblock
memory list as it always contains all memory ranges even if the
memory has been restricted, e.g. by use of the mem= kernel parameter.

Signed-off-by: Philipp Hachtmann 
Signed-off-by: Martin Schwidefsky

mm/memblock: Do some refactoring, enhance API

2014-05-20T06:58:39+00:00

Refactor the memblock code and extend the memblock API to make it
more flexible. With the extended API it is simple to define and
work with additional memory lists.

The static functions memblock_add_region and __memblock_remove are
renamed to memblock_add_range and meblock_remove_range and added to
the memblock API.

The __next_free_mem_range and __next_free_mem_range_rev functions
are replaced with calls to the more generic list walkers
__next_mem_range and __next_mem_range_rev.

To walk an arbitrary memory list two new macros for_each_mem_range
and for_each_mem_range_rev are added. These new macros are used
to define for_each_free_mem_range and for_each_free_mem_range_reverse.

Signed-off-by: Philipp Hachtmann 
Signed-off-by: Martin Schwidefsky

mm/memblock.c: use PFN_PHYS()

2014-04-07T23:35:58+00:00

Replace ((phys_addr_t)(x) << PAGE_SHIFT) by pfn macro.

Signed-off-by: Fabian Frederick 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

memblock: use for_each_memblock()

2014-04-07T23:35:58+00:00

This is a small cleanup.

Signed-off-by: Emil Medve 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

ARM: 7993/1: mm/memblock: add memblock_get_current_limit

2014-03-12T00:16:56+00:00

Apart from setting the limit of memblock, it's also useful to be able
to get the limit to avoid recalculating it every time. Add the function
to do so.

Acked-by: Catalin Marinas 
Acked-by: Santosh Shilimkar 
Acked-by: Andrew Morton 
Acked-by: Nicolas Pitre 
Signed-off-by: Laura Abbott 
Signed-off-by: Russell King

memblock: add limit checking to memblock_virt_alloc

2014-01-30T00:22:40+00:00

In original bootmem wrapper for memblock, we have limit checking.

Add it to memblock_virt_alloc, to address arm and x86 booting crash.

Signed-off-by: Yinghai Lu 
Cc: Ingo Molnar 
Cc: "H. Peter Anvin" 
Reported-by: Kevin Hilman 
Tested-by: Kevin Hilman 
Reported-by: Olof Johansson 
Tested-by: Olof Johansson 
Reported-by: Konrad Rzeszutek Wilk 
Tested-by: Konrad Rzeszutek Wilk 
Cc: Dave Hansen 
Cc: Santosh Shilimkar 
Cc: "Strashko, Grygorii" 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds