2010-07-12 04:36:09 +00:00
|
|
|
/*
|
|
|
|
* Procedures for maintaining information about logical memory blocks.
|
|
|
|
*
|
|
|
|
* Peter Bergner, IBM Corp. June 2001.
|
|
|
|
* Copyright (C) 2001 Peter Bergner.
|
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU General Public License
|
|
|
|
* as published by the Free Software Foundation; either version
|
|
|
|
* 2 of the License, or (at your option) any later version.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/kernel.h>
|
2010-07-06 22:39:13 +00:00
|
|
|
#include <linux/slab.h>
|
2010-07-12 04:36:09 +00:00
|
|
|
#include <linux/init.h>
|
|
|
|
#include <linux/bitops.h>
|
2010-07-06 22:39:07 +00:00
|
|
|
#include <linux/poison.h>
|
2010-07-06 22:39:16 +00:00
|
|
|
#include <linux/pfn.h>
|
2010-07-06 22:39:19 +00:00
|
|
|
#include <linux/debugfs.h>
|
2018-04-05 23:25:34 +00:00
|
|
|
#include <linux/kmemleak.h>
|
2010-07-06 22:39:19 +00:00
|
|
|
#include <linux/seq_file.h>
|
2010-07-12 04:36:09 +00:00
|
|
|
#include <linux/memblock.h>
|
|
|
|
|
2016-07-28 22:48:06 +00:00
|
|
|
#include <asm/sections.h>
|
2014-01-21 23:50:19 +00:00
|
|
|
#include <linux/io.h>
|
|
|
|
|
|
|
|
#include "internal.h"
|
2013-11-12 23:07:59 +00:00
|
|
|
|
arm64, mm, efi: Account for GICv3 LPI tables in static memblock reserve table
In the irqchip and EFI code, we have what basically amounts to a quirk
to work around a peculiarity in the GICv3 architecture, which permits
the system memory address of LPI tables to be programmable only once
after a CPU reset. This means kexec kernels must use the same memory
as the first kernel, and thus ensure that this memory has not been
given out for other purposes by the time the ITS init code runs, which
is not very early for secondary CPUs.
On systems with many CPUs, these reservations could overflow the
memblock reservation table, and this was addressed in commit:
eff896288872 ("efi/arm: Defer persistent reservations until after paging_init()")
However, this turns out to have made things worse, since the allocation
of page tables and heap space for the resized memblock reservation table
itself may overwrite the regions we are attempting to reserve, which may
cause all kinds of corruption, also considering that the ITS will still
be poking bits into that memory in response to incoming MSIs.
So instead, let's grow the static memblock reservation table on such
systems so it can accommodate these reservations at an earlier time.
This will permit us to revert the above commit in a subsequent patch.
[ mingo: Minor cleanups. ]
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Acked-by: Mike Rapoport <rppt@linux.ibm.com>
Acked-by: Will Deacon <will.deacon@arm.com>
Acked-by: Marc Zyngier <marc.zyngier@arm.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-efi@vger.kernel.org
Link: http://lkml.kernel.org/r/20190215123333.21209-2-ard.biesheuvel@linaro.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
2019-02-15 12:33:32 +00:00
|
|
|
#define INIT_MEMBLOCK_REGIONS 128
|
|
|
|
#define INIT_PHYSMEM_REGIONS 4
|
|
|
|
|
|
|
|
#ifndef INIT_MEMBLOCK_RESERVED_REGIONS
|
|
|
|
# define INIT_MEMBLOCK_RESERVED_REGIONS INIT_MEMBLOCK_REGIONS
|
|
|
|
#endif
|
|
|
|
|
2018-06-30 14:55:05 +00:00
|
|
|
/**
|
|
|
|
* DOC: memblock overview
|
|
|
|
*
|
|
|
|
* Memblock is a method of managing memory regions during the early
|
|
|
|
* boot period when the usual kernel memory allocators are not up and
|
|
|
|
* running.
|
|
|
|
*
|
|
|
|
* Memblock views the system memory as collections of contiguous
|
|
|
|
* regions. There are several types of these collections:
|
|
|
|
*
|
|
|
|
* * ``memory`` - describes the physical memory available to the
|
|
|
|
* kernel; this may differ from the actual physical memory installed
|
|
|
|
* in the system, for instance when the memory is restricted with
|
|
|
|
* ``mem=`` command line parameter
|
|
|
|
* * ``reserved`` - describes the regions that were allocated
|
|
|
|
* * ``physmap`` - describes the actual physical memory regardless of
|
|
|
|
* the possible restrictions; the ``physmap`` type is only available
|
|
|
|
* on some architectures.
|
|
|
|
*
|
|
|
|
* Each region is represented by :c:type:`struct memblock_region` that
|
|
|
|
* defines the region extents, its attributes and NUMA node id on NUMA
|
|
|
|
* systems. Every memory type is described by the :c:type:`struct
|
|
|
|
* memblock_type` which contains an array of memory regions along with
|
|
|
|
* the allocator metadata. The memory types are nicely wrapped with
|
|
|
|
* :c:type:`struct memblock`. This structure is statically initialzed
|
|
|
|
* at build time. The region arrays for the "memory" and "reserved"
|
|
|
|
* types are initially sized to %INIT_MEMBLOCK_REGIONS and for the
|
|
|
|
* "physmap" type to %INIT_PHYSMEM_REGIONS.
|
|
|
|
* The :c:func:`memblock_allow_resize` enables automatic resizing of
|
|
|
|
* the region arrays during addition of new regions. This feature
|
|
|
|
* should be used with care so that memory allocated for the region
|
|
|
|
* array will not overlap with areas that should be reserved, for
|
|
|
|
* example initrd.
|
|
|
|
*
|
|
|
|
* The early architecture setup should tell memblock what the physical
|
|
|
|
* memory layout is by using :c:func:`memblock_add` or
|
|
|
|
* :c:func:`memblock_add_node` functions. The first function does not
|
|
|
|
* assign the region to a NUMA node and it is appropriate for UMA
|
|
|
|
* systems. Yet, it is possible to use it on NUMA systems as well and
|
|
|
|
* assign the region to a NUMA node later in the setup process using
|
|
|
|
* :c:func:`memblock_set_node`. The :c:func:`memblock_add_node`
|
|
|
|
* performs such an assignment directly.
|
|
|
|
*
|
|
|
|
* Once memblock is setup the memory can be allocated using either
|
|
|
|
* memblock or bootmem APIs.
|
|
|
|
*
|
|
|
|
* As the system boot progresses, the architecture specific
|
|
|
|
* :c:func:`mem_init` function frees all the memory to the buddy page
|
|
|
|
* allocator.
|
|
|
|
*
|
|
|
|
* If an architecure enables %CONFIG_ARCH_DISCARD_MEMBLOCK, the
|
|
|
|
* memblock data structures will be discarded after the system
|
|
|
|
* initialization compltes.
|
|
|
|
*/
|
|
|
|
|
2018-10-30 22:09:40 +00:00
|
|
|
#ifndef CONFIG_NEED_MULTIPLE_NODES
|
|
|
|
struct pglist_data __refdata contig_page_data;
|
|
|
|
EXPORT_SYMBOL(contig_page_data);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
unsigned long max_low_pfn;
|
|
|
|
unsigned long min_low_pfn;
|
|
|
|
unsigned long max_pfn;
|
|
|
|
unsigned long long max_possible_pfn;
|
|
|
|
|
2011-12-08 18:22:07 +00:00
|
|
|
static struct memblock_region memblock_memory_init_regions[INIT_MEMBLOCK_REGIONS] __initdata_memblock;
|
arm64, mm, efi: Account for GICv3 LPI tables in static memblock reserve table
In the irqchip and EFI code, we have what basically amounts to a quirk
to work around a peculiarity in the GICv3 architecture, which permits
the system memory address of LPI tables to be programmable only once
after a CPU reset. This means kexec kernels must use the same memory
as the first kernel, and thus ensure that this memory has not been
given out for other purposes by the time the ITS init code runs, which
is not very early for secondary CPUs.
On systems with many CPUs, these reservations could overflow the
memblock reservation table, and this was addressed in commit:
eff896288872 ("efi/arm: Defer persistent reservations until after paging_init()")
However, this turns out to have made things worse, since the allocation
of page tables and heap space for the resized memblock reservation table
itself may overwrite the regions we are attempting to reserve, which may
cause all kinds of corruption, also considering that the ITS will still
be poking bits into that memory in response to incoming MSIs.
So instead, let's grow the static memblock reservation table on such
systems so it can accommodate these reservations at an earlier time.
This will permit us to revert the above commit in a subsequent patch.
[ mingo: Minor cleanups. ]
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Acked-by: Mike Rapoport <rppt@linux.ibm.com>
Acked-by: Will Deacon <will.deacon@arm.com>
Acked-by: Marc Zyngier <marc.zyngier@arm.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-efi@vger.kernel.org
Link: http://lkml.kernel.org/r/20190215123333.21209-2-ard.biesheuvel@linaro.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
2019-02-15 12:33:32 +00:00
|
|
|
static struct memblock_region memblock_reserved_init_regions[INIT_MEMBLOCK_RESERVED_REGIONS] __initdata_memblock;
|
2014-01-29 17:16:01 +00:00
|
|
|
#ifdef CONFIG_HAVE_MEMBLOCK_PHYS_MAP
|
|
|
|
static struct memblock_region memblock_physmem_init_regions[INIT_PHYSMEM_REGIONS] __initdata_memblock;
|
|
|
|
#endif
|
2011-12-08 18:22:07 +00:00
|
|
|
|
|
|
|
struct memblock memblock __initdata_memblock = {
|
|
|
|
.memory.regions = memblock_memory_init_regions,
|
|
|
|
.memory.cnt = 1, /* empty dummy entry */
|
|
|
|
.memory.max = INIT_MEMBLOCK_REGIONS,
|
2017-02-24 22:55:59 +00:00
|
|
|
.memory.name = "memory",
|
2011-12-08 18:22:07 +00:00
|
|
|
|
|
|
|
.reserved.regions = memblock_reserved_init_regions,
|
|
|
|
.reserved.cnt = 1, /* empty dummy entry */
|
arm64, mm, efi: Account for GICv3 LPI tables in static memblock reserve table
In the irqchip and EFI code, we have what basically amounts to a quirk
to work around a peculiarity in the GICv3 architecture, which permits
the system memory address of LPI tables to be programmable only once
after a CPU reset. This means kexec kernels must use the same memory
as the first kernel, and thus ensure that this memory has not been
given out for other purposes by the time the ITS init code runs, which
is not very early for secondary CPUs.
On systems with many CPUs, these reservations could overflow the
memblock reservation table, and this was addressed in commit:
eff896288872 ("efi/arm: Defer persistent reservations until after paging_init()")
However, this turns out to have made things worse, since the allocation
of page tables and heap space for the resized memblock reservation table
itself may overwrite the regions we are attempting to reserve, which may
cause all kinds of corruption, also considering that the ITS will still
be poking bits into that memory in response to incoming MSIs.
So instead, let's grow the static memblock reservation table on such
systems so it can accommodate these reservations at an earlier time.
This will permit us to revert the above commit in a subsequent patch.
[ mingo: Minor cleanups. ]
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Acked-by: Mike Rapoport <rppt@linux.ibm.com>
Acked-by: Will Deacon <will.deacon@arm.com>
Acked-by: Marc Zyngier <marc.zyngier@arm.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-efi@vger.kernel.org
Link: http://lkml.kernel.org/r/20190215123333.21209-2-ard.biesheuvel@linaro.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
2019-02-15 12:33:32 +00:00
|
|
|
.reserved.max = INIT_MEMBLOCK_RESERVED_REGIONS,
|
2017-02-24 22:55:59 +00:00
|
|
|
.reserved.name = "reserved",
|
2011-12-08 18:22:07 +00:00
|
|
|
|
2014-01-29 17:16:01 +00:00
|
|
|
#ifdef CONFIG_HAVE_MEMBLOCK_PHYS_MAP
|
|
|
|
.physmem.regions = memblock_physmem_init_regions,
|
|
|
|
.physmem.cnt = 1, /* empty dummy entry */
|
|
|
|
.physmem.max = INIT_PHYSMEM_REGIONS,
|
2017-02-24 22:55:59 +00:00
|
|
|
.physmem.name = "physmem",
|
2014-01-29 17:16:01 +00:00
|
|
|
#endif
|
|
|
|
|
2013-11-12 23:07:59 +00:00
|
|
|
.bottom_up = false,
|
2011-12-08 18:22:07 +00:00
|
|
|
.current_limit = MEMBLOCK_ALLOC_ANYWHERE,
|
|
|
|
};
|
2010-07-12 04:36:09 +00:00
|
|
|
|
2010-07-28 05:43:02 +00:00
|
|
|
int memblock_debug __initdata_memblock;
|
2015-06-24 23:58:12 +00:00
|
|
|
static bool system_has_some_mirror __initdata_memblock = false;
|
2011-12-08 18:22:08 +00:00
|
|
|
static int memblock_can_resize __initdata_memblock;
|
2012-05-29 22:06:50 +00:00
|
|
|
static int memblock_memory_in_slab __initdata_memblock = 0;
|
|
|
|
static int memblock_reserved_in_slab __initdata_memblock = 0;
|
2010-07-12 04:36:09 +00:00
|
|
|
|
2018-06-30 14:55:01 +00:00
|
|
|
enum memblock_flags __init_memblock choose_memblock_flags(void)
|
2015-06-24 23:58:12 +00:00
|
|
|
{
|
|
|
|
return system_has_some_mirror ? MEMBLOCK_MIRROR : MEMBLOCK_NONE;
|
|
|
|
}
|
|
|
|
|
2011-12-08 18:22:07 +00:00
|
|
|
/* adjust *@size so that (@base + *@size) doesn't overflow, return new size */
|
|
|
|
static inline phys_addr_t memblock_cap_size(phys_addr_t base, phys_addr_t *size)
|
|
|
|
{
|
2018-06-08 00:06:15 +00:00
|
|
|
return *size = min(*size, PHYS_ADDR_MAX - base);
|
2011-12-08 18:22:07 +00:00
|
|
|
}
|
|
|
|
|
2010-07-12 04:36:48 +00:00
|
|
|
/*
|
|
|
|
* Address comparison utilities
|
|
|
|
*/
|
2010-07-28 05:43:02 +00:00
|
|
|
static unsigned long __init_memblock memblock_addrs_overlap(phys_addr_t base1, phys_addr_t size1,
|
2010-08-04 03:34:42 +00:00
|
|
|
phys_addr_t base2, phys_addr_t size2)
|
2010-07-12 04:36:09 +00:00
|
|
|
{
|
|
|
|
return ((base1 < (base2 + size2)) && (base2 < (base1 + size1)));
|
|
|
|
}
|
|
|
|
|
mem-hotplug: handle node hole when initializing numa_meminfo.
When parsing SRAT, all memory ranges are added into numa_meminfo. In
numa_init(), before entering numa_cleanup_meminfo(), all possible memory
ranges are in numa_meminfo. And numa_cleanup_meminfo() removes all
ranges over max_pfn or empty.
But, this only works if the nodes are continuous. Let's have a look at
the following example:
We have an SRAT like this:
SRAT: Node 0 PXM 0 [mem 0x00000000-0x5fffffff]
SRAT: Node 0 PXM 0 [mem 0x100000000-0x1ffffffffff]
SRAT: Node 1 PXM 1 [mem 0x20000000000-0x3ffffffffff]
SRAT: Node 4 PXM 2 [mem 0x40000000000-0x5ffffffffff] hotplug
SRAT: Node 5 PXM 3 [mem 0x60000000000-0x7ffffffffff] hotplug
SRAT: Node 2 PXM 4 [mem 0x80000000000-0x9ffffffffff] hotplug
SRAT: Node 3 PXM 5 [mem 0xa0000000000-0xbffffffffff] hotplug
SRAT: Node 6 PXM 6 [mem 0xc0000000000-0xdffffffffff] hotplug
SRAT: Node 7 PXM 7 [mem 0xe0000000000-0xfffffffffff] hotplug
On boot, only node 0,1,2,3 exist.
And the numa_meminfo will look like this:
numa_meminfo.nr_blks = 9
1. on node 0: [0, 60000000]
2. on node 0: [100000000, 20000000000]
3. on node 1: [20000000000, 40000000000]
4. on node 4: [40000000000, 60000000000]
5. on node 5: [60000000000, 80000000000]
6. on node 2: [80000000000, a0000000000]
7. on node 3: [a0000000000, a0800000000]
8. on node 6: [c0000000000, a0800000000]
9. on node 7: [e0000000000, a0800000000]
And numa_cleanup_meminfo() will merge 1 and 2, and remove 8,9 because the
end address is over max_pfn, which is a0800000000. But 4 and 5 are not
removed because their end addresses are less then max_pfn. But in fact,
node 4 and 5 don't exist.
In a word, numa_cleanup_meminfo() is not able to handle holes between nodes.
Since memory ranges in node 4 and 5 are in numa_meminfo, in
numa_register_memblks(), node 4 and 5 will be mistakenly set to online.
If you run lscpu, it will show:
NUMA node0 CPU(s): 0-14,128-142
NUMA node1 CPU(s): 15-29,143-157
NUMA node2 CPU(s):
NUMA node3 CPU(s):
NUMA node4 CPU(s): 62-76,190-204
NUMA node5 CPU(s): 78-92,206-220
In this patch, we use memblock_overlaps_region() to check if ranges in
numa_meminfo overlap with ranges in memory_block. Since memory_block
contains all available memory at boot time, if they overlap, it means the
ranges exist. If not, then remove them from numa_meminfo.
After this patch, lscpu will show:
NUMA node0 CPU(s): 0-14,128-142
NUMA node1 CPU(s): 15-29,143-157
NUMA node4 CPU(s): 62-76,190-204
NUMA node5 CPU(s): 78-92,206-220
Signed-off-by: Tang Chen <tangchen@cn.fujitsu.com>
Reviewed-by: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Tejun Heo <tj@kernel.org>
Cc: Luiz Capitulino <lcapitulino@redhat.com>
Cc: Xishi Qiu <qiuxishi@huawei.com>
Cc: Will Deacon <will.deacon@arm.com>
Cc: Vladimir Murzin <vladimir.murzin@arm.com>
Cc: Fabian Frederick <fabf@skynet.be>
Cc: Alexander Kuleshov <kuleshovmail@gmail.com>
Cc: Baoquan He <bhe@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2015-09-08 22:02:03 +00:00
|
|
|
bool __init_memblock memblock_overlaps_region(struct memblock_type *type,
|
2011-11-01 00:09:15 +00:00
|
|
|
phys_addr_t base, phys_addr_t size)
|
2010-07-12 04:36:48 +00:00
|
|
|
{
|
|
|
|
unsigned long i;
|
|
|
|
|
2016-01-14 23:20:39 +00:00
|
|
|
for (i = 0; i < type->cnt; i++)
|
|
|
|
if (memblock_addrs_overlap(base, size, type->regions[i].base,
|
|
|
|
type->regions[i].size))
|
2010-07-12 04:36:48 +00:00
|
|
|
break;
|
2015-09-08 22:02:00 +00:00
|
|
|
return i < type->cnt;
|
2010-07-12 04:36:48 +00:00
|
|
|
}
|
|
|
|
|
2018-06-30 14:55:02 +00:00
|
|
|
/**
|
2013-11-12 23:07:59 +00:00
|
|
|
* __memblock_find_range_bottom_up - find free area utility in bottom-up
|
|
|
|
* @start: start of candidate range
|
2018-06-30 14:55:02 +00:00
|
|
|
* @end: end of candidate range, can be %MEMBLOCK_ALLOC_ANYWHERE or
|
|
|
|
* %MEMBLOCK_ALLOC_ACCESSIBLE
|
2013-11-12 23:07:59 +00:00
|
|
|
* @size: size of free area to find
|
|
|
|
* @align: alignment of free area to find
|
2014-01-21 23:50:16 +00:00
|
|
|
* @nid: nid of the free area to find, %NUMA_NO_NODE for any node
|
2015-06-24 23:58:09 +00:00
|
|
|
* @flags: pick from blocks based on memory attributes
|
2013-11-12 23:07:59 +00:00
|
|
|
*
|
|
|
|
* Utility called from memblock_find_in_range_node(), find free area bottom-up.
|
|
|
|
*
|
2018-06-30 14:55:02 +00:00
|
|
|
* Return:
|
2013-11-12 23:07:59 +00:00
|
|
|
* Found address on success, 0 on failure.
|
|
|
|
*/
|
|
|
|
static phys_addr_t __init_memblock
|
|
|
|
__memblock_find_range_bottom_up(phys_addr_t start, phys_addr_t end,
|
2015-06-24 23:58:09 +00:00
|
|
|
phys_addr_t size, phys_addr_t align, int nid,
|
2018-06-30 14:55:01 +00:00
|
|
|
enum memblock_flags flags)
|
2013-11-12 23:07:59 +00:00
|
|
|
{
|
|
|
|
phys_addr_t this_start, this_end, cand;
|
|
|
|
u64 i;
|
|
|
|
|
2015-06-24 23:58:09 +00:00
|
|
|
for_each_free_mem_range(i, nid, flags, &this_start, &this_end, NULL) {
|
2013-11-12 23:07:59 +00:00
|
|
|
this_start = clamp(this_start, start, end);
|
|
|
|
this_end = clamp(this_end, start, end);
|
|
|
|
|
|
|
|
cand = round_up(this_start, align);
|
|
|
|
if (cand < this_end && this_end - cand >= size)
|
|
|
|
return cand;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2011-12-08 18:22:09 +00:00
|
|
|
/**
|
mm/memblock.c: factor out of top-down allocation
[Problem]
The current Linux cannot migrate pages used by the kernel because of the
kernel direct mapping. In Linux kernel space, va = pa + PAGE_OFFSET.
When the pa is changed, we cannot simply update the pagetable and keep the
va unmodified. So the kernel pages are not migratable.
There are also some other issues will cause the kernel pages not
migratable. For example, the physical address may be cached somewhere and
will be used. It is not to update all the caches.
When doing memory hotplug in Linux, we first migrate all the pages in one
memory device somewhere else, and then remove the device. But if pages
are used by the kernel, they are not migratable. As a result, memory used
by the kernel cannot be hot-removed.
Modifying the kernel direct mapping mechanism is too difficult to do. And
it may cause the kernel performance down and unstable. So we use the
following way to do memory hotplug.
[What we are doing]
In Linux, memory in one numa node is divided into several zones. One of
the zones is ZONE_MOVABLE, which the kernel won't use.
In order to implement memory hotplug in Linux, we are going to arrange all
hotpluggable memory in ZONE_MOVABLE so that the kernel won't use these
memory. To do this, we need ACPI's help.
In ACPI, SRAT(System Resource Affinity Table) contains NUMA info. The
memory affinities in SRAT record every memory range in the system, and
also, flags specifying if the memory range is hotpluggable. (Please refer
to ACPI spec 5.0 5.2.16)
With the help of SRAT, we have to do the following two things to achieve our
goal:
1. When doing memory hot-add, allow the users arranging hotpluggable as
ZONE_MOVABLE.
(This has been done by the MOVABLE_NODE functionality in Linux.)
2. when the system is booting, prevent bootmem allocator from allocating
hotpluggable memory for the kernel before the memory initialization
finishes.
The problem 2 is the key problem we are going to solve. But before solving it,
we need some preparation. Please see below.
[Preparation]
Bootloader has to load the kernel image into memory. And this memory must
be unhotpluggable. We cannot prevent this anyway. So in a memory hotplug
system, we can assume any node the kernel resides in is not hotpluggable.
Before SRAT is parsed, we don't know which memory ranges are hotpluggable.
But memblock has already started to work. In the current kernel,
memblock allocates the following memory before SRAT is parsed:
setup_arch()
|->memblock_x86_fill() /* memblock is ready */
|......
|->early_reserve_e820_mpc_new() /* allocate memory under 1MB */
|->reserve_real_mode() /* allocate memory under 1MB */
|->init_mem_mapping() /* allocate page tables, about 2MB to map 1GB memory */
|->dma_contiguous_reserve() /* specified by user, should be low */
|->setup_log_buf() /* specified by user, several mega bytes */
|->relocate_initrd() /* could be large, but will be freed after boot, should reorder */
|->acpi_initrd_override() /* several mega bytes */
|->reserve_crashkernel() /* could be large, should reorder */
|......
|->initmem_init() /* Parse SRAT */
According to Tejun's advice, before SRAT is parsed, we should try our best
to allocate memory near the kernel image. Since the whole node the kernel
resides in won't be hotpluggable, and for a modern server, a node may have
at least 16GB memory, allocating several mega bytes memory around the
kernel image won't cross to hotpluggable memory.
[About this patchset]
So this patchset is the preparation for the problem 2 that we want to
solve. It does the following:
1. Make memblock be able to allocate memory bottom up.
1) Keep all the memblock APIs' prototype unmodified.
2) When the direction is bottom up, keep the start address greater than the
end of kernel image.
2. Improve init_mem_mapping() to support allocate page tables in
bottom up direction.
3. Introduce "movable_node" boot option to enable and disable this
functionality.
This patch (of 6):
Create a new function __memblock_find_range_top_down to factor out of
top-down allocation from memblock_find_in_range_node. This is a
preparation because we will introduce a new bottom-up allocation mode in
the following patch.
Signed-off-by: Tang Chen <tangchen@cn.fujitsu.com>
Signed-off-by: Zhang Yanfei <zhangyanfei@cn.fujitsu.com>
Acked-by: Tejun Heo <tj@kernel.org>
Acked-by: Toshi Kani <toshi.kani@hp.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Wanpeng Li <liwanp@linux.vnet.ibm.com>
Cc: Thomas Renninger <trenn@suse.de>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Jiang Liu <jiang.liu@huawei.com>
Cc: Wen Congyang <wency@cn.fujitsu.com>
Cc: Lai Jiangshan <laijs@cn.fujitsu.com>
Cc: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
Cc: Taku Izumi <izumi.taku@jp.fujitsu.com>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Michal Nazarewicz <mina86@mina86.com>
Cc: Minchan Kim <minchan@kernel.org>
Cc: Rik van Riel <riel@redhat.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Kamezawa Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2013-11-12 23:07:57 +00:00
|
|
|
* __memblock_find_range_top_down - find free area utility, in top-down
|
2011-12-08 18:22:09 +00:00
|
|
|
* @start: start of candidate range
|
2018-06-30 14:55:02 +00:00
|
|
|
* @end: end of candidate range, can be %MEMBLOCK_ALLOC_ANYWHERE or
|
|
|
|
* %MEMBLOCK_ALLOC_ACCESSIBLE
|
2011-12-08 18:22:09 +00:00
|
|
|
* @size: size of free area to find
|
|
|
|
* @align: alignment of free area to find
|
2014-01-21 23:50:16 +00:00
|
|
|
* @nid: nid of the free area to find, %NUMA_NO_NODE for any node
|
2015-06-24 23:58:09 +00:00
|
|
|
* @flags: pick from blocks based on memory attributes
|
2011-12-08 18:22:09 +00:00
|
|
|
*
|
mm/memblock.c: factor out of top-down allocation
[Problem]
The current Linux cannot migrate pages used by the kernel because of the
kernel direct mapping. In Linux kernel space, va = pa + PAGE_OFFSET.
When the pa is changed, we cannot simply update the pagetable and keep the
va unmodified. So the kernel pages are not migratable.
There are also some other issues will cause the kernel pages not
migratable. For example, the physical address may be cached somewhere and
will be used. It is not to update all the caches.
When doing memory hotplug in Linux, we first migrate all the pages in one
memory device somewhere else, and then remove the device. But if pages
are used by the kernel, they are not migratable. As a result, memory used
by the kernel cannot be hot-removed.
Modifying the kernel direct mapping mechanism is too difficult to do. And
it may cause the kernel performance down and unstable. So we use the
following way to do memory hotplug.
[What we are doing]
In Linux, memory in one numa node is divided into several zones. One of
the zones is ZONE_MOVABLE, which the kernel won't use.
In order to implement memory hotplug in Linux, we are going to arrange all
hotpluggable memory in ZONE_MOVABLE so that the kernel won't use these
memory. To do this, we need ACPI's help.
In ACPI, SRAT(System Resource Affinity Table) contains NUMA info. The
memory affinities in SRAT record every memory range in the system, and
also, flags specifying if the memory range is hotpluggable. (Please refer
to ACPI spec 5.0 5.2.16)
With the help of SRAT, we have to do the following two things to achieve our
goal:
1. When doing memory hot-add, allow the users arranging hotpluggable as
ZONE_MOVABLE.
(This has been done by the MOVABLE_NODE functionality in Linux.)
2. when the system is booting, prevent bootmem allocator from allocating
hotpluggable memory for the kernel before the memory initialization
finishes.
The problem 2 is the key problem we are going to solve. But before solving it,
we need some preparation. Please see below.
[Preparation]
Bootloader has to load the kernel image into memory. And this memory must
be unhotpluggable. We cannot prevent this anyway. So in a memory hotplug
system, we can assume any node the kernel resides in is not hotpluggable.
Before SRAT is parsed, we don't know which memory ranges are hotpluggable.
But memblock has already started to work. In the current kernel,
memblock allocates the following memory before SRAT is parsed:
setup_arch()
|->memblock_x86_fill() /* memblock is ready */
|......
|->early_reserve_e820_mpc_new() /* allocate memory under 1MB */
|->reserve_real_mode() /* allocate memory under 1MB */
|->init_mem_mapping() /* allocate page tables, about 2MB to map 1GB memory */
|->dma_contiguous_reserve() /* specified by user, should be low */
|->setup_log_buf() /* specified by user, several mega bytes */
|->relocate_initrd() /* could be large, but will be freed after boot, should reorder */
|->acpi_initrd_override() /* several mega bytes */
|->reserve_crashkernel() /* could be large, should reorder */
|......
|->initmem_init() /* Parse SRAT */
According to Tejun's advice, before SRAT is parsed, we should try our best
to allocate memory near the kernel image. Since the whole node the kernel
resides in won't be hotpluggable, and for a modern server, a node may have
at least 16GB memory, allocating several mega bytes memory around the
kernel image won't cross to hotpluggable memory.
[About this patchset]
So this patchset is the preparation for the problem 2 that we want to
solve. It does the following:
1. Make memblock be able to allocate memory bottom up.
1) Keep all the memblock APIs' prototype unmodified.
2) When the direction is bottom up, keep the start address greater than the
end of kernel image.
2. Improve init_mem_mapping() to support allocate page tables in
bottom up direction.
3. Introduce "movable_node" boot option to enable and disable this
functionality.
This patch (of 6):
Create a new function __memblock_find_range_top_down to factor out of
top-down allocation from memblock_find_in_range_node. This is a
preparation because we will introduce a new bottom-up allocation mode in
the following patch.
Signed-off-by: Tang Chen <tangchen@cn.fujitsu.com>
Signed-off-by: Zhang Yanfei <zhangyanfei@cn.fujitsu.com>
Acked-by: Tejun Heo <tj@kernel.org>
Acked-by: Toshi Kani <toshi.kani@hp.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Wanpeng Li <liwanp@linux.vnet.ibm.com>
Cc: Thomas Renninger <trenn@suse.de>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Jiang Liu <jiang.liu@huawei.com>
Cc: Wen Congyang <wency@cn.fujitsu.com>
Cc: Lai Jiangshan <laijs@cn.fujitsu.com>
Cc: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
Cc: Taku Izumi <izumi.taku@jp.fujitsu.com>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Michal Nazarewicz <mina86@mina86.com>
Cc: Minchan Kim <minchan@kernel.org>
Cc: Rik van Riel <riel@redhat.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Kamezawa Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2013-11-12 23:07:57 +00:00
|
|
|
* Utility called from memblock_find_in_range_node(), find free area top-down.
|
2011-12-08 18:22:09 +00:00
|
|
|
*
|
2018-06-30 14:55:02 +00:00
|
|
|
* Return:
|
2013-11-12 23:07:59 +00:00
|
|
|
* Found address on success, 0 on failure.
|
2010-07-12 04:36:48 +00:00
|
|
|
*/
|
mm/memblock.c: factor out of top-down allocation
[Problem]
The current Linux cannot migrate pages used by the kernel because of the
kernel direct mapping. In Linux kernel space, va = pa + PAGE_OFFSET.
When the pa is changed, we cannot simply update the pagetable and keep the
va unmodified. So the kernel pages are not migratable.
There are also some other issues will cause the kernel pages not
migratable. For example, the physical address may be cached somewhere and
will be used. It is not to update all the caches.
When doing memory hotplug in Linux, we first migrate all the pages in one
memory device somewhere else, and then remove the device. But if pages
are used by the kernel, they are not migratable. As a result, memory used
by the kernel cannot be hot-removed.
Modifying the kernel direct mapping mechanism is too difficult to do. And
it may cause the kernel performance down and unstable. So we use the
following way to do memory hotplug.
[What we are doing]
In Linux, memory in one numa node is divided into several zones. One of
the zones is ZONE_MOVABLE, which the kernel won't use.
In order to implement memory hotplug in Linux, we are going to arrange all
hotpluggable memory in ZONE_MOVABLE so that the kernel won't use these
memory. To do this, we need ACPI's help.
In ACPI, SRAT(System Resource Affinity Table) contains NUMA info. The
memory affinities in SRAT record every memory range in the system, and
also, flags specifying if the memory range is hotpluggable. (Please refer
to ACPI spec 5.0 5.2.16)
With the help of SRAT, we have to do the following two things to achieve our
goal:
1. When doing memory hot-add, allow the users arranging hotpluggable as
ZONE_MOVABLE.
(This has been done by the MOVABLE_NODE functionality in Linux.)
2. when the system is booting, prevent bootmem allocator from allocating
hotpluggable memory for the kernel before the memory initialization
finishes.
The problem 2 is the key problem we are going to solve. But before solving it,
we need some preparation. Please see below.
[Preparation]
Bootloader has to load the kernel image into memory. And this memory must
be unhotpluggable. We cannot prevent this anyway. So in a memory hotplug
system, we can assume any node the kernel resides in is not hotpluggable.
Before SRAT is parsed, we don't know which memory ranges are hotpluggable.
But memblock has already started to work. In the current kernel,
memblock allocates the following memory before SRAT is parsed:
setup_arch()
|->memblock_x86_fill() /* memblock is ready */
|......
|->early_reserve_e820_mpc_new() /* allocate memory under 1MB */
|->reserve_real_mode() /* allocate memory under 1MB */
|->init_mem_mapping() /* allocate page tables, about 2MB to map 1GB memory */
|->dma_contiguous_reserve() /* specified by user, should be low */
|->setup_log_buf() /* specified by user, several mega bytes */
|->relocate_initrd() /* could be large, but will be freed after boot, should reorder */
|->acpi_initrd_override() /* several mega bytes */
|->reserve_crashkernel() /* could be large, should reorder */
|......
|->initmem_init() /* Parse SRAT */
According to Tejun's advice, before SRAT is parsed, we should try our best
to allocate memory near the kernel image. Since the whole node the kernel
resides in won't be hotpluggable, and for a modern server, a node may have
at least 16GB memory, allocating several mega bytes memory around the
kernel image won't cross to hotpluggable memory.
[About this patchset]
So this patchset is the preparation for the problem 2 that we want to
solve. It does the following:
1. Make memblock be able to allocate memory bottom up.
1) Keep all the memblock APIs' prototype unmodified.
2) When the direction is bottom up, keep the start address greater than the
end of kernel image.
2. Improve init_mem_mapping() to support allocate page tables in
bottom up direction.
3. Introduce "movable_node" boot option to enable and disable this
functionality.
This patch (of 6):
Create a new function __memblock_find_range_top_down to factor out of
top-down allocation from memblock_find_in_range_node. This is a
preparation because we will introduce a new bottom-up allocation mode in
the following patch.
Signed-off-by: Tang Chen <tangchen@cn.fujitsu.com>
Signed-off-by: Zhang Yanfei <zhangyanfei@cn.fujitsu.com>
Acked-by: Tejun Heo <tj@kernel.org>
Acked-by: Toshi Kani <toshi.kani@hp.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Wanpeng Li <liwanp@linux.vnet.ibm.com>
Cc: Thomas Renninger <trenn@suse.de>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Jiang Liu <jiang.liu@huawei.com>
Cc: Wen Congyang <wency@cn.fujitsu.com>
Cc: Lai Jiangshan <laijs@cn.fujitsu.com>
Cc: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
Cc: Taku Izumi <izumi.taku@jp.fujitsu.com>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Michal Nazarewicz <mina86@mina86.com>
Cc: Minchan Kim <minchan@kernel.org>
Cc: Rik van Riel <riel@redhat.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Kamezawa Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2013-11-12 23:07:57 +00:00
|
|
|
static phys_addr_t __init_memblock
|
|
|
|
__memblock_find_range_top_down(phys_addr_t start, phys_addr_t end,
|
2015-06-24 23:58:09 +00:00
|
|
|
phys_addr_t size, phys_addr_t align, int nid,
|
2018-06-30 14:55:01 +00:00
|
|
|
enum memblock_flags flags)
|
2013-02-23 00:33:51 +00:00
|
|
|
{
|
|
|
|
phys_addr_t this_start, this_end, cand;
|
|
|
|
u64 i;
|
|
|
|
|
2015-06-24 23:58:09 +00:00
|
|
|
for_each_free_mem_range_reverse(i, nid, flags, &this_start, &this_end,
|
|
|
|
NULL) {
|
2013-02-23 00:33:51 +00:00
|
|
|
this_start = clamp(this_start, start, end);
|
|
|
|
this_end = clamp(this_end, start, end);
|
|
|
|
|
|
|
|
if (this_end < size)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
cand = round_down(this_end - size, align);
|
|
|
|
if (cand >= this_start)
|
|
|
|
return cand;
|
|
|
|
}
|
mm/memblock.c: factor out of top-down allocation
[Problem]
The current Linux cannot migrate pages used by the kernel because of the
kernel direct mapping. In Linux kernel space, va = pa + PAGE_OFFSET.
When the pa is changed, we cannot simply update the pagetable and keep the
va unmodified. So the kernel pages are not migratable.
There are also some other issues will cause the kernel pages not
migratable. For example, the physical address may be cached somewhere and
will be used. It is not to update all the caches.
When doing memory hotplug in Linux, we first migrate all the pages in one
memory device somewhere else, and then remove the device. But if pages
are used by the kernel, they are not migratable. As a result, memory used
by the kernel cannot be hot-removed.
Modifying the kernel direct mapping mechanism is too difficult to do. And
it may cause the kernel performance down and unstable. So we use the
following way to do memory hotplug.
[What we are doing]
In Linux, memory in one numa node is divided into several zones. One of
the zones is ZONE_MOVABLE, which the kernel won't use.
In order to implement memory hotplug in Linux, we are going to arrange all
hotpluggable memory in ZONE_MOVABLE so that the kernel won't use these
memory. To do this, we need ACPI's help.
In ACPI, SRAT(System Resource Affinity Table) contains NUMA info. The
memory affinities in SRAT record every memory range in the system, and
also, flags specifying if the memory range is hotpluggable. (Please refer
to ACPI spec 5.0 5.2.16)
With the help of SRAT, we have to do the following two things to achieve our
goal:
1. When doing memory hot-add, allow the users arranging hotpluggable as
ZONE_MOVABLE.
(This has been done by the MOVABLE_NODE functionality in Linux.)
2. when the system is booting, prevent bootmem allocator from allocating
hotpluggable memory for the kernel before the memory initialization
finishes.
The problem 2 is the key problem we are going to solve. But before solving it,
we need some preparation. Please see below.
[Preparation]
Bootloader has to load the kernel image into memory. And this memory must
be unhotpluggable. We cannot prevent this anyway. So in a memory hotplug
system, we can assume any node the kernel resides in is not hotpluggable.
Before SRAT is parsed, we don't know which memory ranges are hotpluggable.
But memblock has already started to work. In the current kernel,
memblock allocates the following memory before SRAT is parsed:
setup_arch()
|->memblock_x86_fill() /* memblock is ready */
|......
|->early_reserve_e820_mpc_new() /* allocate memory under 1MB */
|->reserve_real_mode() /* allocate memory under 1MB */
|->init_mem_mapping() /* allocate page tables, about 2MB to map 1GB memory */
|->dma_contiguous_reserve() /* specified by user, should be low */
|->setup_log_buf() /* specified by user, several mega bytes */
|->relocate_initrd() /* could be large, but will be freed after boot, should reorder */
|->acpi_initrd_override() /* several mega bytes */
|->reserve_crashkernel() /* could be large, should reorder */
|......
|->initmem_init() /* Parse SRAT */
According to Tejun's advice, before SRAT is parsed, we should try our best
to allocate memory near the kernel image. Since the whole node the kernel
resides in won't be hotpluggable, and for a modern server, a node may have
at least 16GB memory, allocating several mega bytes memory around the
kernel image won't cross to hotpluggable memory.
[About this patchset]
So this patchset is the preparation for the problem 2 that we want to
solve. It does the following:
1. Make memblock be able to allocate memory bottom up.
1) Keep all the memblock APIs' prototype unmodified.
2) When the direction is bottom up, keep the start address greater than the
end of kernel image.
2. Improve init_mem_mapping() to support allocate page tables in
bottom up direction.
3. Introduce "movable_node" boot option to enable and disable this
functionality.
This patch (of 6):
Create a new function __memblock_find_range_top_down to factor out of
top-down allocation from memblock_find_in_range_node. This is a
preparation because we will introduce a new bottom-up allocation mode in
the following patch.
Signed-off-by: Tang Chen <tangchen@cn.fujitsu.com>
Signed-off-by: Zhang Yanfei <zhangyanfei@cn.fujitsu.com>
Acked-by: Tejun Heo <tj@kernel.org>
Acked-by: Toshi Kani <toshi.kani@hp.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Wanpeng Li <liwanp@linux.vnet.ibm.com>
Cc: Thomas Renninger <trenn@suse.de>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Jiang Liu <jiang.liu@huawei.com>
Cc: Wen Congyang <wency@cn.fujitsu.com>
Cc: Lai Jiangshan <laijs@cn.fujitsu.com>
Cc: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
Cc: Taku Izumi <izumi.taku@jp.fujitsu.com>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Michal Nazarewicz <mina86@mina86.com>
Cc: Minchan Kim <minchan@kernel.org>
Cc: Rik van Riel <riel@redhat.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Kamezawa Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2013-11-12 23:07:57 +00:00
|
|
|
|
2013-02-23 00:33:51 +00:00
|
|
|
return 0;
|
|
|
|
}
|
2010-07-12 04:36:48 +00:00
|
|
|
|
mm/memblock.c: factor out of top-down allocation
[Problem]
The current Linux cannot migrate pages used by the kernel because of the
kernel direct mapping. In Linux kernel space, va = pa + PAGE_OFFSET.
When the pa is changed, we cannot simply update the pagetable and keep the
va unmodified. So the kernel pages are not migratable.
There are also some other issues will cause the kernel pages not
migratable. For example, the physical address may be cached somewhere and
will be used. It is not to update all the caches.
When doing memory hotplug in Linux, we first migrate all the pages in one
memory device somewhere else, and then remove the device. But if pages
are used by the kernel, they are not migratable. As a result, memory used
by the kernel cannot be hot-removed.
Modifying the kernel direct mapping mechanism is too difficult to do. And
it may cause the kernel performance down and unstable. So we use the
following way to do memory hotplug.
[What we are doing]
In Linux, memory in one numa node is divided into several zones. One of
the zones is ZONE_MOVABLE, which the kernel won't use.
In order to implement memory hotplug in Linux, we are going to arrange all
hotpluggable memory in ZONE_MOVABLE so that the kernel won't use these
memory. To do this, we need ACPI's help.
In ACPI, SRAT(System Resource Affinity Table) contains NUMA info. The
memory affinities in SRAT record every memory range in the system, and
also, flags specifying if the memory range is hotpluggable. (Please refer
to ACPI spec 5.0 5.2.16)
With the help of SRAT, we have to do the following two things to achieve our
goal:
1. When doing memory hot-add, allow the users arranging hotpluggable as
ZONE_MOVABLE.
(This has been done by the MOVABLE_NODE functionality in Linux.)
2. when the system is booting, prevent bootmem allocator from allocating
hotpluggable memory for the kernel before the memory initialization
finishes.
The problem 2 is the key problem we are going to solve. But before solving it,
we need some preparation. Please see below.
[Preparation]
Bootloader has to load the kernel image into memory. And this memory must
be unhotpluggable. We cannot prevent this anyway. So in a memory hotplug
system, we can assume any node the kernel resides in is not hotpluggable.
Before SRAT is parsed, we don't know which memory ranges are hotpluggable.
But memblock has already started to work. In the current kernel,
memblock allocates the following memory before SRAT is parsed:
setup_arch()
|->memblock_x86_fill() /* memblock is ready */
|......
|->early_reserve_e820_mpc_new() /* allocate memory under 1MB */
|->reserve_real_mode() /* allocate memory under 1MB */
|->init_mem_mapping() /* allocate page tables, about 2MB to map 1GB memory */
|->dma_contiguous_reserve() /* specified by user, should be low */
|->setup_log_buf() /* specified by user, several mega bytes */
|->relocate_initrd() /* could be large, but will be freed after boot, should reorder */
|->acpi_initrd_override() /* several mega bytes */
|->reserve_crashkernel() /* could be large, should reorder */
|......
|->initmem_init() /* Parse SRAT */
According to Tejun's advice, before SRAT is parsed, we should try our best
to allocate memory near the kernel image. Since the whole node the kernel
resides in won't be hotpluggable, and for a modern server, a node may have
at least 16GB memory, allocating several mega bytes memory around the
kernel image won't cross to hotpluggable memory.
[About this patchset]
So this patchset is the preparation for the problem 2 that we want to
solve. It does the following:
1. Make memblock be able to allocate memory bottom up.
1) Keep all the memblock APIs' prototype unmodified.
2) When the direction is bottom up, keep the start address greater than the
end of kernel image.
2. Improve init_mem_mapping() to support allocate page tables in
bottom up direction.
3. Introduce "movable_node" boot option to enable and disable this
functionality.
This patch (of 6):
Create a new function __memblock_find_range_top_down to factor out of
top-down allocation from memblock_find_in_range_node. This is a
preparation because we will introduce a new bottom-up allocation mode in
the following patch.
Signed-off-by: Tang Chen <tangchen@cn.fujitsu.com>
Signed-off-by: Zhang Yanfei <zhangyanfei@cn.fujitsu.com>
Acked-by: Tejun Heo <tj@kernel.org>
Acked-by: Toshi Kani <toshi.kani@hp.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Wanpeng Li <liwanp@linux.vnet.ibm.com>
Cc: Thomas Renninger <trenn@suse.de>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Jiang Liu <jiang.liu@huawei.com>
Cc: Wen Congyang <wency@cn.fujitsu.com>
Cc: Lai Jiangshan <laijs@cn.fujitsu.com>
Cc: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
Cc: Taku Izumi <izumi.taku@jp.fujitsu.com>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Michal Nazarewicz <mina86@mina86.com>
Cc: Minchan Kim <minchan@kernel.org>
Cc: Rik van Riel <riel@redhat.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Kamezawa Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2013-11-12 23:07:57 +00:00
|
|
|
/**
|
|
|
|
* memblock_find_in_range_node - find free area in given range and node
|
|
|
|
* @size: size of free area to find
|
|
|
|
* @align: alignment of free area to find
|
2014-01-21 23:50:14 +00:00
|
|
|
* @start: start of candidate range
|
2018-06-30 14:55:02 +00:00
|
|
|
* @end: end of candidate range, can be %MEMBLOCK_ALLOC_ANYWHERE or
|
|
|
|
* %MEMBLOCK_ALLOC_ACCESSIBLE
|
2014-01-21 23:50:16 +00:00
|
|
|
* @nid: nid of the free area to find, %NUMA_NO_NODE for any node
|
2015-06-24 23:58:09 +00:00
|
|
|
* @flags: pick from blocks based on memory attributes
|
mm/memblock.c: factor out of top-down allocation
[Problem]
The current Linux cannot migrate pages used by the kernel because of the
kernel direct mapping. In Linux kernel space, va = pa + PAGE_OFFSET.
When the pa is changed, we cannot simply update the pagetable and keep the
va unmodified. So the kernel pages are not migratable.
There are also some other issues will cause the kernel pages not
migratable. For example, the physical address may be cached somewhere and
will be used. It is not to update all the caches.
When doing memory hotplug in Linux, we first migrate all the pages in one
memory device somewhere else, and then remove the device. But if pages
are used by the kernel, they are not migratable. As a result, memory used
by the kernel cannot be hot-removed.
Modifying the kernel direct mapping mechanism is too difficult to do. And
it may cause the kernel performance down and unstable. So we use the
following way to do memory hotplug.
[What we are doing]
In Linux, memory in one numa node is divided into several zones. One of
the zones is ZONE_MOVABLE, which the kernel won't use.
In order to implement memory hotplug in Linux, we are going to arrange all
hotpluggable memory in ZONE_MOVABLE so that the kernel won't use these
memory. To do this, we need ACPI's help.
In ACPI, SRAT(System Resource Affinity Table) contains NUMA info. The
memory affinities in SRAT record every memory range in the system, and
also, flags specifying if the memory range is hotpluggable. (Please refer
to ACPI spec 5.0 5.2.16)
With the help of SRAT, we have to do the following two things to achieve our
goal:
1. When doing memory hot-add, allow the users arranging hotpluggable as
ZONE_MOVABLE.
(This has been done by the MOVABLE_NODE functionality in Linux.)
2. when the system is booting, prevent bootmem allocator from allocating
hotpluggable memory for the kernel before the memory initialization
finishes.
The problem 2 is the key problem we are going to solve. But before solving it,
we need some preparation. Please see below.
[Preparation]
Bootloader has to load the kernel image into memory. And this memory must
be unhotpluggable. We cannot prevent this anyway. So in a memory hotplug
system, we can assume any node the kernel resides in is not hotpluggable.
Before SRAT is parsed, we don't know which memory ranges are hotpluggable.
But memblock has already started to work. In the current kernel,
memblock allocates the following memory before SRAT is parsed:
setup_arch()
|->memblock_x86_fill() /* memblock is ready */
|......
|->early_reserve_e820_mpc_new() /* allocate memory under 1MB */
|->reserve_real_mode() /* allocate memory under 1MB */
|->init_mem_mapping() /* allocate page tables, about 2MB to map 1GB memory */
|->dma_contiguous_reserve() /* specified by user, should be low */
|->setup_log_buf() /* specified by user, several mega bytes */
|->relocate_initrd() /* could be large, but will be freed after boot, should reorder */
|->acpi_initrd_override() /* several mega bytes */
|->reserve_crashkernel() /* could be large, should reorder */
|......
|->initmem_init() /* Parse SRAT */
According to Tejun's advice, before SRAT is parsed, we should try our best
to allocate memory near the kernel image. Since the whole node the kernel
resides in won't be hotpluggable, and for a modern server, a node may have
at least 16GB memory, allocating several mega bytes memory around the
kernel image won't cross to hotpluggable memory.
[About this patchset]
So this patchset is the preparation for the problem 2 that we want to
solve. It does the following:
1. Make memblock be able to allocate memory bottom up.
1) Keep all the memblock APIs' prototype unmodified.
2) When the direction is bottom up, keep the start address greater than the
end of kernel image.
2. Improve init_mem_mapping() to support allocate page tables in
bottom up direction.
3. Introduce "movable_node" boot option to enable and disable this
functionality.
This patch (of 6):
Create a new function __memblock_find_range_top_down to factor out of
top-down allocation from memblock_find_in_range_node. This is a
preparation because we will introduce a new bottom-up allocation mode in
the following patch.
Signed-off-by: Tang Chen <tangchen@cn.fujitsu.com>
Signed-off-by: Zhang Yanfei <zhangyanfei@cn.fujitsu.com>
Acked-by: Tejun Heo <tj@kernel.org>
Acked-by: Toshi Kani <toshi.kani@hp.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Wanpeng Li <liwanp@linux.vnet.ibm.com>
Cc: Thomas Renninger <trenn@suse.de>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Jiang Liu <jiang.liu@huawei.com>
Cc: Wen Congyang <wency@cn.fujitsu.com>
Cc: Lai Jiangshan <laijs@cn.fujitsu.com>
Cc: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
Cc: Taku Izumi <izumi.taku@jp.fujitsu.com>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Michal Nazarewicz <mina86@mina86.com>
Cc: Minchan Kim <minchan@kernel.org>
Cc: Rik van Riel <riel@redhat.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Kamezawa Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2013-11-12 23:07:57 +00:00
|
|
|
*
|
|
|
|
* Find @size free area aligned to @align in the specified range and node.
|
|
|
|
*
|
2013-11-12 23:07:59 +00:00
|
|
|
* When allocation direction is bottom-up, the @start should be greater
|
|
|
|
* than the end of the kernel image. Otherwise, it will be trimmed. The
|
|
|
|
* reason is that we want the bottom-up allocation just near the kernel
|
|
|
|
* image so it is highly likely that the allocated memory and the kernel
|
|
|
|
* will reside in the same node.
|
|
|
|
*
|
|
|
|
* If bottom-up allocation failed, will try to allocate memory top-down.
|
|
|
|
*
|
2018-06-30 14:55:02 +00:00
|
|
|
* Return:
|
2013-11-12 23:07:59 +00:00
|
|
|
* Found address on success, 0 on failure.
|
mm/memblock.c: factor out of top-down allocation
[Problem]
The current Linux cannot migrate pages used by the kernel because of the
kernel direct mapping. In Linux kernel space, va = pa + PAGE_OFFSET.
When the pa is changed, we cannot simply update the pagetable and keep the
va unmodified. So the kernel pages are not migratable.
There are also some other issues will cause the kernel pages not
migratable. For example, the physical address may be cached somewhere and
will be used. It is not to update all the caches.
When doing memory hotplug in Linux, we first migrate all the pages in one
memory device somewhere else, and then remove the device. But if pages
are used by the kernel, they are not migratable. As a result, memory used
by the kernel cannot be hot-removed.
Modifying the kernel direct mapping mechanism is too difficult to do. And
it may cause the kernel performance down and unstable. So we use the
following way to do memory hotplug.
[What we are doing]
In Linux, memory in one numa node is divided into several zones. One of
the zones is ZONE_MOVABLE, which the kernel won't use.
In order to implement memory hotplug in Linux, we are going to arrange all
hotpluggable memory in ZONE_MOVABLE so that the kernel won't use these
memory. To do this, we need ACPI's help.
In ACPI, SRAT(System Resource Affinity Table) contains NUMA info. The
memory affinities in SRAT record every memory range in the system, and
also, flags specifying if the memory range is hotpluggable. (Please refer
to ACPI spec 5.0 5.2.16)
With the help of SRAT, we have to do the following two things to achieve our
goal:
1. When doing memory hot-add, allow the users arranging hotpluggable as
ZONE_MOVABLE.
(This has been done by the MOVABLE_NODE functionality in Linux.)
2. when the system is booting, prevent bootmem allocator from allocating
hotpluggable memory for the kernel before the memory initialization
finishes.
The problem 2 is the key problem we are going to solve. But before solving it,
we need some preparation. Please see below.
[Preparation]
Bootloader has to load the kernel image into memory. And this memory must
be unhotpluggable. We cannot prevent this anyway. So in a memory hotplug
system, we can assume any node the kernel resides in is not hotpluggable.
Before SRAT is parsed, we don't know which memory ranges are hotpluggable.
But memblock has already started to work. In the current kernel,
memblock allocates the following memory before SRAT is parsed:
setup_arch()
|->memblock_x86_fill() /* memblock is ready */
|......
|->early_reserve_e820_mpc_new() /* allocate memory under 1MB */
|->reserve_real_mode() /* allocate memory under 1MB */
|->init_mem_mapping() /* allocate page tables, about 2MB to map 1GB memory */
|->dma_contiguous_reserve() /* specified by user, should be low */
|->setup_log_buf() /* specified by user, several mega bytes */
|->relocate_initrd() /* could be large, but will be freed after boot, should reorder */
|->acpi_initrd_override() /* several mega bytes */
|->reserve_crashkernel() /* could be large, should reorder */
|......
|->initmem_init() /* Parse SRAT */
According to Tejun's advice, before SRAT is parsed, we should try our best
to allocate memory near the kernel image. Since the whole node the kernel
resides in won't be hotpluggable, and for a modern server, a node may have
at least 16GB memory, allocating several mega bytes memory around the
kernel image won't cross to hotpluggable memory.
[About this patchset]
So this patchset is the preparation for the problem 2 that we want to
solve. It does the following:
1. Make memblock be able to allocate memory bottom up.
1) Keep all the memblock APIs' prototype unmodified.
2) When the direction is bottom up, keep the start address greater than the
end of kernel image.
2. Improve init_mem_mapping() to support allocate page tables in
bottom up direction.
3. Introduce "movable_node" boot option to enable and disable this
functionality.
This patch (of 6):
Create a new function __memblock_find_range_top_down to factor out of
top-down allocation from memblock_find_in_range_node. This is a
preparation because we will introduce a new bottom-up allocation mode in
the following patch.
Signed-off-by: Tang Chen <tangchen@cn.fujitsu.com>
Signed-off-by: Zhang Yanfei <zhangyanfei@cn.fujitsu.com>
Acked-by: Tejun Heo <tj@kernel.org>
Acked-by: Toshi Kani <toshi.kani@hp.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Wanpeng Li <liwanp@linux.vnet.ibm.com>
Cc: Thomas Renninger <trenn@suse.de>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Jiang Liu <jiang.liu@huawei.com>
Cc: Wen Congyang <wency@cn.fujitsu.com>
Cc: Lai Jiangshan <laijs@cn.fujitsu.com>
Cc: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
Cc: Taku Izumi <izumi.taku@jp.fujitsu.com>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Michal Nazarewicz <mina86@mina86.com>
Cc: Minchan Kim <minchan@kernel.org>
Cc: Rik van Riel <riel@redhat.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Kamezawa Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2013-11-12 23:07:57 +00:00
|
|
|
*/
|
2014-01-21 23:50:14 +00:00
|
|
|
phys_addr_t __init_memblock memblock_find_in_range_node(phys_addr_t size,
|
|
|
|
phys_addr_t align, phys_addr_t start,
|
2018-06-30 14:55:01 +00:00
|
|
|
phys_addr_t end, int nid,
|
|
|
|
enum memblock_flags flags)
|
mm/memblock.c: factor out of top-down allocation
[Problem]
The current Linux cannot migrate pages used by the kernel because of the
kernel direct mapping. In Linux kernel space, va = pa + PAGE_OFFSET.
When the pa is changed, we cannot simply update the pagetable and keep the
va unmodified. So the kernel pages are not migratable.
There are also some other issues will cause the kernel pages not
migratable. For example, the physical address may be cached somewhere and
will be used. It is not to update all the caches.
When doing memory hotplug in Linux, we first migrate all the pages in one
memory device somewhere else, and then remove the device. But if pages
are used by the kernel, they are not migratable. As a result, memory used
by the kernel cannot be hot-removed.
Modifying the kernel direct mapping mechanism is too difficult to do. And
it may cause the kernel performance down and unstable. So we use the
following way to do memory hotplug.
[What we are doing]
In Linux, memory in one numa node is divided into several zones. One of
the zones is ZONE_MOVABLE, which the kernel won't use.
In order to implement memory hotplug in Linux, we are going to arrange all
hotpluggable memory in ZONE_MOVABLE so that the kernel won't use these
memory. To do this, we need ACPI's help.
In ACPI, SRAT(System Resource Affinity Table) contains NUMA info. The
memory affinities in SRAT record every memory range in the system, and
also, flags specifying if the memory range is hotpluggable. (Please refer
to ACPI spec 5.0 5.2.16)
With the help of SRAT, we have to do the following two things to achieve our
goal:
1. When doing memory hot-add, allow the users arranging hotpluggable as
ZONE_MOVABLE.
(This has been done by the MOVABLE_NODE functionality in Linux.)
2. when the system is booting, prevent bootmem allocator from allocating
hotpluggable memory for the kernel before the memory initialization
finishes.
The problem 2 is the key problem we are going to solve. But before solving it,
we need some preparation. Please see below.
[Preparation]
Bootloader has to load the kernel image into memory. And this memory must
be unhotpluggable. We cannot prevent this anyway. So in a memory hotplug
system, we can assume any node the kernel resides in is not hotpluggable.
Before SRAT is parsed, we don't know which memory ranges are hotpluggable.
But memblock has already started to work. In the current kernel,
memblock allocates the following memory before SRAT is parsed:
setup_arch()
|->memblock_x86_fill() /* memblock is ready */
|......
|->early_reserve_e820_mpc_new() /* allocate memory under 1MB */
|->reserve_real_mode() /* allocate memory under 1MB */
|->init_mem_mapping() /* allocate page tables, about 2MB to map 1GB memory */
|->dma_contiguous_reserve() /* specified by user, should be low */
|->setup_log_buf() /* specified by user, several mega bytes */
|->relocate_initrd() /* could be large, but will be freed after boot, should reorder */
|->acpi_initrd_override() /* several mega bytes */
|->reserve_crashkernel() /* could be large, should reorder */
|......
|->initmem_init() /* Parse SRAT */
According to Tejun's advice, before SRAT is parsed, we should try our best
to allocate memory near the kernel image. Since the whole node the kernel
resides in won't be hotpluggable, and for a modern server, a node may have
at least 16GB memory, allocating several mega bytes memory around the
kernel image won't cross to hotpluggable memory.
[About this patchset]
So this patchset is the preparation for the problem 2 that we want to
solve. It does the following:
1. Make memblock be able to allocate memory bottom up.
1) Keep all the memblock APIs' prototype unmodified.
2) When the direction is bottom up, keep the start address greater than the
end of kernel image.
2. Improve init_mem_mapping() to support allocate page tables in
bottom up direction.
3. Introduce "movable_node" boot option to enable and disable this
functionality.
This patch (of 6):
Create a new function __memblock_find_range_top_down to factor out of
top-down allocation from memblock_find_in_range_node. This is a
preparation because we will introduce a new bottom-up allocation mode in
the following patch.
Signed-off-by: Tang Chen <tangchen@cn.fujitsu.com>
Signed-off-by: Zhang Yanfei <zhangyanfei@cn.fujitsu.com>
Acked-by: Tejun Heo <tj@kernel.org>
Acked-by: Toshi Kani <toshi.kani@hp.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Wanpeng Li <liwanp@linux.vnet.ibm.com>
Cc: Thomas Renninger <trenn@suse.de>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Jiang Liu <jiang.liu@huawei.com>
Cc: Wen Congyang <wency@cn.fujitsu.com>
Cc: Lai Jiangshan <laijs@cn.fujitsu.com>
Cc: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
Cc: Taku Izumi <izumi.taku@jp.fujitsu.com>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Michal Nazarewicz <mina86@mina86.com>
Cc: Minchan Kim <minchan@kernel.org>
Cc: Rik van Riel <riel@redhat.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Kamezawa Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2013-11-12 23:07:57 +00:00
|
|
|
{
|
2014-08-29 22:18:31 +00:00
|
|
|
phys_addr_t kernel_end, ret;
|
2013-11-12 23:07:59 +00:00
|
|
|
|
mm/memblock.c: factor out of top-down allocation
[Problem]
The current Linux cannot migrate pages used by the kernel because of the
kernel direct mapping. In Linux kernel space, va = pa + PAGE_OFFSET.
When the pa is changed, we cannot simply update the pagetable and keep the
va unmodified. So the kernel pages are not migratable.
There are also some other issues will cause the kernel pages not
migratable. For example, the physical address may be cached somewhere and
will be used. It is not to update all the caches.
When doing memory hotplug in Linux, we first migrate all the pages in one
memory device somewhere else, and then remove the device. But if pages
are used by the kernel, they are not migratable. As a result, memory used
by the kernel cannot be hot-removed.
Modifying the kernel direct mapping mechanism is too difficult to do. And
it may cause the kernel performance down and unstable. So we use the
following way to do memory hotplug.
[What we are doing]
In Linux, memory in one numa node is divided into several zones. One of
the zones is ZONE_MOVABLE, which the kernel won't use.
In order to implement memory hotplug in Linux, we are going to arrange all
hotpluggable memory in ZONE_MOVABLE so that the kernel won't use these
memory. To do this, we need ACPI's help.
In ACPI, SRAT(System Resource Affinity Table) contains NUMA info. The
memory affinities in SRAT record every memory range in the system, and
also, flags specifying if the memory range is hotpluggable. (Please refer
to ACPI spec 5.0 5.2.16)
With the help of SRAT, we have to do the following two things to achieve our
goal:
1. When doing memory hot-add, allow the users arranging hotpluggable as
ZONE_MOVABLE.
(This has been done by the MOVABLE_NODE functionality in Linux.)
2. when the system is booting, prevent bootmem allocator from allocating
hotpluggable memory for the kernel before the memory initialization
finishes.
The problem 2 is the key problem we are going to solve. But before solving it,
we need some preparation. Please see below.
[Preparation]
Bootloader has to load the kernel image into memory. And this memory must
be unhotpluggable. We cannot prevent this anyway. So in a memory hotplug
system, we can assume any node the kernel resides in is not hotpluggable.
Before SRAT is parsed, we don't know which memory ranges are hotpluggable.
But memblock has already started to work. In the current kernel,
memblock allocates the following memory before SRAT is parsed:
setup_arch()
|->memblock_x86_fill() /* memblock is ready */
|......
|->early_reserve_e820_mpc_new() /* allocate memory under 1MB */
|->reserve_real_mode() /* allocate memory under 1MB */
|->init_mem_mapping() /* allocate page tables, about 2MB to map 1GB memory */
|->dma_contiguous_reserve() /* specified by user, should be low */
|->setup_log_buf() /* specified by user, several mega bytes */
|->relocate_initrd() /* could be large, but will be freed after boot, should reorder */
|->acpi_initrd_override() /* several mega bytes */
|->reserve_crashkernel() /* could be large, should reorder */
|......
|->initmem_init() /* Parse SRAT */
According to Tejun's advice, before SRAT is parsed, we should try our best
to allocate memory near the kernel image. Since the whole node the kernel
resides in won't be hotpluggable, and for a modern server, a node may have
at least 16GB memory, allocating several mega bytes memory around the
kernel image won't cross to hotpluggable memory.
[About this patchset]
So this patchset is the preparation for the problem 2 that we want to
solve. It does the following:
1. Make memblock be able to allocate memory bottom up.
1) Keep all the memblock APIs' prototype unmodified.
2) When the direction is bottom up, keep the start address greater than the
end of kernel image.
2. Improve init_mem_mapping() to support allocate page tables in
bottom up direction.
3. Introduce "movable_node" boot option to enable and disable this
functionality.
This patch (of 6):
Create a new function __memblock_find_range_top_down to factor out of
top-down allocation from memblock_find_in_range_node. This is a
preparation because we will introduce a new bottom-up allocation mode in
the following patch.
Signed-off-by: Tang Chen <tangchen@cn.fujitsu.com>
Signed-off-by: Zhang Yanfei <zhangyanfei@cn.fujitsu.com>
Acked-by: Tejun Heo <tj@kernel.org>
Acked-by: Toshi Kani <toshi.kani@hp.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Wanpeng Li <liwanp@linux.vnet.ibm.com>
Cc: Thomas Renninger <trenn@suse.de>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Jiang Liu <jiang.liu@huawei.com>
Cc: Wen Congyang <wency@cn.fujitsu.com>
Cc: Lai Jiangshan <laijs@cn.fujitsu.com>
Cc: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
Cc: Taku Izumi <izumi.taku@jp.fujitsu.com>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Michal Nazarewicz <mina86@mina86.com>
Cc: Minchan Kim <minchan@kernel.org>
Cc: Rik van Riel <riel@redhat.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Kamezawa Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2013-11-12 23:07:57 +00:00
|
|
|
/* pump up @end */
|
mm/memblock.c: skip kmemleak for kasan_init()
Kmemleak does not play well with KASAN (tested on both HPE Apollo 70 and
Huawei TaiShan 2280 aarch64 servers).
After calling start_kernel()->setup_arch()->kasan_init(), kmemleak early
log buffer went from something like 280 to 260000 which caused kmemleak
disabled and crash dump memory reservation failed. The multitude of
kmemleak_alloc() calls is from nested loops while KASAN is setting up full
memory mappings, so let early kmemleak allocations skip those
memblock_alloc_internal() calls came from kasan_init() given that those
early KASAN memory mappings should not reference to other memory. Hence,
no kmemleak false positives.
kasan_init
kasan_map_populate [1]
kasan_pgd_populate [2]
kasan_pud_populate [3]
kasan_pmd_populate [4]
kasan_pte_populate [5]
kasan_alloc_zeroed_page
memblock_alloc_try_nid
memblock_alloc_internal
kmemleak_alloc
[1] for_each_memblock(memory, reg)
[2] while (pgdp++, addr = next, addr != end)
[3] while (pudp++, addr = next, addr != end && pud_none(READ_ONCE(*pudp)))
[4] while (pmdp++, addr = next, addr != end && pmd_none(READ_ONCE(*pmdp)))
[5] while (ptep++, addr = next, addr != end && pte_none(READ_ONCE(*ptep)))
Link: http://lkml.kernel.org/r/1543442925-17794-1-git-send-email-cai@gmx.us
Signed-off-by: Qian Cai <cai@gmx.us>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Mike Rapoport <rppt@linux.vnet.ibm.com>
Cc: Alexander Potapenko <glider@google.com>
Cc: Dmitry Vyukov <dvyukov@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2018-12-28 08:36:29 +00:00
|
|
|
if (end == MEMBLOCK_ALLOC_ACCESSIBLE ||
|
|
|
|
end == MEMBLOCK_ALLOC_KASAN)
|
mm/memblock.c: factor out of top-down allocation
[Problem]
The current Linux cannot migrate pages used by the kernel because of the
kernel direct mapping. In Linux kernel space, va = pa + PAGE_OFFSET.
When the pa is changed, we cannot simply update the pagetable and keep the
va unmodified. So the kernel pages are not migratable.
There are also some other issues will cause the kernel pages not
migratable. For example, the physical address may be cached somewhere and
will be used. It is not to update all the caches.
When doing memory hotplug in Linux, we first migrate all the pages in one
memory device somewhere else, and then remove the device. But if pages
are used by the kernel, they are not migratable. As a result, memory used
by the kernel cannot be hot-removed.
Modifying the kernel direct mapping mechanism is too difficult to do. And
it may cause the kernel performance down and unstable. So we use the
following way to do memory hotplug.
[What we are doing]
In Linux, memory in one numa node is divided into several zones. One of
the zones is ZONE_MOVABLE, which the kernel won't use.
In order to implement memory hotplug in Linux, we are going to arrange all
hotpluggable memory in ZONE_MOVABLE so that the kernel won't use these
memory. To do this, we need ACPI's help.
In ACPI, SRAT(System Resource Affinity Table) contains NUMA info. The
memory affinities in SRAT record every memory range in the system, and
also, flags specifying if the memory range is hotpluggable. (Please refer
to ACPI spec 5.0 5.2.16)
With the help of SRAT, we have to do the following two things to achieve our
goal:
1. When doing memory hot-add, allow the users arranging hotpluggable as
ZONE_MOVABLE.
(This has been done by the MOVABLE_NODE functionality in Linux.)
2. when the system is booting, prevent bootmem allocator from allocating
hotpluggable memory for the kernel before the memory initialization
finishes.
The problem 2 is the key problem we are going to solve. But before solving it,
we need some preparation. Please see below.
[Preparation]
Bootloader has to load the kernel image into memory. And this memory must
be unhotpluggable. We cannot prevent this anyway. So in a memory hotplug
system, we can assume any node the kernel resides in is not hotpluggable.
Before SRAT is parsed, we don't know which memory ranges are hotpluggable.
But memblock has already started to work. In the current kernel,
memblock allocates the following memory before SRAT is parsed:
setup_arch()
|->memblock_x86_fill() /* memblock is ready */
|......
|->early_reserve_e820_mpc_new() /* allocate memory under 1MB */
|->reserve_real_mode() /* allocate memory under 1MB */
|->init_mem_mapping() /* allocate page tables, about 2MB to map 1GB memory */
|->dma_contiguous_reserve() /* specified by user, should be low */
|->setup_log_buf() /* specified by user, several mega bytes */
|->relocate_initrd() /* could be large, but will be freed after boot, should reorder */
|->acpi_initrd_override() /* several mega bytes */
|->reserve_crashkernel() /* could be large, should reorder */
|......
|->initmem_init() /* Parse SRAT */
According to Tejun's advice, before SRAT is parsed, we should try our best
to allocate memory near the kernel image. Since the whole node the kernel
resides in won't be hotpluggable, and for a modern server, a node may have
at least 16GB memory, allocating several mega bytes memory around the
kernel image won't cross to hotpluggable memory.
[About this patchset]
So this patchset is the preparation for the problem 2 that we want to
solve. It does the following:
1. Make memblock be able to allocate memory bottom up.
1) Keep all the memblock APIs' prototype unmodified.
2) When the direction is bottom up, keep the start address greater than the
end of kernel image.
2. Improve init_mem_mapping() to support allocate page tables in
bottom up direction.
3. Introduce "movable_node" boot option to enable and disable this
functionality.
This patch (of 6):
Create a new function __memblock_find_range_top_down to factor out of
top-down allocation from memblock_find_in_range_node. This is a
preparation because we will introduce a new bottom-up allocation mode in
the following patch.
Signed-off-by: Tang Chen <tangchen@cn.fujitsu.com>
Signed-off-by: Zhang Yanfei <zhangyanfei@cn.fujitsu.com>
Acked-by: Tejun Heo <tj@kernel.org>
Acked-by: Toshi Kani <toshi.kani@hp.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Wanpeng Li <liwanp@linux.vnet.ibm.com>
Cc: Thomas Renninger <trenn@suse.de>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Jiang Liu <jiang.liu@huawei.com>
Cc: Wen Congyang <wency@cn.fujitsu.com>
Cc: Lai Jiangshan <laijs@cn.fujitsu.com>
Cc: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
Cc: Taku Izumi <izumi.taku@jp.fujitsu.com>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Michal Nazarewicz <mina86@mina86.com>
Cc: Minchan Kim <minchan@kernel.org>
Cc: Rik van Riel <riel@redhat.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Kamezawa Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2013-11-12 23:07:57 +00:00
|
|
|
end = memblock.current_limit;
|
|
|
|
|
|
|
|
/* avoid allocating the first page */
|
|
|
|
start = max_t(phys_addr_t, start, PAGE_SIZE);
|
|
|
|
end = max(start, end);
|
2013-11-12 23:07:59 +00:00
|
|
|
kernel_end = __pa_symbol(_end);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* try bottom-up allocation only when bottom-up mode
|
|
|
|
* is set and @end is above the kernel image.
|
|
|
|
*/
|
|
|
|
if (memblock_bottom_up() && end > kernel_end) {
|
|
|
|
phys_addr_t bottom_up_start;
|
|
|
|
|
|
|
|
/* make sure we will allocate above the kernel */
|
|
|
|
bottom_up_start = max(start, kernel_end);
|
|
|
|
|
|
|
|
/* ok, try bottom-up allocation first */
|
|
|
|
ret = __memblock_find_range_bottom_up(bottom_up_start, end,
|
2015-06-24 23:58:09 +00:00
|
|
|
size, align, nid, flags);
|
2013-11-12 23:07:59 +00:00
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* we always limit bottom-up allocation above the kernel,
|
|
|
|
* but top-down allocation doesn't have the limit, so
|
|
|
|
* retrying top-down allocation may succeed when bottom-up
|
|
|
|
* allocation failed.
|
|
|
|
*
|
|
|
|
* bottom-up allocation is expected to be fail very rarely,
|
|
|
|
* so we use WARN_ONCE() here to see the stack trace if
|
|
|
|
* fail happens.
|
|
|
|
*/
|
2018-07-13 23:59:16 +00:00
|
|
|
WARN_ONCE(IS_ENABLED(CONFIG_MEMORY_HOTREMOVE),
|
|
|
|
"memblock: bottom-up allocation failed, memory hotremove may be affected\n");
|
2013-11-12 23:07:59 +00:00
|
|
|
}
|
mm/memblock.c: factor out of top-down allocation
[Problem]
The current Linux cannot migrate pages used by the kernel because of the
kernel direct mapping. In Linux kernel space, va = pa + PAGE_OFFSET.
When the pa is changed, we cannot simply update the pagetable and keep the
va unmodified. So the kernel pages are not migratable.
There are also some other issues will cause the kernel pages not
migratable. For example, the physical address may be cached somewhere and
will be used. It is not to update all the caches.
When doing memory hotplug in Linux, we first migrate all the pages in one
memory device somewhere else, and then remove the device. But if pages
are used by the kernel, they are not migratable. As a result, memory used
by the kernel cannot be hot-removed.
Modifying the kernel direct mapping mechanism is too difficult to do. And
it may cause the kernel performance down and unstable. So we use the
following way to do memory hotplug.
[What we are doing]
In Linux, memory in one numa node is divided into several zones. One of
the zones is ZONE_MOVABLE, which the kernel won't use.
In order to implement memory hotplug in Linux, we are going to arrange all
hotpluggable memory in ZONE_MOVABLE so that the kernel won't use these
memory. To do this, we need ACPI's help.
In ACPI, SRAT(System Resource Affinity Table) contains NUMA info. The
memory affinities in SRAT record every memory range in the system, and
also, flags specifying if the memory range is hotpluggable. (Please refer
to ACPI spec 5.0 5.2.16)
With the help of SRAT, we have to do the following two things to achieve our
goal:
1. When doing memory hot-add, allow the users arranging hotpluggable as
ZONE_MOVABLE.
(This has been done by the MOVABLE_NODE functionality in Linux.)
2. when the system is booting, prevent bootmem allocator from allocating
hotpluggable memory for the kernel before the memory initialization
finishes.
The problem 2 is the key problem we are going to solve. But before solving it,
we need some preparation. Please see below.
[Preparation]
Bootloader has to load the kernel image into memory. And this memory must
be unhotpluggable. We cannot prevent this anyway. So in a memory hotplug
system, we can assume any node the kernel resides in is not hotpluggable.
Before SRAT is parsed, we don't know which memory ranges are hotpluggable.
But memblock has already started to work. In the current kernel,
memblock allocates the following memory before SRAT is parsed:
setup_arch()
|->memblock_x86_fill() /* memblock is ready */
|......
|->early_reserve_e820_mpc_new() /* allocate memory under 1MB */
|->reserve_real_mode() /* allocate memory under 1MB */
|->init_mem_mapping() /* allocate page tables, about 2MB to map 1GB memory */
|->dma_contiguous_reserve() /* specified by user, should be low */
|->setup_log_buf() /* specified by user, several mega bytes */
|->relocate_initrd() /* could be large, but will be freed after boot, should reorder */
|->acpi_initrd_override() /* several mega bytes */
|->reserve_crashkernel() /* could be large, should reorder */
|......
|->initmem_init() /* Parse SRAT */
According to Tejun's advice, before SRAT is parsed, we should try our best
to allocate memory near the kernel image. Since the whole node the kernel
resides in won't be hotpluggable, and for a modern server, a node may have
at least 16GB memory, allocating several mega bytes memory around the
kernel image won't cross to hotpluggable memory.
[About this patchset]
So this patchset is the preparation for the problem 2 that we want to
solve. It does the following:
1. Make memblock be able to allocate memory bottom up.
1) Keep all the memblock APIs' prototype unmodified.
2) When the direction is bottom up, keep the start address greater than the
end of kernel image.
2. Improve init_mem_mapping() to support allocate page tables in
bottom up direction.
3. Introduce "movable_node" boot option to enable and disable this
functionality.
This patch (of 6):
Create a new function __memblock_find_range_top_down to factor out of
top-down allocation from memblock_find_in_range_node. This is a
preparation because we will introduce a new bottom-up allocation mode in
the following patch.
Signed-off-by: Tang Chen <tangchen@cn.fujitsu.com>
Signed-off-by: Zhang Yanfei <zhangyanfei@cn.fujitsu.com>
Acked-by: Tejun Heo <tj@kernel.org>
Acked-by: Toshi Kani <toshi.kani@hp.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Wanpeng Li <liwanp@linux.vnet.ibm.com>
Cc: Thomas Renninger <trenn@suse.de>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Jiang Liu <jiang.liu@huawei.com>
Cc: Wen Congyang <wency@cn.fujitsu.com>
Cc: Lai Jiangshan <laijs@cn.fujitsu.com>
Cc: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
Cc: Taku Izumi <izumi.taku@jp.fujitsu.com>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Michal Nazarewicz <mina86@mina86.com>
Cc: Minchan Kim <minchan@kernel.org>
Cc: Rik van Riel <riel@redhat.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Kamezawa Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2013-11-12 23:07:57 +00:00
|
|
|
|
2015-06-24 23:58:09 +00:00
|
|
|
return __memblock_find_range_top_down(start, end, size, align, nid,
|
|
|
|
flags);
|
mm/memblock.c: factor out of top-down allocation
[Problem]
The current Linux cannot migrate pages used by the kernel because of the
kernel direct mapping. In Linux kernel space, va = pa + PAGE_OFFSET.
When the pa is changed, we cannot simply update the pagetable and keep the
va unmodified. So the kernel pages are not migratable.
There are also some other issues will cause the kernel pages not
migratable. For example, the physical address may be cached somewhere and
will be used. It is not to update all the caches.
When doing memory hotplug in Linux, we first migrate all the pages in one
memory device somewhere else, and then remove the device. But if pages
are used by the kernel, they are not migratable. As a result, memory used
by the kernel cannot be hot-removed.
Modifying the kernel direct mapping mechanism is too difficult to do. And
it may cause the kernel performance down and unstable. So we use the
following way to do memory hotplug.
[What we are doing]
In Linux, memory in one numa node is divided into several zones. One of
the zones is ZONE_MOVABLE, which the kernel won't use.
In order to implement memory hotplug in Linux, we are going to arrange all
hotpluggable memory in ZONE_MOVABLE so that the kernel won't use these
memory. To do this, we need ACPI's help.
In ACPI, SRAT(System Resource Affinity Table) contains NUMA info. The
memory affinities in SRAT record every memory range in the system, and
also, flags specifying if the memory range is hotpluggable. (Please refer
to ACPI spec 5.0 5.2.16)
With the help of SRAT, we have to do the following two things to achieve our
goal:
1. When doing memory hot-add, allow the users arranging hotpluggable as
ZONE_MOVABLE.
(This has been done by the MOVABLE_NODE functionality in Linux.)
2. when the system is booting, prevent bootmem allocator from allocating
hotpluggable memory for the kernel before the memory initialization
finishes.
The problem 2 is the key problem we are going to solve. But before solving it,
we need some preparation. Please see below.
[Preparation]
Bootloader has to load the kernel image into memory. And this memory must
be unhotpluggable. We cannot prevent this anyway. So in a memory hotplug
system, we can assume any node the kernel resides in is not hotpluggable.
Before SRAT is parsed, we don't know which memory ranges are hotpluggable.
But memblock has already started to work. In the current kernel,
memblock allocates the following memory before SRAT is parsed:
setup_arch()
|->memblock_x86_fill() /* memblock is ready */
|......
|->early_reserve_e820_mpc_new() /* allocate memory under 1MB */
|->reserve_real_mode() /* allocate memory under 1MB */
|->init_mem_mapping() /* allocate page tables, about 2MB to map 1GB memory */
|->dma_contiguous_reserve() /* specified by user, should be low */
|->setup_log_buf() /* specified by user, several mega bytes */
|->relocate_initrd() /* could be large, but will be freed after boot, should reorder */
|->acpi_initrd_override() /* several mega bytes */
|->reserve_crashkernel() /* could be large, should reorder */
|......
|->initmem_init() /* Parse SRAT */
According to Tejun's advice, before SRAT is parsed, we should try our best
to allocate memory near the kernel image. Since the whole node the kernel
resides in won't be hotpluggable, and for a modern server, a node may have
at least 16GB memory, allocating several mega bytes memory around the
kernel image won't cross to hotpluggable memory.
[About this patchset]
So this patchset is the preparation for the problem 2 that we want to
solve. It does the following:
1. Make memblock be able to allocate memory bottom up.
1) Keep all the memblock APIs' prototype unmodified.
2) When the direction is bottom up, keep the start address greater than the
end of kernel image.
2. Improve init_mem_mapping() to support allocate page tables in
bottom up direction.
3. Introduce "movable_node" boot option to enable and disable this
functionality.
This patch (of 6):
Create a new function __memblock_find_range_top_down to factor out of
top-down allocation from memblock_find_in_range_node. This is a
preparation because we will introduce a new bottom-up allocation mode in
the following patch.
Signed-off-by: Tang Chen <tangchen@cn.fujitsu.com>
Signed-off-by: Zhang Yanfei <zhangyanfei@cn.fujitsu.com>
Acked-by: Tejun Heo <tj@kernel.org>
Acked-by: Toshi Kani <toshi.kani@hp.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Wanpeng Li <liwanp@linux.vnet.ibm.com>
Cc: Thomas Renninger <trenn@suse.de>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Jiang Liu <jiang.liu@huawei.com>
Cc: Wen Congyang <wency@cn.fujitsu.com>
Cc: Lai Jiangshan <laijs@cn.fujitsu.com>
Cc: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
Cc: Taku Izumi <izumi.taku@jp.fujitsu.com>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Michal Nazarewicz <mina86@mina86.com>
Cc: Minchan Kim <minchan@kernel.org>
Cc: Rik van Riel <riel@redhat.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Kamezawa Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2013-11-12 23:07:57 +00:00
|
|
|
}
|
|
|
|
|
2011-12-08 18:22:09 +00:00
|
|
|
/**
|
|
|
|
* memblock_find_in_range - find free area in given range
|
|
|
|
* @start: start of candidate range
|
2018-06-30 14:55:02 +00:00
|
|
|
* @end: end of candidate range, can be %MEMBLOCK_ALLOC_ANYWHERE or
|
|
|
|
* %MEMBLOCK_ALLOC_ACCESSIBLE
|
2011-12-08 18:22:09 +00:00
|
|
|
* @size: size of free area to find
|
|
|
|
* @align: alignment of free area to find
|
|
|
|
*
|
|
|
|
* Find @size free area aligned to @align in the specified range.
|
|
|
|
*
|
2018-06-30 14:55:02 +00:00
|
|
|
* Return:
|
2013-11-12 23:07:59 +00:00
|
|
|
* Found address on success, 0 on failure.
|
2011-07-12 07:58:10 +00:00
|
|
|
*/
|
2011-12-08 18:22:09 +00:00
|
|
|
phys_addr_t __init_memblock memblock_find_in_range(phys_addr_t start,
|
|
|
|
phys_addr_t end, phys_addr_t size,
|
|
|
|
phys_addr_t align)
|
2010-07-12 04:36:48 +00:00
|
|
|
{
|
2015-06-24 23:58:12 +00:00
|
|
|
phys_addr_t ret;
|
2018-06-30 14:55:01 +00:00
|
|
|
enum memblock_flags flags = choose_memblock_flags();
|
2015-06-24 23:58:12 +00:00
|
|
|
|
|
|
|
again:
|
|
|
|
ret = memblock_find_in_range_node(size, align, start, end,
|
|
|
|
NUMA_NO_NODE, flags);
|
|
|
|
|
|
|
|
if (!ret && (flags & MEMBLOCK_MIRROR)) {
|
|
|
|
pr_warn("Could not allocate %pap bytes of mirrored memory\n",
|
|
|
|
&size);
|
|
|
|
flags &= ~MEMBLOCK_MIRROR;
|
|
|
|
goto again;
|
|
|
|
}
|
|
|
|
|
|
|
|
return ret;
|
2010-07-12 04:36:48 +00:00
|
|
|
}
|
|
|
|
|
2010-07-28 05:43:02 +00:00
|
|
|
static void __init_memblock memblock_remove_region(struct memblock_type *type, unsigned long r)
|
2010-07-12 04:36:09 +00:00
|
|
|
{
|
2011-12-08 18:22:08 +00:00
|
|
|
type->total_size -= type->regions[r].size;
|
2011-07-14 09:43:42 +00:00
|
|
|
memmove(&type->regions[r], &type->regions[r + 1],
|
|
|
|
(type->cnt - (r + 1)) * sizeof(type->regions[r]));
|
2010-08-04 04:06:41 +00:00
|
|
|
type->cnt--;
|
2010-07-12 04:36:09 +00:00
|
|
|
|
mm/memblock: properly handle overlaps and fix error path
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 <benh@kernel.crashing.org>
Acked-by: Yinghai Lu <yinghai@kernel.org>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-03-22 23:33:43 +00:00
|
|
|
/* Special case for empty arrays */
|
|
|
|
if (type->cnt == 0) {
|
2011-12-08 18:22:08 +00:00
|
|
|
WARN_ON(type->total_size != 0);
|
mm/memblock: properly handle overlaps and fix error path
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 <benh@kernel.crashing.org>
Acked-by: Yinghai Lu <yinghai@kernel.org>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-03-22 23:33:43 +00:00
|
|
|
type->cnt = 1;
|
|
|
|
type->regions[0].base = 0;
|
|
|
|
type->regions[0].size = 0;
|
2014-01-21 23:49:20 +00:00
|
|
|
type->regions[0].flags = 0;
|
2011-07-14 09:43:42 +00:00
|
|
|
memblock_set_region_node(&type->regions[0], MAX_NUMNODES);
|
mm/memblock: properly handle overlaps and fix error path
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 <benh@kernel.crashing.org>
Acked-by: Yinghai Lu <yinghai@kernel.org>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-03-22 23:33:43 +00:00
|
|
|
}
|
2010-07-12 04:36:09 +00:00
|
|
|
}
|
|
|
|
|
2014-01-23 23:53:24 +00:00
|
|
|
#ifdef CONFIG_ARCH_DISCARD_MEMBLOCK
|
2017-08-18 22:16:05 +00:00
|
|
|
/**
|
2018-06-30 14:55:02 +00:00
|
|
|
* memblock_discard - discard memory and reserved arrays if they were allocated
|
2017-08-18 22:16:05 +00:00
|
|
|
*/
|
|
|
|
void __init memblock_discard(void)
|
2014-01-23 23:53:11 +00:00
|
|
|
{
|
2017-08-18 22:16:05 +00:00
|
|
|
phys_addr_t addr, size;
|
2014-01-23 23:53:11 +00:00
|
|
|
|
2017-08-18 22:16:05 +00:00
|
|
|
if (memblock.reserved.regions != memblock_reserved_init_regions) {
|
|
|
|
addr = __pa(memblock.reserved.regions);
|
|
|
|
size = PAGE_ALIGN(sizeof(struct memblock_region) *
|
|
|
|
memblock.reserved.max);
|
|
|
|
__memblock_free_late(addr, size);
|
|
|
|
}
|
2014-01-23 23:53:11 +00:00
|
|
|
|
2017-08-25 22:55:46 +00:00
|
|
|
if (memblock.memory.regions != memblock_memory_init_regions) {
|
2017-08-18 22:16:05 +00:00
|
|
|
addr = __pa(memblock.memory.regions);
|
|
|
|
size = PAGE_ALIGN(sizeof(struct memblock_region) *
|
|
|
|
memblock.memory.max);
|
|
|
|
__memblock_free_late(addr, size);
|
|
|
|
}
|
2014-01-23 23:53:11 +00:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2012-06-20 19:53:05 +00:00
|
|
|
/**
|
|
|
|
* memblock_double_array - double the size of the memblock regions array
|
|
|
|
* @type: memblock type of the regions array being doubled
|
|
|
|
* @new_area_start: starting address of memory range to avoid overlap with
|
|
|
|
* @new_area_size: size of memory range to avoid overlap with
|
|
|
|
*
|
|
|
|
* Double the size of the @type regions array. If memblock is being used to
|
|
|
|
* allocate memory for a new reserved regions array and there is a previously
|
2018-06-30 14:55:02 +00:00
|
|
|
* allocated memory range [@new_area_start, @new_area_start + @new_area_size]
|
2012-06-20 19:53:05 +00:00
|
|
|
* waiting to be reserved, ensure the memory used by the new array does
|
|
|
|
* not overlap.
|
|
|
|
*
|
2018-06-30 14:55:02 +00:00
|
|
|
* Return:
|
2012-06-20 19:53:05 +00:00
|
|
|
* 0 on success, -1 on failure.
|
|
|
|
*/
|
|
|
|
static int __init_memblock memblock_double_array(struct memblock_type *type,
|
|
|
|
phys_addr_t new_area_start,
|
|
|
|
phys_addr_t new_area_size)
|
2010-07-06 22:39:13 +00:00
|
|
|
{
|
|
|
|
struct memblock_region *new_array, *old_array;
|
2012-07-11 21:02:56 +00:00
|
|
|
phys_addr_t old_alloc_size, new_alloc_size;
|
2018-08-17 22:47:17 +00:00
|
|
|
phys_addr_t old_size, new_size, addr, new_end;
|
2010-07-06 22:39:13 +00:00
|
|
|
int use_slab = slab_is_available();
|
2012-05-29 22:06:50 +00:00
|
|
|
int *in_slab;
|
2010-07-06 22:39:13 +00:00
|
|
|
|
|
|
|
/* We don't allow resizing until we know about the reserved regions
|
|
|
|
* of memory that aren't suitable for allocation
|
|
|
|
*/
|
|
|
|
if (!memblock_can_resize)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
/* Calculate new doubled size */
|
|
|
|
old_size = type->max * sizeof(struct memblock_region);
|
|
|
|
new_size = old_size << 1;
|
2012-07-11 21:02:56 +00:00
|
|
|
/*
|
|
|
|
* We need to allocated new one align to PAGE_SIZE,
|
|
|
|
* so we can free them completely later.
|
|
|
|
*/
|
|
|
|
old_alloc_size = PAGE_ALIGN(old_size);
|
|
|
|
new_alloc_size = PAGE_ALIGN(new_size);
|
2010-07-06 22:39:13 +00:00
|
|
|
|
2012-05-29 22:06:50 +00:00
|
|
|
/* Retrieve the slab flag */
|
|
|
|
if (type == &memblock.memory)
|
|
|
|
in_slab = &memblock_memory_in_slab;
|
|
|
|
else
|
|
|
|
in_slab = &memblock_reserved_in_slab;
|
|
|
|
|
2010-07-06 22:39:13 +00:00
|
|
|
/* Try to find some space for it.
|
|
|
|
*
|
|
|
|
* WARNING: We assume that either slab_is_available() and we use it or
|
2012-07-31 23:42:40 +00:00
|
|
|
* we use MEMBLOCK for allocations. That means that this is unsafe to
|
|
|
|
* use when bootmem is currently active (unless bootmem itself is
|
|
|
|
* implemented on top of MEMBLOCK which isn't the case yet)
|
2010-07-06 22:39:13 +00:00
|
|
|
*
|
|
|
|
* This should however not be an issue for now, as we currently only
|
2012-07-31 23:42:40 +00:00
|
|
|
* call into MEMBLOCK while it's still active, or much later when slab
|
|
|
|
* is active for memory hotplug operations
|
2010-07-06 22:39:13 +00:00
|
|
|
*/
|
|
|
|
if (use_slab) {
|
|
|
|
new_array = kmalloc(new_size, GFP_KERNEL);
|
2011-07-12 07:58:09 +00:00
|
|
|
addr = new_array ? __pa(new_array) : 0;
|
2012-05-29 22:06:50 +00:00
|
|
|
} else {
|
2012-06-20 19:53:05 +00:00
|
|
|
/* only exclude range when trying to double reserved.regions */
|
|
|
|
if (type != &memblock.reserved)
|
|
|
|
new_area_start = new_area_size = 0;
|
|
|
|
|
|
|
|
addr = memblock_find_in_range(new_area_start + new_area_size,
|
|
|
|
memblock.current_limit,
|
2012-07-11 21:02:56 +00:00
|
|
|
new_alloc_size, PAGE_SIZE);
|
2012-06-20 19:53:05 +00:00
|
|
|
if (!addr && new_area_size)
|
|
|
|
addr = memblock_find_in_range(0,
|
2012-07-31 23:42:40 +00:00
|
|
|
min(new_area_start, memblock.current_limit),
|
|
|
|
new_alloc_size, PAGE_SIZE);
|
2012-06-20 19:53:05 +00:00
|
|
|
|
2012-09-04 08:25:05 +00:00
|
|
|
new_array = addr ? __va(addr) : NULL;
|
2012-05-29 22:06:50 +00:00
|
|
|
}
|
2011-07-12 07:58:09 +00:00
|
|
|
if (!addr) {
|
2010-07-06 22:39:13 +00:00
|
|
|
pr_err("memblock: Failed to double %s array from %ld to %ld entries !\n",
|
2017-02-24 22:55:59 +00:00
|
|
|
type->name, type->max, type->max * 2);
|
2010-07-06 22:39:13 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2018-08-17 22:47:17 +00:00
|
|
|
new_end = addr + new_size - 1;
|
|
|
|
memblock_dbg("memblock: %s is doubled to %ld at [%pa-%pa]",
|
|
|
|
type->name, type->max * 2, &addr, &new_end);
|
2010-07-28 05:13:22 +00:00
|
|
|
|
2012-07-31 23:42:40 +00:00
|
|
|
/*
|
|
|
|
* Found space, we now need to move the array over before we add the
|
|
|
|
* reserved region since it may be our reserved array itself that is
|
|
|
|
* full.
|
2010-07-06 22:39:13 +00:00
|
|
|
*/
|
|
|
|
memcpy(new_array, type->regions, old_size);
|
|
|
|
memset(new_array + type->max, 0, old_size);
|
|
|
|
old_array = type->regions;
|
|
|
|
type->regions = new_array;
|
|
|
|
type->max <<= 1;
|
|
|
|
|
2012-07-31 23:42:40 +00:00
|
|
|
/* Free old array. We needn't free it if the array is the static one */
|
2012-05-29 22:06:50 +00:00
|
|
|
if (*in_slab)
|
|
|
|
kfree(old_array);
|
|
|
|
else if (old_array != memblock_memory_init_regions &&
|
|
|
|
old_array != memblock_reserved_init_regions)
|
2012-07-11 21:02:56 +00:00
|
|
|
memblock_free(__pa(old_array), old_alloc_size);
|
2010-07-06 22:39:13 +00:00
|
|
|
|
2012-07-31 23:42:40 +00:00
|
|
|
/*
|
|
|
|
* Reserve the new array if that comes from the memblock. Otherwise, we
|
|
|
|
* needn't do it
|
2012-05-29 22:06:50 +00:00
|
|
|
*/
|
|
|
|
if (!use_slab)
|
2012-07-11 21:02:56 +00:00
|
|
|
BUG_ON(memblock_reserve(addr, new_alloc_size));
|
2012-05-29 22:06:50 +00:00
|
|
|
|
|
|
|
/* Update slab flag */
|
|
|
|
*in_slab = use_slab;
|
|
|
|
|
2010-07-06 22:39:13 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2011-07-12 09:15:55 +00:00
|
|
|
/**
|
|
|
|
* memblock_merge_regions - merge neighboring compatible regions
|
|
|
|
* @type: memblock type to scan
|
|
|
|
*
|
|
|
|
* Scan @type and merge neighboring compatible regions.
|
|
|
|
*/
|
|
|
|
static void __init_memblock memblock_merge_regions(struct memblock_type *type)
|
2010-07-12 04:36:09 +00:00
|
|
|
{
|
2011-07-12 09:15:55 +00:00
|
|
|
int i = 0;
|
2010-07-12 04:36:09 +00:00
|
|
|
|
2011-07-12 09:15:55 +00:00
|
|
|
/* cnt never goes below 1 */
|
|
|
|
while (i < type->cnt - 1) {
|
|
|
|
struct memblock_region *this = &type->regions[i];
|
|
|
|
struct memblock_region *next = &type->regions[i + 1];
|
2010-07-12 04:36:09 +00:00
|
|
|
|
2011-07-14 09:43:42 +00:00
|
|
|
if (this->base + this->size != next->base ||
|
|
|
|
memblock_get_region_node(this) !=
|
2014-01-21 23:49:20 +00:00
|
|
|
memblock_get_region_node(next) ||
|
|
|
|
this->flags != next->flags) {
|
2011-07-12 09:15:55 +00:00
|
|
|
BUG_ON(this->base + this->size > next->base);
|
|
|
|
i++;
|
|
|
|
continue;
|
mm/memblock: properly handle overlaps and fix error path
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 <benh@kernel.crashing.org>
Acked-by: Yinghai Lu <yinghai@kernel.org>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-03-22 23:33:43 +00:00
|
|
|
}
|
|
|
|
|
2011-07-12 09:15:55 +00:00
|
|
|
this->size += next->size;
|
2013-01-11 22:31:44 +00:00
|
|
|
/* move forward from next + 1, index of which is i + 2 */
|
|
|
|
memmove(next, next + 1, (type->cnt - (i + 2)) * sizeof(*next));
|
2011-07-12 09:15:55 +00:00
|
|
|
type->cnt--;
|
2010-07-12 04:36:09 +00:00
|
|
|
}
|
2011-07-12 09:15:55 +00:00
|
|
|
}
|
2010-07-12 04:36:09 +00:00
|
|
|
|
2011-07-12 09:15:55 +00:00
|
|
|
/**
|
|
|
|
* memblock_insert_region - insert new memblock region
|
2013-04-29 22:08:41 +00:00
|
|
|
* @type: memblock type to insert into
|
|
|
|
* @idx: index for the insertion point
|
|
|
|
* @base: base address of the new region
|
|
|
|
* @size: size of the new region
|
|
|
|
* @nid: node id of the new region
|
2014-01-21 23:49:20 +00:00
|
|
|
* @flags: flags of the new region
|
2011-07-12 09:15:55 +00:00
|
|
|
*
|
2018-06-30 14:55:02 +00:00
|
|
|
* Insert new memblock region [@base, @base + @size) into @type at @idx.
|
2016-08-04 22:31:46 +00:00
|
|
|
* @type must already have extra room to accommodate the new region.
|
2011-07-12 09:15:55 +00:00
|
|
|
*/
|
|
|
|
static void __init_memblock memblock_insert_region(struct memblock_type *type,
|
|
|
|
int idx, phys_addr_t base,
|
2014-01-21 23:49:20 +00:00
|
|
|
phys_addr_t size,
|
2018-06-30 14:55:01 +00:00
|
|
|
int nid,
|
|
|
|
enum memblock_flags flags)
|
2011-07-12 09:15:55 +00:00
|
|
|
{
|
|
|
|
struct memblock_region *rgn = &type->regions[idx];
|
|
|
|
|
|
|
|
BUG_ON(type->cnt >= type->max);
|
|
|
|
memmove(rgn + 1, rgn, (type->cnt - idx) * sizeof(*rgn));
|
|
|
|
rgn->base = base;
|
|
|
|
rgn->size = size;
|
2014-01-21 23:49:20 +00:00
|
|
|
rgn->flags = flags;
|
2011-07-14 09:43:42 +00:00
|
|
|
memblock_set_region_node(rgn, nid);
|
2011-07-12 09:15:55 +00:00
|
|
|
type->cnt++;
|
2011-12-08 18:22:08 +00:00
|
|
|
type->total_size += size;
|
2011-07-12 09:15:55 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2014-01-29 17:16:01 +00:00
|
|
|
* memblock_add_range - add new memblock region
|
2011-07-12 09:15:55 +00:00
|
|
|
* @type: memblock type to add new region into
|
|
|
|
* @base: base address of the new region
|
|
|
|
* @size: size of the new region
|
2011-12-08 18:22:08 +00:00
|
|
|
* @nid: nid of the new region
|
2014-01-21 23:49:20 +00:00
|
|
|
* @flags: flags of the new region
|
2011-07-12 09:15:55 +00:00
|
|
|
*
|
2018-06-30 14:55:02 +00:00
|
|
|
* Add new memblock region [@base, @base + @size) into @type. The new region
|
2011-07-12 09:15:55 +00:00
|
|
|
* is allowed to overlap with existing ones - overlaps don't affect already
|
|
|
|
* existing regions. @type is guaranteed to be minimal (all neighbouring
|
|
|
|
* compatible regions are merged) after the addition.
|
|
|
|
*
|
2018-06-30 14:55:02 +00:00
|
|
|
* Return:
|
2011-07-12 09:15:55 +00:00
|
|
|
* 0 on success, -errno on failure.
|
|
|
|
*/
|
2014-01-29 17:16:01 +00:00
|
|
|
int __init_memblock memblock_add_range(struct memblock_type *type,
|
2014-01-21 23:49:20 +00:00
|
|
|
phys_addr_t base, phys_addr_t size,
|
2018-06-30 14:55:01 +00:00
|
|
|
int nid, enum memblock_flags flags)
|
2011-07-12 09:15:55 +00:00
|
|
|
{
|
|
|
|
bool insert = false;
|
2011-12-08 18:22:07 +00:00
|
|
|
phys_addr_t obase = base;
|
|
|
|
phys_addr_t end = base + memblock_cap_size(base, &size);
|
2016-01-14 23:20:42 +00:00
|
|
|
int idx, nr_new;
|
|
|
|
struct memblock_region *rgn;
|
2011-07-12 09:15:55 +00:00
|
|
|
|
2012-04-20 15:31:34 +00:00
|
|
|
if (!size)
|
|
|
|
return 0;
|
|
|
|
|
2011-07-12 09:15:55 +00:00
|
|
|
/* special case for empty array */
|
|
|
|
if (type->regions[0].size == 0) {
|
2011-12-08 18:22:08 +00:00
|
|
|
WARN_ON(type->cnt != 1 || type->total_size);
|
mm/memblock: properly handle overlaps and fix error path
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 <benh@kernel.crashing.org>
Acked-by: Yinghai Lu <yinghai@kernel.org>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-03-22 23:33:43 +00:00
|
|
|
type->regions[0].base = base;
|
|
|
|
type->regions[0].size = size;
|
2014-01-21 23:49:20 +00:00
|
|
|
type->regions[0].flags = flags;
|
2011-12-08 18:22:08 +00:00
|
|
|
memblock_set_region_node(&type->regions[0], nid);
|
2011-12-08 18:22:08 +00:00
|
|
|
type->total_size = size;
|
mm/memblock: properly handle overlaps and fix error path
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 <benh@kernel.crashing.org>
Acked-by: Yinghai Lu <yinghai@kernel.org>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-03-22 23:33:43 +00:00
|
|
|
return 0;
|
2010-07-12 04:36:09 +00:00
|
|
|
}
|
2011-07-12 09:15:55 +00:00
|
|
|
repeat:
|
|
|
|
/*
|
|
|
|
* The following is executed twice. Once with %false @insert and
|
|
|
|
* then with %true. The first counts the number of regions needed
|
2016-08-04 22:31:46 +00:00
|
|
|
* to accommodate the new area. The second actually inserts them.
|
2010-07-06 22:39:13 +00:00
|
|
|
*/
|
2011-07-12 09:15:55 +00:00
|
|
|
base = obase;
|
|
|
|
nr_new = 0;
|
2010-07-12 04:36:09 +00:00
|
|
|
|
2017-11-16 01:33:42 +00:00
|
|
|
for_each_memblock_type(idx, type, rgn) {
|
2011-07-12 09:15:55 +00:00
|
|
|
phys_addr_t rbase = rgn->base;
|
|
|
|
phys_addr_t rend = rbase + rgn->size;
|
|
|
|
|
|
|
|
if (rbase >= end)
|
2010-07-12 04:36:09 +00:00
|
|
|
break;
|
2011-07-12 09:15:55 +00:00
|
|
|
if (rend <= base)
|
|
|
|
continue;
|
|
|
|
/*
|
|
|
|
* @rgn overlaps. If it separates the lower part of new
|
|
|
|
* area, insert that portion.
|
|
|
|
*/
|
|
|
|
if (rbase > base) {
|
2015-09-04 22:47:38 +00:00
|
|
|
#ifdef CONFIG_HAVE_MEMBLOCK_NODE_MAP
|
|
|
|
WARN_ON(nid != memblock_get_region_node(rgn));
|
|
|
|
#endif
|
2015-09-08 21:59:53 +00:00
|
|
|
WARN_ON(flags != rgn->flags);
|
2011-07-12 09:15:55 +00:00
|
|
|
nr_new++;
|
|
|
|
if (insert)
|
2016-01-14 23:20:42 +00:00
|
|
|
memblock_insert_region(type, idx++, base,
|
2014-01-21 23:49:20 +00:00
|
|
|
rbase - base, nid,
|
|
|
|
flags);
|
2010-07-12 04:36:09 +00:00
|
|
|
}
|
2011-07-12 09:15:55 +00:00
|
|
|
/* area below @rend is dealt with, forget about it */
|
|
|
|
base = min(rend, end);
|
2010-07-12 04:36:09 +00:00
|
|
|
}
|
2011-07-12 09:15:55 +00:00
|
|
|
|
|
|
|
/* insert the remaining portion */
|
|
|
|
if (base < end) {
|
|
|
|
nr_new++;
|
|
|
|
if (insert)
|
2016-01-14 23:20:42 +00:00
|
|
|
memblock_insert_region(type, idx, base, end - base,
|
2014-01-21 23:49:20 +00:00
|
|
|
nid, flags);
|
2010-07-12 04:36:09 +00:00
|
|
|
}
|
|
|
|
|
2016-07-26 22:24:56 +00:00
|
|
|
if (!nr_new)
|
|
|
|
return 0;
|
|
|
|
|
2011-07-12 09:15:55 +00:00
|
|
|
/*
|
|
|
|
* If this was the first round, resize array and repeat for actual
|
|
|
|
* insertions; otherwise, merge and return.
|
2010-07-06 22:39:13 +00:00
|
|
|
*/
|
2011-07-12 09:15:55 +00:00
|
|
|
if (!insert) {
|
|
|
|
while (type->cnt + nr_new > type->max)
|
2012-06-20 19:53:05 +00:00
|
|
|
if (memblock_double_array(type, obase, size) < 0)
|
2011-07-12 09:15:55 +00:00
|
|
|
return -ENOMEM;
|
|
|
|
insert = true;
|
|
|
|
goto repeat;
|
|
|
|
} else {
|
|
|
|
memblock_merge_regions(type);
|
|
|
|
return 0;
|
2010-07-06 22:39:13 +00:00
|
|
|
}
|
2010-07-12 04:36:09 +00:00
|
|
|
}
|
|
|
|
|
2018-06-30 14:55:03 +00:00
|
|
|
/**
|
|
|
|
* memblock_add_node - add new memblock region within a NUMA node
|
|
|
|
* @base: base address of the new region
|
|
|
|
* @size: size of the new region
|
|
|
|
* @nid: nid of the new region
|
|
|
|
*
|
|
|
|
* Add new memblock region [@base, @base + @size) to the "memory"
|
|
|
|
* type. See memblock_add_range() description for mode details
|
|
|
|
*
|
|
|
|
* Return:
|
|
|
|
* 0 on success, -errno on failure.
|
|
|
|
*/
|
2011-12-08 18:22:08 +00:00
|
|
|
int __init_memblock memblock_add_node(phys_addr_t base, phys_addr_t size,
|
|
|
|
int nid)
|
|
|
|
{
|
2014-01-29 17:16:01 +00:00
|
|
|
return memblock_add_range(&memblock.memory, base, size, nid, 0);
|
2011-12-08 18:22:08 +00:00
|
|
|
}
|
|
|
|
|
2018-06-30 14:55:03 +00:00
|
|
|
/**
|
|
|
|
* memblock_add - add new memblock region
|
|
|
|
* @base: base address of the new region
|
|
|
|
* @size: size of the new region
|
|
|
|
*
|
|
|
|
* Add new memblock region [@base, @base + @size) to the "memory"
|
|
|
|
* type. See memblock_add_range() description for mode details
|
|
|
|
*
|
|
|
|
* Return:
|
|
|
|
* 0 on success, -errno on failure.
|
|
|
|
*/
|
2016-05-20 23:57:35 +00:00
|
|
|
int __init_memblock memblock_add(phys_addr_t base, phys_addr_t size)
|
2015-04-15 23:14:44 +00:00
|
|
|
{
|
2017-02-22 23:46:42 +00:00
|
|
|
phys_addr_t end = base + size - 1;
|
|
|
|
|
|
|
|
memblock_dbg("memblock_add: [%pa-%pa] %pF\n",
|
|
|
|
&base, &end, (void *)_RET_IP_);
|
2015-04-15 23:14:44 +00:00
|
|
|
|
2016-05-20 23:57:35 +00:00
|
|
|
return memblock_add_range(&memblock.memory, base, size, MAX_NUMNODES, 0);
|
2010-07-12 04:36:09 +00:00
|
|
|
}
|
|
|
|
|
2011-12-08 18:22:07 +00:00
|
|
|
/**
|
|
|
|
* memblock_isolate_range - isolate given range into disjoint memblocks
|
|
|
|
* @type: memblock type to isolate range for
|
|
|
|
* @base: base of range to isolate
|
|
|
|
* @size: size of range to isolate
|
|
|
|
* @start_rgn: out parameter for the start of isolated region
|
|
|
|
* @end_rgn: out parameter for the end of isolated region
|
|
|
|
*
|
|
|
|
* Walk @type and ensure that regions don't cross the boundaries defined by
|
2018-06-30 14:55:02 +00:00
|
|
|
* [@base, @base + @size). Crossing regions are split at the boundaries,
|
2011-12-08 18:22:07 +00:00
|
|
|
* which may create at most two more regions. The index of the first
|
|
|
|
* region inside the range is returned in *@start_rgn and end in *@end_rgn.
|
|
|
|
*
|
2018-06-30 14:55:02 +00:00
|
|
|
* Return:
|
2011-12-08 18:22:07 +00:00
|
|
|
* 0 on success, -errno on failure.
|
|
|
|
*/
|
|
|
|
static int __init_memblock memblock_isolate_range(struct memblock_type *type,
|
|
|
|
phys_addr_t base, phys_addr_t size,
|
|
|
|
int *start_rgn, int *end_rgn)
|
|
|
|
{
|
2011-12-08 18:22:07 +00:00
|
|
|
phys_addr_t end = base + memblock_cap_size(base, &size);
|
2016-01-14 23:20:42 +00:00
|
|
|
int idx;
|
|
|
|
struct memblock_region *rgn;
|
2011-12-08 18:22:07 +00:00
|
|
|
|
|
|
|
*start_rgn = *end_rgn = 0;
|
|
|
|
|
2012-04-20 15:31:34 +00:00
|
|
|
if (!size)
|
|
|
|
return 0;
|
|
|
|
|
2011-12-08 18:22:07 +00:00
|
|
|
/* we'll create at most two more regions */
|
|
|
|
while (type->cnt + 2 > type->max)
|
2012-06-20 19:53:05 +00:00
|
|
|
if (memblock_double_array(type, base, size) < 0)
|
2011-12-08 18:22:07 +00:00
|
|
|
return -ENOMEM;
|
|
|
|
|
2017-11-16 01:33:42 +00:00
|
|
|
for_each_memblock_type(idx, type, rgn) {
|
2011-12-08 18:22:07 +00:00
|
|
|
phys_addr_t rbase = rgn->base;
|
|
|
|
phys_addr_t rend = rbase + rgn->size;
|
|
|
|
|
|
|
|
if (rbase >= end)
|
|
|
|
break;
|
|
|
|
if (rend <= base)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
if (rbase < base) {
|
|
|
|
/*
|
|
|
|
* @rgn intersects from below. Split and continue
|
|
|
|
* to process the next region - the new top half.
|
|
|
|
*/
|
|
|
|
rgn->base = base;
|
2011-12-08 18:22:08 +00:00
|
|
|
rgn->size -= base - rbase;
|
|
|
|
type->total_size -= base - rbase;
|
2016-01-14 23:20:42 +00:00
|
|
|
memblock_insert_region(type, idx, rbase, base - rbase,
|
2014-01-21 23:49:20 +00:00
|
|
|
memblock_get_region_node(rgn),
|
|
|
|
rgn->flags);
|
2011-12-08 18:22:07 +00:00
|
|
|
} else if (rend > end) {
|
|
|
|
/*
|
|
|
|
* @rgn intersects from above. Split and redo the
|
|
|
|
* current region - the new bottom half.
|
|
|
|
*/
|
|
|
|
rgn->base = end;
|
2011-12-08 18:22:08 +00:00
|
|
|
rgn->size -= end - rbase;
|
|
|
|
type->total_size -= end - rbase;
|
2016-01-14 23:20:42 +00:00
|
|
|
memblock_insert_region(type, idx--, rbase, end - rbase,
|
2014-01-21 23:49:20 +00:00
|
|
|
memblock_get_region_node(rgn),
|
|
|
|
rgn->flags);
|
2011-12-08 18:22:07 +00:00
|
|
|
} else {
|
|
|
|
/* @rgn is fully contained, record it */
|
|
|
|
if (!*end_rgn)
|
2016-01-14 23:20:42 +00:00
|
|
|
*start_rgn = idx;
|
|
|
|
*end_rgn = idx + 1;
|
2011-12-08 18:22:07 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2015-11-06 02:47:00 +00:00
|
|
|
static int __init_memblock memblock_remove_range(struct memblock_type *type,
|
2014-01-29 17:16:01 +00:00
|
|
|
phys_addr_t base, phys_addr_t size)
|
2010-07-12 04:36:09 +00:00
|
|
|
{
|
2011-12-08 18:22:07 +00:00
|
|
|
int start_rgn, end_rgn;
|
|
|
|
int i, ret;
|
2010-07-12 04:36:09 +00:00
|
|
|
|
2011-12-08 18:22:07 +00:00
|
|
|
ret = memblock_isolate_range(type, base, size, &start_rgn, &end_rgn);
|
|
|
|
if (ret)
|
|
|
|
return ret;
|
2010-07-12 04:36:09 +00:00
|
|
|
|
2011-12-08 18:22:07 +00:00
|
|
|
for (i = end_rgn - 1; i >= start_rgn; i--)
|
|
|
|
memblock_remove_region(type, i);
|
mm/memblock: properly handle overlaps and fix error path
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 <benh@kernel.crashing.org>
Acked-by: Yinghai Lu <yinghai@kernel.org>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-03-22 23:33:43 +00:00
|
|
|
return 0;
|
2010-07-12 04:36:09 +00:00
|
|
|
}
|
|
|
|
|
2011-12-08 18:22:06 +00:00
|
|
|
int __init_memblock memblock_remove(phys_addr_t base, phys_addr_t size)
|
2010-07-12 04:36:09 +00:00
|
|
|
{
|
2018-06-08 00:07:35 +00:00
|
|
|
phys_addr_t end = base + size - 1;
|
|
|
|
|
|
|
|
memblock_dbg("memblock_remove: [%pa-%pa] %pS\n",
|
|
|
|
&base, &end, (void *)_RET_IP_);
|
|
|
|
|
2014-01-29 17:16:01 +00:00
|
|
|
return memblock_remove_range(&memblock.memory, base, size);
|
2010-07-12 04:36:09 +00:00
|
|
|
}
|
|
|
|
|
2018-12-28 08:35:29 +00:00
|
|
|
/**
|
|
|
|
* memblock_free - free boot memory block
|
|
|
|
* @base: phys starting address of the boot memory block
|
|
|
|
* @size: size of the boot memory block in bytes
|
|
|
|
*
|
|
|
|
* Free boot memory block previously allocated by memblock_alloc_xx() API.
|
|
|
|
* The freeing memory will not be released to the buddy allocator.
|
|
|
|
*/
|
2011-12-08 18:22:06 +00:00
|
|
|
int __init_memblock memblock_free(phys_addr_t base, phys_addr_t size)
|
2010-07-12 04:36:09 +00:00
|
|
|
{
|
2017-02-22 23:46:42 +00:00
|
|
|
phys_addr_t end = base + size - 1;
|
|
|
|
|
|
|
|
memblock_dbg(" memblock_free: [%pa-%pa] %pF\n",
|
|
|
|
&base, &end, (void *)_RET_IP_);
|
2011-07-12 09:16:06 +00:00
|
|
|
|
2016-10-11 20:55:11 +00:00
|
|
|
kmemleak_free_part_phys(base, size);
|
2014-01-29 17:16:01 +00:00
|
|
|
return memblock_remove_range(&memblock.reserved, base, size);
|
2010-07-12 04:36:09 +00:00
|
|
|
}
|
|
|
|
|
2016-05-20 23:57:35 +00:00
|
|
|
int __init_memblock memblock_reserve(phys_addr_t base, phys_addr_t size)
|
2010-07-12 04:36:09 +00:00
|
|
|
{
|
2017-02-22 23:46:42 +00:00
|
|
|
phys_addr_t end = base + size - 1;
|
|
|
|
|
|
|
|
memblock_dbg("memblock_reserve: [%pa-%pa] %pF\n",
|
|
|
|
&base, &end, (void *)_RET_IP_);
|
2010-07-12 04:36:09 +00:00
|
|
|
|
2016-05-20 23:57:35 +00:00
|
|
|
return memblock_add_range(&memblock.reserved, base, size, MAX_NUMNODES, 0);
|
2010-07-12 04:36:09 +00:00
|
|
|
}
|
|
|
|
|
2014-01-21 23:49:23 +00:00
|
|
|
/**
|
2018-06-30 14:55:02 +00:00
|
|
|
* memblock_setclr_flag - set or clear flag for a memory region
|
|
|
|
* @base: base address of the region
|
|
|
|
* @size: size of the region
|
|
|
|
* @set: set or clear the flag
|
|
|
|
* @flag: the flag to udpate
|
2014-01-21 23:49:23 +00:00
|
|
|
*
|
2014-12-13 00:54:59 +00:00
|
|
|
* This function isolates region [@base, @base + @size), and sets/clears flag
|
2014-01-21 23:49:23 +00:00
|
|
|
*
|
2018-06-30 14:55:02 +00:00
|
|
|
* Return: 0 on success, -errno on failure.
|
2014-01-21 23:49:23 +00:00
|
|
|
*/
|
2014-12-13 00:54:59 +00:00
|
|
|
static int __init_memblock memblock_setclr_flag(phys_addr_t base,
|
|
|
|
phys_addr_t size, int set, int flag)
|
2014-01-21 23:49:23 +00:00
|
|
|
{
|
|
|
|
struct memblock_type *type = &memblock.memory;
|
|
|
|
int i, ret, start_rgn, end_rgn;
|
|
|
|
|
|
|
|
ret = memblock_isolate_range(type, base, size, &start_rgn, &end_rgn);
|
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
for (i = start_rgn; i < end_rgn; i++)
|
2014-12-13 00:54:59 +00:00
|
|
|
if (set)
|
|
|
|
memblock_set_region_flags(&type->regions[i], flag);
|
|
|
|
else
|
|
|
|
memblock_clear_region_flags(&type->regions[i], flag);
|
2014-01-21 23:49:23 +00:00
|
|
|
|
|
|
|
memblock_merge_regions(type);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2014-12-13 00:54:59 +00:00
|
|
|
* memblock_mark_hotplug - Mark hotpluggable memory with flag MEMBLOCK_HOTPLUG.
|
2014-01-21 23:49:23 +00:00
|
|
|
* @base: the base phys addr of the region
|
|
|
|
* @size: the size of the region
|
|
|
|
*
|
2018-06-30 14:55:02 +00:00
|
|
|
* Return: 0 on success, -errno on failure.
|
2014-12-13 00:54:59 +00:00
|
|
|
*/
|
|
|
|
int __init_memblock memblock_mark_hotplug(phys_addr_t base, phys_addr_t size)
|
|
|
|
{
|
|
|
|
return memblock_setclr_flag(base, size, 1, MEMBLOCK_HOTPLUG);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* memblock_clear_hotplug - Clear flag MEMBLOCK_HOTPLUG for a specified region.
|
|
|
|
* @base: the base phys addr of the region
|
|
|
|
* @size: the size of the region
|
2014-01-21 23:49:23 +00:00
|
|
|
*
|
2018-06-30 14:55:02 +00:00
|
|
|
* Return: 0 on success, -errno on failure.
|
2014-01-21 23:49:23 +00:00
|
|
|
*/
|
|
|
|
int __init_memblock memblock_clear_hotplug(phys_addr_t base, phys_addr_t size)
|
|
|
|
{
|
2014-12-13 00:54:59 +00:00
|
|
|
return memblock_setclr_flag(base, size, 0, MEMBLOCK_HOTPLUG);
|
2014-01-21 23:49:23 +00:00
|
|
|
}
|
|
|
|
|
2015-06-24 23:58:12 +00:00
|
|
|
/**
|
|
|
|
* memblock_mark_mirror - Mark mirrored memory with flag MEMBLOCK_MIRROR.
|
|
|
|
* @base: the base phys addr of the region
|
|
|
|
* @size: the size of the region
|
|
|
|
*
|
2018-06-30 14:55:02 +00:00
|
|
|
* Return: 0 on success, -errno on failure.
|
2015-06-24 23:58:12 +00:00
|
|
|
*/
|
|
|
|
int __init_memblock memblock_mark_mirror(phys_addr_t base, phys_addr_t size)
|
|
|
|
{
|
|
|
|
system_has_some_mirror = true;
|
|
|
|
|
|
|
|
return memblock_setclr_flag(base, size, 1, MEMBLOCK_MIRROR);
|
|
|
|
}
|
|
|
|
|
2015-11-30 12:28:15 +00:00
|
|
|
/**
|
|
|
|
* memblock_mark_nomap - Mark a memory region with flag MEMBLOCK_NOMAP.
|
|
|
|
* @base: the base phys addr of the region
|
|
|
|
* @size: the size of the region
|
|
|
|
*
|
2018-06-30 14:55:02 +00:00
|
|
|
* Return: 0 on success, -errno on failure.
|
2015-11-30 12:28:15 +00:00
|
|
|
*/
|
|
|
|
int __init_memblock memblock_mark_nomap(phys_addr_t base, phys_addr_t size)
|
|
|
|
{
|
|
|
|
return memblock_setclr_flag(base, size, 1, MEMBLOCK_NOMAP);
|
|
|
|
}
|
2015-06-24 23:58:12 +00:00
|
|
|
|
2017-04-03 02:23:54 +00:00
|
|
|
/**
|
|
|
|
* memblock_clear_nomap - Clear flag MEMBLOCK_NOMAP for a specified region.
|
|
|
|
* @base: the base phys addr of the region
|
|
|
|
* @size: the size of the region
|
|
|
|
*
|
2018-06-30 14:55:02 +00:00
|
|
|
* Return: 0 on success, -errno on failure.
|
2017-04-03 02:23:54 +00:00
|
|
|
*/
|
|
|
|
int __init_memblock memblock_clear_nomap(phys_addr_t base, phys_addr_t size)
|
|
|
|
{
|
|
|
|
return memblock_setclr_flag(base, size, 0, MEMBLOCK_NOMAP);
|
|
|
|
}
|
|
|
|
|
memblock: introduce a for_each_reserved_mem_region iterator
Struct page initialisation had been identified as one of the reasons why
large machines take a long time to boot. Patches were posted a long time ago
to defer initialisation until they were first used. This was rejected on
the grounds it should not be necessary to hurt the fast paths. This series
reuses much of the work from that time but defers the initialisation of
memory to kswapd so that one thread per node initialises memory local to
that node.
After applying the series and setting the appropriate Kconfig variable I
see this in the boot log on a 64G machine
[ 7.383764] kswapd 0 initialised deferred memory in 188ms
[ 7.404253] kswapd 1 initialised deferred memory in 208ms
[ 7.411044] kswapd 3 initialised deferred memory in 216ms
[ 7.411551] kswapd 2 initialised deferred memory in 216ms
On a 1TB machine, I see
[ 8.406511] kswapd 3 initialised deferred memory in 1116ms
[ 8.428518] kswapd 1 initialised deferred memory in 1140ms
[ 8.435977] kswapd 0 initialised deferred memory in 1148ms
[ 8.437416] kswapd 2 initialised deferred memory in 1148ms
Once booted the machine appears to work as normal. Boot times were measured
from the time shutdown was called until ssh was available again. In the
64G case, the boot time savings are negligible. On the 1TB machine, the
savings were 16 seconds.
Nate Zimmer said:
: On an older 8 TB box with lots and lots of cpus the boot time, as
: measure from grub to login prompt, the boot time improved from 1484
: seconds to exactly 1000 seconds.
Waiman Long said:
: I ran a bootup timing test on a 12-TB 16-socket IvyBridge-EX system. From
: grub menu to ssh login, the bootup time was 453s before the patch and 265s
: after the patch - a saving of 188s (42%).
Daniel Blueman said:
: On a 7TB, 1728-core NumaConnect system with 108 NUMA nodes, we're seeing
: stock 4.0 boot in 7136s. This drops to 2159s, or a 70% reduction with
: this patchset. Non-temporal PMD init (https://lkml.org/lkml/2015/4/23/350)
: drops this to 1045s.
This patch (of 13):
As part of initializing struct page's in 2MiB chunks, we noticed that at
the end of free_all_bootmem(), there was nothing which had forced the
reserved/allocated 4KiB pages to be initialized.
This helper function will be used for that expansion.
Signed-off-by: Robin Holt <holt@sgi.com>
Signed-off-by: Nate Zimmer <nzimmer@sgi.com>
Signed-off-by: Mel Gorman <mgorman@suse.de>
Tested-by: Nate Zimmer <nzimmer@sgi.com>
Tested-by: Waiman Long <waiman.long@hp.com>
Tested-by: Daniel J Blueman <daniel@numascale.com>
Acked-by: Pekka Enberg <penberg@kernel.org>
Cc: Robin Holt <robinmholt@gmail.com>
Cc: Dave Hansen <dave.hansen@intel.com>
Cc: Waiman Long <waiman.long@hp.com>
Cc: Scott Norton <scott.norton@hp.com>
Cc: "Luck, Tony" <tony.luck@intel.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2015-06-30 21:56:41 +00:00
|
|
|
/**
|
|
|
|
* __next_reserved_mem_region - next function for for_each_reserved_region()
|
|
|
|
* @idx: pointer to u64 loop variable
|
|
|
|
* @out_start: ptr to phys_addr_t for start address of the region, can be %NULL
|
|
|
|
* @out_end: ptr to phys_addr_t for end address of the region, can be %NULL
|
|
|
|
*
|
|
|
|
* Iterate over all reserved memory regions.
|
|
|
|
*/
|
|
|
|
void __init_memblock __next_reserved_mem_region(u64 *idx,
|
|
|
|
phys_addr_t *out_start,
|
|
|
|
phys_addr_t *out_end)
|
|
|
|
{
|
2015-09-08 22:03:33 +00:00
|
|
|
struct memblock_type *type = &memblock.reserved;
|
memblock: introduce a for_each_reserved_mem_region iterator
Struct page initialisation had been identified as one of the reasons why
large machines take a long time to boot. Patches were posted a long time ago
to defer initialisation until they were first used. This was rejected on
the grounds it should not be necessary to hurt the fast paths. This series
reuses much of the work from that time but defers the initialisation of
memory to kswapd so that one thread per node initialises memory local to
that node.
After applying the series and setting the appropriate Kconfig variable I
see this in the boot log on a 64G machine
[ 7.383764] kswapd 0 initialised deferred memory in 188ms
[ 7.404253] kswapd 1 initialised deferred memory in 208ms
[ 7.411044] kswapd 3 initialised deferred memory in 216ms
[ 7.411551] kswapd 2 initialised deferred memory in 216ms
On a 1TB machine, I see
[ 8.406511] kswapd 3 initialised deferred memory in 1116ms
[ 8.428518] kswapd 1 initialised deferred memory in 1140ms
[ 8.435977] kswapd 0 initialised deferred memory in 1148ms
[ 8.437416] kswapd 2 initialised deferred memory in 1148ms
Once booted the machine appears to work as normal. Boot times were measured
from the time shutdown was called until ssh was available again. In the
64G case, the boot time savings are negligible. On the 1TB machine, the
savings were 16 seconds.
Nate Zimmer said:
: On an older 8 TB box with lots and lots of cpus the boot time, as
: measure from grub to login prompt, the boot time improved from 1484
: seconds to exactly 1000 seconds.
Waiman Long said:
: I ran a bootup timing test on a 12-TB 16-socket IvyBridge-EX system. From
: grub menu to ssh login, the bootup time was 453s before the patch and 265s
: after the patch - a saving of 188s (42%).
Daniel Blueman said:
: On a 7TB, 1728-core NumaConnect system with 108 NUMA nodes, we're seeing
: stock 4.0 boot in 7136s. This drops to 2159s, or a 70% reduction with
: this patchset. Non-temporal PMD init (https://lkml.org/lkml/2015/4/23/350)
: drops this to 1045s.
This patch (of 13):
As part of initializing struct page's in 2MiB chunks, we noticed that at
the end of free_all_bootmem(), there was nothing which had forced the
reserved/allocated 4KiB pages to be initialized.
This helper function will be used for that expansion.
Signed-off-by: Robin Holt <holt@sgi.com>
Signed-off-by: Nate Zimmer <nzimmer@sgi.com>
Signed-off-by: Mel Gorman <mgorman@suse.de>
Tested-by: Nate Zimmer <nzimmer@sgi.com>
Tested-by: Waiman Long <waiman.long@hp.com>
Tested-by: Daniel J Blueman <daniel@numascale.com>
Acked-by: Pekka Enberg <penberg@kernel.org>
Cc: Robin Holt <robinmholt@gmail.com>
Cc: Dave Hansen <dave.hansen@intel.com>
Cc: Waiman Long <waiman.long@hp.com>
Cc: Scott Norton <scott.norton@hp.com>
Cc: "Luck, Tony" <tony.luck@intel.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2015-06-30 21:56:41 +00:00
|
|
|
|
2016-05-20 23:58:33 +00:00
|
|
|
if (*idx < type->cnt) {
|
2015-09-08 22:03:33 +00:00
|
|
|
struct memblock_region *r = &type->regions[*idx];
|
memblock: introduce a for_each_reserved_mem_region iterator
Struct page initialisation had been identified as one of the reasons why
large machines take a long time to boot. Patches were posted a long time ago
to defer initialisation until they were first used. This was rejected on
the grounds it should not be necessary to hurt the fast paths. This series
reuses much of the work from that time but defers the initialisation of
memory to kswapd so that one thread per node initialises memory local to
that node.
After applying the series and setting the appropriate Kconfig variable I
see this in the boot log on a 64G machine
[ 7.383764] kswapd 0 initialised deferred memory in 188ms
[ 7.404253] kswapd 1 initialised deferred memory in 208ms
[ 7.411044] kswapd 3 initialised deferred memory in 216ms
[ 7.411551] kswapd 2 initialised deferred memory in 216ms
On a 1TB machine, I see
[ 8.406511] kswapd 3 initialised deferred memory in 1116ms
[ 8.428518] kswapd 1 initialised deferred memory in 1140ms
[ 8.435977] kswapd 0 initialised deferred memory in 1148ms
[ 8.437416] kswapd 2 initialised deferred memory in 1148ms
Once booted the machine appears to work as normal. Boot times were measured
from the time shutdown was called until ssh was available again. In the
64G case, the boot time savings are negligible. On the 1TB machine, the
savings were 16 seconds.
Nate Zimmer said:
: On an older 8 TB box with lots and lots of cpus the boot time, as
: measure from grub to login prompt, the boot time improved from 1484
: seconds to exactly 1000 seconds.
Waiman Long said:
: I ran a bootup timing test on a 12-TB 16-socket IvyBridge-EX system. From
: grub menu to ssh login, the bootup time was 453s before the patch and 265s
: after the patch - a saving of 188s (42%).
Daniel Blueman said:
: On a 7TB, 1728-core NumaConnect system with 108 NUMA nodes, we're seeing
: stock 4.0 boot in 7136s. This drops to 2159s, or a 70% reduction with
: this patchset. Non-temporal PMD init (https://lkml.org/lkml/2015/4/23/350)
: drops this to 1045s.
This patch (of 13):
As part of initializing struct page's in 2MiB chunks, we noticed that at
the end of free_all_bootmem(), there was nothing which had forced the
reserved/allocated 4KiB pages to be initialized.
This helper function will be used for that expansion.
Signed-off-by: Robin Holt <holt@sgi.com>
Signed-off-by: Nate Zimmer <nzimmer@sgi.com>
Signed-off-by: Mel Gorman <mgorman@suse.de>
Tested-by: Nate Zimmer <nzimmer@sgi.com>
Tested-by: Waiman Long <waiman.long@hp.com>
Tested-by: Daniel J Blueman <daniel@numascale.com>
Acked-by: Pekka Enberg <penberg@kernel.org>
Cc: Robin Holt <robinmholt@gmail.com>
Cc: Dave Hansen <dave.hansen@intel.com>
Cc: Waiman Long <waiman.long@hp.com>
Cc: Scott Norton <scott.norton@hp.com>
Cc: "Luck, Tony" <tony.luck@intel.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2015-06-30 21:56:41 +00:00
|
|
|
phys_addr_t base = r->base;
|
|
|
|
phys_addr_t size = r->size;
|
|
|
|
|
|
|
|
if (out_start)
|
|
|
|
*out_start = base;
|
|
|
|
if (out_end)
|
|
|
|
*out_end = base + size - 1;
|
|
|
|
|
|
|
|
*idx += 1;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* signal end of iteration */
|
|
|
|
*idx = ULLONG_MAX;
|
|
|
|
}
|
|
|
|
|
2011-07-12 09:15:59 +00:00
|
|
|
/**
|
2014-01-29 17:16:01 +00:00
|
|
|
* __next__mem_range - next function for for_each_free_mem_range() etc.
|
2011-07-12 09:15:59 +00:00
|
|
|
* @idx: pointer to u64 loop variable
|
2014-01-21 23:50:16 +00:00
|
|
|
* @nid: node selector, %NUMA_NO_NODE for all nodes
|
2015-06-24 23:58:09 +00:00
|
|
|
* @flags: pick from blocks based on memory attributes
|
2014-01-29 17:16:01 +00:00
|
|
|
* @type_a: pointer to memblock_type from where the range is taken
|
|
|
|
* @type_b: pointer to memblock_type which excludes memory from being taken
|
2012-06-20 19:53:01 +00:00
|
|
|
* @out_start: ptr to phys_addr_t for start address of the range, can be %NULL
|
|
|
|
* @out_end: ptr to phys_addr_t for end address of the range, can be %NULL
|
|
|
|
* @out_nid: ptr to int for nid of the range, can be %NULL
|
2011-07-12 09:15:59 +00:00
|
|
|
*
|
2014-01-29 17:16:01 +00:00
|
|
|
* Find the first area from *@idx which matches @nid, fill the out
|
2011-07-12 09:15:59 +00:00
|
|
|
* parameters, and update *@idx for the next iteration. The lower 32bit of
|
2014-01-29 17:16:01 +00:00
|
|
|
* *@idx contains index into type_a and the upper 32bit indexes the
|
|
|
|
* areas before each region in type_b. For example, if type_b regions
|
2011-07-12 09:15:59 +00:00
|
|
|
* look like the following,
|
|
|
|
*
|
|
|
|
* 0:[0-16), 1:[32-48), 2:[128-130)
|
|
|
|
*
|
|
|
|
* The upper 32bit indexes the following regions.
|
|
|
|
*
|
|
|
|
* 0:[0-0), 1:[16-32), 2:[48-128), 3:[130-MAX)
|
|
|
|
*
|
|
|
|
* As both region arrays are sorted, the function advances the two indices
|
|
|
|
* in lockstep and returns each intersection.
|
|
|
|
*/
|
2018-06-30 14:55:01 +00:00
|
|
|
void __init_memblock __next_mem_range(u64 *idx, int nid,
|
|
|
|
enum memblock_flags flags,
|
2014-01-29 17:16:01 +00:00
|
|
|
struct memblock_type *type_a,
|
|
|
|
struct memblock_type *type_b,
|
|
|
|
phys_addr_t *out_start,
|
|
|
|
phys_addr_t *out_end, int *out_nid)
|
2011-07-12 09:15:59 +00:00
|
|
|
{
|
2014-01-29 17:16:01 +00:00
|
|
|
int idx_a = *idx & 0xffffffff;
|
|
|
|
int idx_b = *idx >> 32;
|
2014-01-21 23:50:16 +00:00
|
|
|
|
2014-01-29 17:16:01 +00:00
|
|
|
if (WARN_ONCE(nid == MAX_NUMNODES,
|
|
|
|
"Usage of MAX_NUMNODES is deprecated. Use NUMA_NO_NODE instead\n"))
|
2014-01-21 23:50:55 +00:00
|
|
|
nid = NUMA_NO_NODE;
|
2011-07-12 09:15:59 +00:00
|
|
|
|
2014-01-29 17:16:01 +00:00
|
|
|
for (; idx_a < type_a->cnt; idx_a++) {
|
|
|
|
struct memblock_region *m = &type_a->regions[idx_a];
|
|
|
|
|
2011-07-12 09:15:59 +00:00
|
|
|
phys_addr_t m_start = m->base;
|
|
|
|
phys_addr_t m_end = m->base + m->size;
|
2014-01-29 17:16:01 +00:00
|
|
|
int m_nid = memblock_get_region_node(m);
|
2011-07-12 09:15:59 +00:00
|
|
|
|
|
|
|
/* only memory regions are associated with nodes, check it */
|
2014-01-29 17:16:01 +00:00
|
|
|
if (nid != NUMA_NO_NODE && nid != m_nid)
|
2011-07-12 09:15:59 +00:00
|
|
|
continue;
|
|
|
|
|
2014-09-09 21:50:46 +00:00
|
|
|
/* skip hotpluggable memory regions if needed */
|
|
|
|
if (movable_node_is_enabled() && memblock_is_hotpluggable(m))
|
|
|
|
continue;
|
|
|
|
|
2015-06-24 23:58:12 +00:00
|
|
|
/* if we want mirror memory skip non-mirror memory regions */
|
|
|
|
if ((flags & MEMBLOCK_MIRROR) && !memblock_is_mirror(m))
|
|
|
|
continue;
|
|
|
|
|
2015-11-30 12:28:15 +00:00
|
|
|
/* skip nomap memory unless we were asked for it explicitly */
|
|
|
|
if (!(flags & MEMBLOCK_NOMAP) && memblock_is_nomap(m))
|
|
|
|
continue;
|
|
|
|
|
2014-01-29 17:16:01 +00:00
|
|
|
if (!type_b) {
|
|
|
|
if (out_start)
|
|
|
|
*out_start = m_start;
|
|
|
|
if (out_end)
|
|
|
|
*out_end = m_end;
|
|
|
|
if (out_nid)
|
|
|
|
*out_nid = m_nid;
|
|
|
|
idx_a++;
|
|
|
|
*idx = (u32)idx_a | (u64)idx_b << 32;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* scan areas before each reservation */
|
|
|
|
for (; idx_b < type_b->cnt + 1; idx_b++) {
|
|
|
|
struct memblock_region *r;
|
|
|
|
phys_addr_t r_start;
|
|
|
|
phys_addr_t r_end;
|
|
|
|
|
|
|
|
r = &type_b->regions[idx_b];
|
|
|
|
r_start = idx_b ? r[-1].base + r[-1].size : 0;
|
|
|
|
r_end = idx_b < type_b->cnt ?
|
2018-06-08 00:06:15 +00:00
|
|
|
r->base : PHYS_ADDR_MAX;
|
2011-07-12 09:15:59 +00:00
|
|
|
|
2014-01-29 17:16:01 +00:00
|
|
|
/*
|
|
|
|
* if idx_b advanced past idx_a,
|
|
|
|
* break out to advance idx_a
|
|
|
|
*/
|
2011-07-12 09:15:59 +00:00
|
|
|
if (r_start >= m_end)
|
|
|
|
break;
|
|
|
|
/* if the two regions intersect, we're done */
|
|
|
|
if (m_start < r_end) {
|
|
|
|
if (out_start)
|
2014-01-29 17:16:01 +00:00
|
|
|
*out_start =
|
|
|
|
max(m_start, r_start);
|
2011-07-12 09:15:59 +00:00
|
|
|
if (out_end)
|
|
|
|
*out_end = min(m_end, r_end);
|
|
|
|
if (out_nid)
|
2014-01-29 17:16:01 +00:00
|
|
|
*out_nid = m_nid;
|
2011-07-12 09:15:59 +00:00
|
|
|
/*
|
2014-01-29 17:16:01 +00:00
|
|
|
* The region which ends first is
|
|
|
|
* advanced for the next iteration.
|
2011-07-12 09:15:59 +00:00
|
|
|
*/
|
|
|
|
if (m_end <= r_end)
|
2014-01-29 17:16:01 +00:00
|
|
|
idx_a++;
|
2011-07-12 09:15:59 +00:00
|
|
|
else
|
2014-01-29 17:16:01 +00:00
|
|
|
idx_b++;
|
|
|
|
*idx = (u32)idx_a | (u64)idx_b << 32;
|
2011-07-12 09:15:59 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* signal end of iteration */
|
|
|
|
*idx = ULLONG_MAX;
|
|
|
|
}
|
|
|
|
|
2011-12-08 18:22:09 +00:00
|
|
|
/**
|
2014-01-29 17:16:01 +00:00
|
|
|
* __next_mem_range_rev - generic next function for for_each_*_range_rev()
|
|
|
|
*
|
2011-12-08 18:22:09 +00:00
|
|
|
* @idx: pointer to u64 loop variable
|
2015-09-08 22:04:22 +00:00
|
|
|
* @nid: node selector, %NUMA_NO_NODE for all nodes
|
2015-06-24 23:58:09 +00:00
|
|
|
* @flags: pick from blocks based on memory attributes
|
2014-01-29 17:16:01 +00:00
|
|
|
* @type_a: pointer to memblock_type from where the range is taken
|
|
|
|
* @type_b: pointer to memblock_type which excludes memory from being taken
|
2012-06-20 19:53:01 +00:00
|
|
|
* @out_start: ptr to phys_addr_t for start address of the range, can be %NULL
|
|
|
|
* @out_end: ptr to phys_addr_t for end address of the range, can be %NULL
|
|
|
|
* @out_nid: ptr to int for nid of the range, can be %NULL
|
2011-12-08 18:22:09 +00:00
|
|
|
*
|
2018-06-30 14:55:02 +00:00
|
|
|
* Finds the next range from type_a which is not marked as unsuitable
|
|
|
|
* in type_b.
|
|
|
|
*
|
2014-01-29 17:16:01 +00:00
|
|
|
* Reverse of __next_mem_range().
|
2011-12-08 18:22:09 +00:00
|
|
|
*/
|
2018-06-30 14:55:01 +00:00
|
|
|
void __init_memblock __next_mem_range_rev(u64 *idx, int nid,
|
|
|
|
enum memblock_flags flags,
|
2014-01-29 17:16:01 +00:00
|
|
|
struct memblock_type *type_a,
|
|
|
|
struct memblock_type *type_b,
|
|
|
|
phys_addr_t *out_start,
|
|
|
|
phys_addr_t *out_end, int *out_nid)
|
2011-12-08 18:22:09 +00:00
|
|
|
{
|
2014-01-29 17:16:01 +00:00
|
|
|
int idx_a = *idx & 0xffffffff;
|
|
|
|
int idx_b = *idx >> 32;
|
2014-01-21 23:50:16 +00:00
|
|
|
|
2014-01-21 23:50:55 +00:00
|
|
|
if (WARN_ONCE(nid == MAX_NUMNODES, "Usage of MAX_NUMNODES is deprecated. Use NUMA_NO_NODE instead\n"))
|
|
|
|
nid = NUMA_NO_NODE;
|
2011-12-08 18:22:09 +00:00
|
|
|
|
|
|
|
if (*idx == (u64)ULLONG_MAX) {
|
2014-01-29 17:16:01 +00:00
|
|
|
idx_a = type_a->cnt - 1;
|
2016-08-04 22:32:00 +00:00
|
|
|
if (type_b != NULL)
|
|
|
|
idx_b = type_b->cnt;
|
|
|
|
else
|
|
|
|
idx_b = 0;
|
2011-12-08 18:22:09 +00:00
|
|
|
}
|
|
|
|
|
2014-01-29 17:16:01 +00:00
|
|
|
for (; idx_a >= 0; idx_a--) {
|
|
|
|
struct memblock_region *m = &type_a->regions[idx_a];
|
|
|
|
|
2011-12-08 18:22:09 +00:00
|
|
|
phys_addr_t m_start = m->base;
|
|
|
|
phys_addr_t m_end = m->base + m->size;
|
2014-01-29 17:16:01 +00:00
|
|
|
int m_nid = memblock_get_region_node(m);
|
2011-12-08 18:22:09 +00:00
|
|
|
|
|
|
|
/* only memory regions are associated with nodes, check it */
|
2014-01-29 17:16:01 +00:00
|
|
|
if (nid != NUMA_NO_NODE && nid != m_nid)
|
2011-12-08 18:22:09 +00:00
|
|
|
continue;
|
|
|
|
|
2014-01-21 23:49:35 +00:00
|
|
|
/* skip hotpluggable memory regions if needed */
|
|
|
|
if (movable_node_is_enabled() && memblock_is_hotpluggable(m))
|
|
|
|
continue;
|
|
|
|
|
2015-06-24 23:58:12 +00:00
|
|
|
/* if we want mirror memory skip non-mirror memory regions */
|
|
|
|
if ((flags & MEMBLOCK_MIRROR) && !memblock_is_mirror(m))
|
|
|
|
continue;
|
|
|
|
|
2015-11-30 12:28:15 +00:00
|
|
|
/* skip nomap memory unless we were asked for it explicitly */
|
|
|
|
if (!(flags & MEMBLOCK_NOMAP) && memblock_is_nomap(m))
|
|
|
|
continue;
|
|
|
|
|
2014-01-29 17:16:01 +00:00
|
|
|
if (!type_b) {
|
|
|
|
if (out_start)
|
|
|
|
*out_start = m_start;
|
|
|
|
if (out_end)
|
|
|
|
*out_end = m_end;
|
|
|
|
if (out_nid)
|
|
|
|
*out_nid = m_nid;
|
2016-07-28 22:48:56 +00:00
|
|
|
idx_a--;
|
2014-01-29 17:16:01 +00:00
|
|
|
*idx = (u32)idx_a | (u64)idx_b << 32;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* scan areas before each reservation */
|
|
|
|
for (; idx_b >= 0; idx_b--) {
|
|
|
|
struct memblock_region *r;
|
|
|
|
phys_addr_t r_start;
|
|
|
|
phys_addr_t r_end;
|
|
|
|
|
|
|
|
r = &type_b->regions[idx_b];
|
|
|
|
r_start = idx_b ? r[-1].base + r[-1].size : 0;
|
|
|
|
r_end = idx_b < type_b->cnt ?
|
2018-06-08 00:06:15 +00:00
|
|
|
r->base : PHYS_ADDR_MAX;
|
2014-01-29 17:16:01 +00:00
|
|
|
/*
|
|
|
|
* if idx_b advanced past idx_a,
|
|
|
|
* break out to advance idx_a
|
|
|
|
*/
|
2011-12-08 18:22:09 +00:00
|
|
|
|
|
|
|
if (r_end <= m_start)
|
|
|
|
break;
|
|
|
|
/* if the two regions intersect, we're done */
|
|
|
|
if (m_end > r_start) {
|
|
|
|
if (out_start)
|
|
|
|
*out_start = max(m_start, r_start);
|
|
|
|
if (out_end)
|
|
|
|
*out_end = min(m_end, r_end);
|
|
|
|
if (out_nid)
|
2014-01-29 17:16:01 +00:00
|
|
|
*out_nid = m_nid;
|
2011-12-08 18:22:09 +00:00
|
|
|
if (m_start >= r_start)
|
2014-01-29 17:16:01 +00:00
|
|
|
idx_a--;
|
2011-12-08 18:22:09 +00:00
|
|
|
else
|
2014-01-29 17:16:01 +00:00
|
|
|
idx_b--;
|
|
|
|
*idx = (u32)idx_a | (u64)idx_b << 32;
|
2011-12-08 18:22:09 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2014-01-29 17:16:01 +00:00
|
|
|
/* signal end of iteration */
|
2011-12-08 18:22:09 +00:00
|
|
|
*idx = ULLONG_MAX;
|
|
|
|
}
|
|
|
|
|
2011-07-14 09:43:42 +00:00
|
|
|
#ifdef CONFIG_HAVE_MEMBLOCK_NODE_MAP
|
|
|
|
/*
|
2018-11-16 23:08:57 +00:00
|
|
|
* Common iterator interface used to define for_each_mem_pfn_range().
|
2011-07-14 09:43:42 +00:00
|
|
|
*/
|
|
|
|
void __init_memblock __next_mem_pfn_range(int *idx, int nid,
|
|
|
|
unsigned long *out_start_pfn,
|
|
|
|
unsigned long *out_end_pfn, int *out_nid)
|
|
|
|
{
|
|
|
|
struct memblock_type *type = &memblock.memory;
|
|
|
|
struct memblock_region *r;
|
|
|
|
|
|
|
|
while (++*idx < type->cnt) {
|
|
|
|
r = &type->regions[*idx];
|
|
|
|
|
|
|
|
if (PFN_UP(r->base) >= PFN_DOWN(r->base + r->size))
|
|
|
|
continue;
|
|
|
|
if (nid == MAX_NUMNODES || nid == r->nid)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (*idx >= type->cnt) {
|
|
|
|
*idx = -1;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (out_start_pfn)
|
|
|
|
*out_start_pfn = PFN_UP(r->base);
|
|
|
|
if (out_end_pfn)
|
|
|
|
*out_end_pfn = PFN_DOWN(r->base + r->size);
|
|
|
|
if (out_nid)
|
|
|
|
*out_nid = r->nid;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* memblock_set_node - set node ID on memblock regions
|
|
|
|
* @base: base of area to set node ID for
|
|
|
|
* @size: size of area to set node ID for
|
2014-01-21 23:49:26 +00:00
|
|
|
* @type: memblock type to set node ID for
|
2011-07-14 09:43:42 +00:00
|
|
|
* @nid: node ID to set
|
|
|
|
*
|
2018-06-30 14:55:02 +00:00
|
|
|
* Set the nid of memblock @type regions in [@base, @base + @size) to @nid.
|
2011-07-14 09:43:42 +00:00
|
|
|
* Regions which cross the area boundaries are split as necessary.
|
|
|
|
*
|
2018-06-30 14:55:02 +00:00
|
|
|
* Return:
|
2011-07-14 09:43:42 +00:00
|
|
|
* 0 on success, -errno on failure.
|
|
|
|
*/
|
|
|
|
int __init_memblock memblock_set_node(phys_addr_t base, phys_addr_t size,
|
2014-01-21 23:49:26 +00:00
|
|
|
struct memblock_type *type, int nid)
|
2011-07-14 09:43:42 +00:00
|
|
|
{
|
2011-12-08 18:22:07 +00:00
|
|
|
int start_rgn, end_rgn;
|
|
|
|
int i, ret;
|
2011-07-14 09:43:42 +00:00
|
|
|
|
2011-12-08 18:22:07 +00:00
|
|
|
ret = memblock_isolate_range(type, base, size, &start_rgn, &end_rgn);
|
|
|
|
if (ret)
|
|
|
|
return ret;
|
2011-07-14 09:43:42 +00:00
|
|
|
|
2011-12-08 18:22:07 +00:00
|
|
|
for (i = start_rgn; i < end_rgn; i++)
|
2012-10-08 23:32:21 +00:00
|
|
|
memblock_set_region_node(&type->regions[i], nid);
|
2011-07-14 09:43:42 +00:00
|
|
|
|
|
|
|
memblock_merge_regions(type);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
#endif /* CONFIG_HAVE_MEMBLOCK_NODE_MAP */
|
|
|
|
|
2014-06-04 23:06:53 +00:00
|
|
|
static phys_addr_t __init memblock_alloc_range_nid(phys_addr_t size,
|
|
|
|
phys_addr_t align, phys_addr_t start,
|
2018-06-30 14:55:01 +00:00
|
|
|
phys_addr_t end, int nid,
|
|
|
|
enum memblock_flags flags)
|
2010-07-12 04:36:09 +00:00
|
|
|
{
|
2010-07-12 04:36:48 +00:00
|
|
|
phys_addr_t found;
|
2010-07-12 04:36:09 +00:00
|
|
|
|
2018-10-30 22:10:01 +00:00
|
|
|
if (!align) {
|
|
|
|
/* Can't use WARNs this early in boot on powerpc */
|
|
|
|
dump_stack();
|
|
|
|
align = SMP_CACHE_BYTES;
|
|
|
|
}
|
|
|
|
|
2015-06-24 23:58:09 +00:00
|
|
|
found = memblock_find_in_range_node(size, align, start, end, nid,
|
|
|
|
flags);
|
2014-06-06 21:38:20 +00:00
|
|
|
if (found && !memblock_reserve(found, size)) {
|
|
|
|
/*
|
|
|
|
* The min_count is set to 0 so that memblock allocations are
|
|
|
|
* never reported as leaks.
|
|
|
|
*/
|
2016-10-11 20:55:11 +00:00
|
|
|
kmemleak_alloc_phys(found, size, 0, 0);
|
2010-07-12 04:36:48 +00:00
|
|
|
return found;
|
2014-06-06 21:38:20 +00:00
|
|
|
}
|
2010-07-12 04:36:48 +00:00
|
|
|
return 0;
|
2010-07-12 04:36:09 +00:00
|
|
|
}
|
|
|
|
|
2014-06-04 23:06:53 +00:00
|
|
|
phys_addr_t __init memblock_alloc_range(phys_addr_t size, phys_addr_t align,
|
2015-06-24 23:58:09 +00:00
|
|
|
phys_addr_t start, phys_addr_t end,
|
2018-06-30 14:55:01 +00:00
|
|
|
enum memblock_flags flags)
|
2014-06-04 23:06:53 +00:00
|
|
|
{
|
2015-06-24 23:58:09 +00:00
|
|
|
return memblock_alloc_range_nid(size, align, start, end, NUMA_NO_NODE,
|
|
|
|
flags);
|
2014-06-04 23:06:53 +00:00
|
|
|
}
|
|
|
|
|
2018-02-13 15:08:15 +00:00
|
|
|
phys_addr_t __init memblock_alloc_base_nid(phys_addr_t size,
|
2014-06-04 23:06:53 +00:00
|
|
|
phys_addr_t align, phys_addr_t max_addr,
|
2018-06-30 14:55:01 +00:00
|
|
|
int nid, enum memblock_flags flags)
|
2014-06-04 23:06:53 +00:00
|
|
|
{
|
2015-06-24 23:58:09 +00:00
|
|
|
return memblock_alloc_range_nid(size, align, 0, max_addr, nid, flags);
|
2014-06-04 23:06:53 +00:00
|
|
|
}
|
|
|
|
|
memblock: rename memblock_alloc{_nid,_try_nid} to memblock_phys_alloc*
Make it explicit that the caller gets a physical address rather than a
virtual one.
This will also allow using meblock_alloc prefix for memblock allocations
returning virtual address, which is done in the following patches.
The conversion is done using the following semantic patch:
@@
expression e1, e2, e3;
@@
(
- memblock_alloc(e1, e2)
+ memblock_phys_alloc(e1, e2)
|
- memblock_alloc_nid(e1, e2, e3)
+ memblock_phys_alloc_nid(e1, e2, e3)
|
- memblock_alloc_try_nid(e1, e2, e3)
+ memblock_phys_alloc_try_nid(e1, e2, e3)
)
Link: http://lkml.kernel.org/r/1536927045-23536-7-git-send-email-rppt@linux.vnet.ibm.com
Signed-off-by: Mike Rapoport <rppt@linux.vnet.ibm.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Chris Zankel <chris@zankel.net>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Greentime Hu <green.hu@gmail.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Guan Xuetao <gxt@pku.edu.cn>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "James E.J. Bottomley" <jejb@parisc-linux.org>
Cc: Jonas Bonn <jonas@southpole.se>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Ley Foon Tan <lftan@altera.com>
Cc: Mark Salter <msalter@redhat.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Matt Turner <mattst88@gmail.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Michal Simek <monstr@monstr.eu>
Cc: Palmer Dabbelt <palmer@sifive.com>
Cc: Paul Burton <paul.burton@mips.com>
Cc: Richard Kuo <rkuo@codeaurora.org>
Cc: Richard Weinberger <richard@nod.at>
Cc: Rich Felker <dalias@libc.org>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Serge Semin <fancer.lancer@gmail.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Vineet Gupta <vgupta@synopsys.com>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2018-10-30 22:07:59 +00:00
|
|
|
phys_addr_t __init memblock_phys_alloc_nid(phys_addr_t size, phys_addr_t align, int nid)
|
2011-12-08 18:22:09 +00:00
|
|
|
{
|
2018-06-30 14:55:01 +00:00
|
|
|
enum memblock_flags flags = choose_memblock_flags();
|
2015-06-24 23:58:12 +00:00
|
|
|
phys_addr_t ret;
|
|
|
|
|
|
|
|
again:
|
|
|
|
ret = memblock_alloc_base_nid(size, align, MEMBLOCK_ALLOC_ACCESSIBLE,
|
|
|
|
nid, flags);
|
|
|
|
|
|
|
|
if (!ret && (flags & MEMBLOCK_MIRROR)) {
|
|
|
|
flags &= ~MEMBLOCK_MIRROR;
|
|
|
|
goto again;
|
|
|
|
}
|
|
|
|
return ret;
|
2011-12-08 18:22:09 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
phys_addr_t __init __memblock_alloc_base(phys_addr_t size, phys_addr_t align, phys_addr_t max_addr)
|
|
|
|
{
|
2015-06-24 23:58:09 +00:00
|
|
|
return memblock_alloc_base_nid(size, align, max_addr, NUMA_NO_NODE,
|
|
|
|
MEMBLOCK_NONE);
|
2011-12-08 18:22:09 +00:00
|
|
|
}
|
|
|
|
|
2010-07-12 04:36:48 +00:00
|
|
|
phys_addr_t __init memblock_alloc_base(phys_addr_t size, phys_addr_t align, phys_addr_t max_addr)
|
2010-07-12 04:36:09 +00:00
|
|
|
{
|
2010-07-12 04:36:48 +00:00
|
|
|
phys_addr_t alloc;
|
|
|
|
|
|
|
|
alloc = __memblock_alloc_base(size, align, max_addr);
|
|
|
|
|
|
|
|
if (alloc == 0)
|
2017-02-22 23:46:42 +00:00
|
|
|
panic("ERROR: Failed to allocate %pa bytes below %pa.\n",
|
|
|
|
&size, &max_addr);
|
2010-07-12 04:36:48 +00:00
|
|
|
|
|
|
|
return alloc;
|
2010-07-12 04:36:09 +00:00
|
|
|
}
|
|
|
|
|
memblock: rename memblock_alloc{_nid,_try_nid} to memblock_phys_alloc*
Make it explicit that the caller gets a physical address rather than a
virtual one.
This will also allow using meblock_alloc prefix for memblock allocations
returning virtual address, which is done in the following patches.
The conversion is done using the following semantic patch:
@@
expression e1, e2, e3;
@@
(
- memblock_alloc(e1, e2)
+ memblock_phys_alloc(e1, e2)
|
- memblock_alloc_nid(e1, e2, e3)
+ memblock_phys_alloc_nid(e1, e2, e3)
|
- memblock_alloc_try_nid(e1, e2, e3)
+ memblock_phys_alloc_try_nid(e1, e2, e3)
)
Link: http://lkml.kernel.org/r/1536927045-23536-7-git-send-email-rppt@linux.vnet.ibm.com
Signed-off-by: Mike Rapoport <rppt@linux.vnet.ibm.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Chris Zankel <chris@zankel.net>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Greentime Hu <green.hu@gmail.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Guan Xuetao <gxt@pku.edu.cn>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "James E.J. Bottomley" <jejb@parisc-linux.org>
Cc: Jonas Bonn <jonas@southpole.se>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Ley Foon Tan <lftan@altera.com>
Cc: Mark Salter <msalter@redhat.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Matt Turner <mattst88@gmail.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Michal Simek <monstr@monstr.eu>
Cc: Palmer Dabbelt <palmer@sifive.com>
Cc: Paul Burton <paul.burton@mips.com>
Cc: Richard Kuo <rkuo@codeaurora.org>
Cc: Richard Weinberger <richard@nod.at>
Cc: Rich Felker <dalias@libc.org>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Serge Semin <fancer.lancer@gmail.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Vineet Gupta <vgupta@synopsys.com>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2018-10-30 22:07:59 +00:00
|
|
|
phys_addr_t __init memblock_phys_alloc(phys_addr_t size, phys_addr_t align)
|
2010-07-12 04:36:09 +00:00
|
|
|
{
|
2010-07-12 04:36:48 +00:00
|
|
|
return memblock_alloc_base(size, align, MEMBLOCK_ALLOC_ACCESSIBLE);
|
|
|
|
}
|
2010-07-12 04:36:09 +00:00
|
|
|
|
memblock: rename memblock_alloc{_nid,_try_nid} to memblock_phys_alloc*
Make it explicit that the caller gets a physical address rather than a
virtual one.
This will also allow using meblock_alloc prefix for memblock allocations
returning virtual address, which is done in the following patches.
The conversion is done using the following semantic patch:
@@
expression e1, e2, e3;
@@
(
- memblock_alloc(e1, e2)
+ memblock_phys_alloc(e1, e2)
|
- memblock_alloc_nid(e1, e2, e3)
+ memblock_phys_alloc_nid(e1, e2, e3)
|
- memblock_alloc_try_nid(e1, e2, e3)
+ memblock_phys_alloc_try_nid(e1, e2, e3)
)
Link: http://lkml.kernel.org/r/1536927045-23536-7-git-send-email-rppt@linux.vnet.ibm.com
Signed-off-by: Mike Rapoport <rppt@linux.vnet.ibm.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Chris Zankel <chris@zankel.net>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Greentime Hu <green.hu@gmail.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Guan Xuetao <gxt@pku.edu.cn>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "James E.J. Bottomley" <jejb@parisc-linux.org>
Cc: Jonas Bonn <jonas@southpole.se>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Ley Foon Tan <lftan@altera.com>
Cc: Mark Salter <msalter@redhat.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Matt Turner <mattst88@gmail.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Michal Simek <monstr@monstr.eu>
Cc: Palmer Dabbelt <palmer@sifive.com>
Cc: Paul Burton <paul.burton@mips.com>
Cc: Richard Kuo <rkuo@codeaurora.org>
Cc: Richard Weinberger <richard@nod.at>
Cc: Rich Felker <dalias@libc.org>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Serge Semin <fancer.lancer@gmail.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Vineet Gupta <vgupta@synopsys.com>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2018-10-30 22:07:59 +00:00
|
|
|
phys_addr_t __init memblock_phys_alloc_try_nid(phys_addr_t size, phys_addr_t align, int nid)
|
2010-07-06 22:39:17 +00:00
|
|
|
{
|
memblock: rename memblock_alloc{_nid,_try_nid} to memblock_phys_alloc*
Make it explicit that the caller gets a physical address rather than a
virtual one.
This will also allow using meblock_alloc prefix for memblock allocations
returning virtual address, which is done in the following patches.
The conversion is done using the following semantic patch:
@@
expression e1, e2, e3;
@@
(
- memblock_alloc(e1, e2)
+ memblock_phys_alloc(e1, e2)
|
- memblock_alloc_nid(e1, e2, e3)
+ memblock_phys_alloc_nid(e1, e2, e3)
|
- memblock_alloc_try_nid(e1, e2, e3)
+ memblock_phys_alloc_try_nid(e1, e2, e3)
)
Link: http://lkml.kernel.org/r/1536927045-23536-7-git-send-email-rppt@linux.vnet.ibm.com
Signed-off-by: Mike Rapoport <rppt@linux.vnet.ibm.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Chris Zankel <chris@zankel.net>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Greentime Hu <green.hu@gmail.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Guan Xuetao <gxt@pku.edu.cn>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "James E.J. Bottomley" <jejb@parisc-linux.org>
Cc: Jonas Bonn <jonas@southpole.se>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Ley Foon Tan <lftan@altera.com>
Cc: Mark Salter <msalter@redhat.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Matt Turner <mattst88@gmail.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Michal Simek <monstr@monstr.eu>
Cc: Palmer Dabbelt <palmer@sifive.com>
Cc: Paul Burton <paul.burton@mips.com>
Cc: Richard Kuo <rkuo@codeaurora.org>
Cc: Richard Weinberger <richard@nod.at>
Cc: Rich Felker <dalias@libc.org>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Serge Semin <fancer.lancer@gmail.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Vineet Gupta <vgupta@synopsys.com>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2018-10-30 22:07:59 +00:00
|
|
|
phys_addr_t res = memblock_phys_alloc_nid(size, align, nid);
|
2010-07-06 22:39:17 +00:00
|
|
|
|
|
|
|
if (res)
|
|
|
|
return res;
|
2011-07-12 07:58:07 +00:00
|
|
|
return memblock_alloc_base(size, align, MEMBLOCK_ALLOC_ACCESSIBLE);
|
2010-07-12 04:36:09 +00:00
|
|
|
}
|
|
|
|
|
2014-01-21 23:50:19 +00:00
|
|
|
/**
|
2018-10-30 22:08:04 +00:00
|
|
|
* memblock_alloc_internal - allocate boot memory block
|
2014-01-21 23:50:19 +00:00
|
|
|
* @size: size of memory block to be allocated in bytes
|
|
|
|
* @align: alignment of the region and block's size
|
|
|
|
* @min_addr: the lower bound of the memory region to allocate (phys address)
|
|
|
|
* @max_addr: the upper bound of the memory region to allocate (phys address)
|
|
|
|
* @nid: nid of the free area to find, %NUMA_NO_NODE for any node
|
|
|
|
*
|
|
|
|
* The @min_addr limit is dropped if it can not be satisfied and the allocation
|
|
|
|
* will fall back to memory below @min_addr. Also, allocation may fall back
|
|
|
|
* to any node in the system if the specified node can not
|
|
|
|
* hold the requested memory.
|
|
|
|
*
|
|
|
|
* The allocation is performed from memory region limited by
|
2018-10-30 22:09:44 +00:00
|
|
|
* memblock.current_limit if @max_addr == %MEMBLOCK_ALLOC_ACCESSIBLE.
|
2014-01-21 23:50:19 +00:00
|
|
|
*
|
|
|
|
* The phys address of allocated boot memory block is converted to virtual and
|
|
|
|
* allocated memory is reset to 0.
|
|
|
|
*
|
|
|
|
* In addition, function sets the min_count to 0 using kmemleak_alloc for
|
|
|
|
* allocated boot memory block, so that it is never reported as leaks.
|
|
|
|
*
|
2018-06-30 14:55:02 +00:00
|
|
|
* Return:
|
2014-01-21 23:50:19 +00:00
|
|
|
* Virtual address of allocated memory block on success, NULL on failure.
|
|
|
|
*/
|
2018-10-30 22:08:04 +00:00
|
|
|
static void * __init memblock_alloc_internal(
|
2014-01-21 23:50:19 +00:00
|
|
|
phys_addr_t size, phys_addr_t align,
|
|
|
|
phys_addr_t min_addr, phys_addr_t max_addr,
|
|
|
|
int nid)
|
|
|
|
{
|
|
|
|
phys_addr_t alloc;
|
|
|
|
void *ptr;
|
2018-06-30 14:55:01 +00:00
|
|
|
enum memblock_flags flags = choose_memblock_flags();
|
2014-01-21 23:50:19 +00:00
|
|
|
|
2014-01-21 23:50:55 +00:00
|
|
|
if (WARN_ONCE(nid == MAX_NUMNODES, "Usage of MAX_NUMNODES is deprecated. Use NUMA_NO_NODE instead\n"))
|
|
|
|
nid = NUMA_NO_NODE;
|
2014-01-21 23:50:19 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Detect any accidental use of these APIs after slab is ready, as at
|
|
|
|
* this moment memblock may be deinitialized already and its
|
2018-10-30 22:09:30 +00:00
|
|
|
* internal data may be destroyed (after execution of memblock_free_all)
|
2014-01-21 23:50:19 +00:00
|
|
|
*/
|
|
|
|
if (WARN_ON_ONCE(slab_is_available()))
|
|
|
|
return kzalloc_node(size, GFP_NOWAIT, nid);
|
|
|
|
|
2018-10-30 22:10:01 +00:00
|
|
|
if (!align) {
|
|
|
|
dump_stack();
|
|
|
|
align = SMP_CACHE_BYTES;
|
|
|
|
}
|
|
|
|
|
2014-01-29 22:05:52 +00:00
|
|
|
if (max_addr > memblock.current_limit)
|
|
|
|
max_addr = memblock.current_limit;
|
2014-01-21 23:50:19 +00:00
|
|
|
again:
|
|
|
|
alloc = memblock_find_in_range_node(size, align, min_addr, max_addr,
|
2015-06-24 23:58:12 +00:00
|
|
|
nid, flags);
|
2017-02-22 23:45:07 +00:00
|
|
|
if (alloc && !memblock_reserve(alloc, size))
|
2014-01-21 23:50:19 +00:00
|
|
|
goto done;
|
|
|
|
|
|
|
|
if (nid != NUMA_NO_NODE) {
|
|
|
|
alloc = memblock_find_in_range_node(size, align, min_addr,
|
2015-06-24 23:58:09 +00:00
|
|
|
max_addr, NUMA_NO_NODE,
|
2015-06-24 23:58:12 +00:00
|
|
|
flags);
|
2017-02-22 23:45:07 +00:00
|
|
|
if (alloc && !memblock_reserve(alloc, size))
|
2014-01-21 23:50:19 +00:00
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (min_addr) {
|
|
|
|
min_addr = 0;
|
|
|
|
goto again;
|
|
|
|
}
|
|
|
|
|
2015-06-24 23:58:12 +00:00
|
|
|
if (flags & MEMBLOCK_MIRROR) {
|
|
|
|
flags &= ~MEMBLOCK_MIRROR;
|
|
|
|
pr_warn("Could not allocate %pap bytes of mirrored memory\n",
|
|
|
|
&size);
|
|
|
|
goto again;
|
|
|
|
}
|
|
|
|
|
|
|
|
return NULL;
|
2014-01-21 23:50:19 +00:00
|
|
|
done:
|
|
|
|
ptr = phys_to_virt(alloc);
|
|
|
|
|
mm/memblock.c: skip kmemleak for kasan_init()
Kmemleak does not play well with KASAN (tested on both HPE Apollo 70 and
Huawei TaiShan 2280 aarch64 servers).
After calling start_kernel()->setup_arch()->kasan_init(), kmemleak early
log buffer went from something like 280 to 260000 which caused kmemleak
disabled and crash dump memory reservation failed. The multitude of
kmemleak_alloc() calls is from nested loops while KASAN is setting up full
memory mappings, so let early kmemleak allocations skip those
memblock_alloc_internal() calls came from kasan_init() given that those
early KASAN memory mappings should not reference to other memory. Hence,
no kmemleak false positives.
kasan_init
kasan_map_populate [1]
kasan_pgd_populate [2]
kasan_pud_populate [3]
kasan_pmd_populate [4]
kasan_pte_populate [5]
kasan_alloc_zeroed_page
memblock_alloc_try_nid
memblock_alloc_internal
kmemleak_alloc
[1] for_each_memblock(memory, reg)
[2] while (pgdp++, addr = next, addr != end)
[3] while (pudp++, addr = next, addr != end && pud_none(READ_ONCE(*pudp)))
[4] while (pmdp++, addr = next, addr != end && pmd_none(READ_ONCE(*pmdp)))
[5] while (ptep++, addr = next, addr != end && pte_none(READ_ONCE(*ptep)))
Link: http://lkml.kernel.org/r/1543442925-17794-1-git-send-email-cai@gmx.us
Signed-off-by: Qian Cai <cai@gmx.us>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Mike Rapoport <rppt@linux.vnet.ibm.com>
Cc: Alexander Potapenko <glider@google.com>
Cc: Dmitry Vyukov <dvyukov@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2018-12-28 08:36:29 +00:00
|
|
|
/* Skip kmemleak for kasan_init() due to high volume. */
|
|
|
|
if (max_addr != MEMBLOCK_ALLOC_KASAN)
|
|
|
|
/*
|
|
|
|
* The min_count is set to 0 so that bootmem allocated
|
|
|
|
* blocks are never reported as leaks. This is because many
|
|
|
|
* of these blocks are only referred via the physical
|
|
|
|
* address which is not looked up by kmemleak.
|
|
|
|
*/
|
|
|
|
kmemleak_alloc(ptr, size, 0, 0);
|
2014-01-21 23:50:19 +00:00
|
|
|
|
|
|
|
return ptr;
|
|
|
|
}
|
|
|
|
|
2017-11-16 01:36:27 +00:00
|
|
|
/**
|
2018-10-30 22:08:04 +00:00
|
|
|
* memblock_alloc_try_nid_raw - allocate boot memory block without zeroing
|
2017-11-16 01:36:27 +00:00
|
|
|
* memory and without panicking
|
|
|
|
* @size: size of memory block to be allocated in bytes
|
|
|
|
* @align: alignment of the region and block's size
|
|
|
|
* @min_addr: the lower bound of the memory region from where the allocation
|
|
|
|
* is preferred (phys address)
|
|
|
|
* @max_addr: the upper bound of the memory region from where the allocation
|
2018-10-30 22:09:44 +00:00
|
|
|
* is preferred (phys address), or %MEMBLOCK_ALLOC_ACCESSIBLE to
|
2017-11-16 01:36:27 +00:00
|
|
|
* allocate only from memory limited by memblock.current_limit value
|
|
|
|
* @nid: nid of the free area to find, %NUMA_NO_NODE for any node
|
|
|
|
*
|
|
|
|
* Public function, provides additional debug information (including caller
|
|
|
|
* info), if enabled. Does not zero allocated memory, does not panic if request
|
|
|
|
* cannot be satisfied.
|
|
|
|
*
|
2018-06-30 14:55:02 +00:00
|
|
|
* Return:
|
2017-11-16 01:36:27 +00:00
|
|
|
* Virtual address of allocated memory block on success, NULL on failure.
|
|
|
|
*/
|
2018-10-30 22:08:04 +00:00
|
|
|
void * __init memblock_alloc_try_nid_raw(
|
2017-11-16 01:36:27 +00:00
|
|
|
phys_addr_t size, phys_addr_t align,
|
|
|
|
phys_addr_t min_addr, phys_addr_t max_addr,
|
|
|
|
int nid)
|
|
|
|
{
|
|
|
|
void *ptr;
|
|
|
|
|
2018-08-17 22:47:17 +00:00
|
|
|
memblock_dbg("%s: %llu bytes align=0x%llx nid=%d from=%pa max_addr=%pa %pF\n",
|
|
|
|
__func__, (u64)size, (u64)align, nid, &min_addr,
|
|
|
|
&max_addr, (void *)_RET_IP_);
|
2017-11-16 01:36:27 +00:00
|
|
|
|
2018-10-30 22:08:04 +00:00
|
|
|
ptr = memblock_alloc_internal(size, align,
|
2017-11-16 01:36:27 +00:00
|
|
|
min_addr, max_addr, nid);
|
|
|
|
if (ptr && size > 0)
|
2018-10-26 22:07:45 +00:00
|
|
|
page_init_poison(ptr, size);
|
|
|
|
|
2017-11-16 01:36:27 +00:00
|
|
|
return ptr;
|
|
|
|
}
|
|
|
|
|
2014-01-21 23:50:19 +00:00
|
|
|
/**
|
2018-10-30 22:08:04 +00:00
|
|
|
* memblock_alloc_try_nid_nopanic - allocate boot memory block
|
2014-01-21 23:50:19 +00:00
|
|
|
* @size: size of memory block to be allocated in bytes
|
|
|
|
* @align: alignment of the region and block's size
|
|
|
|
* @min_addr: the lower bound of the memory region from where the allocation
|
|
|
|
* is preferred (phys address)
|
|
|
|
* @max_addr: the upper bound of the memory region from where the allocation
|
2018-10-30 22:09:44 +00:00
|
|
|
* is preferred (phys address), or %MEMBLOCK_ALLOC_ACCESSIBLE to
|
2014-01-21 23:50:19 +00:00
|
|
|
* allocate only from memory limited by memblock.current_limit value
|
|
|
|
* @nid: nid of the free area to find, %NUMA_NO_NODE for any node
|
|
|
|
*
|
2017-11-16 01:36:27 +00:00
|
|
|
* Public function, provides additional debug information (including caller
|
|
|
|
* info), if enabled. This function zeroes the allocated memory.
|
2014-01-21 23:50:19 +00:00
|
|
|
*
|
2018-06-30 14:55:02 +00:00
|
|
|
* Return:
|
2014-01-21 23:50:19 +00:00
|
|
|
* Virtual address of allocated memory block on success, NULL on failure.
|
|
|
|
*/
|
2018-10-30 22:08:04 +00:00
|
|
|
void * __init memblock_alloc_try_nid_nopanic(
|
2014-01-21 23:50:19 +00:00
|
|
|
phys_addr_t size, phys_addr_t align,
|
|
|
|
phys_addr_t min_addr, phys_addr_t max_addr,
|
|
|
|
int nid)
|
|
|
|
{
|
2017-11-16 01:36:27 +00:00
|
|
|
void *ptr;
|
|
|
|
|
2018-08-17 22:47:17 +00:00
|
|
|
memblock_dbg("%s: %llu bytes align=0x%llx nid=%d from=%pa max_addr=%pa %pF\n",
|
|
|
|
__func__, (u64)size, (u64)align, nid, &min_addr,
|
|
|
|
&max_addr, (void *)_RET_IP_);
|
2017-11-16 01:36:27 +00:00
|
|
|
|
2018-10-30 22:08:04 +00:00
|
|
|
ptr = memblock_alloc_internal(size, align,
|
2017-11-16 01:36:27 +00:00
|
|
|
min_addr, max_addr, nid);
|
|
|
|
if (ptr)
|
|
|
|
memset(ptr, 0, size);
|
|
|
|
return ptr;
|
2014-01-21 23:50:19 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2018-10-30 22:08:04 +00:00
|
|
|
* memblock_alloc_try_nid - allocate boot memory block with panicking
|
2014-01-21 23:50:19 +00:00
|
|
|
* @size: size of memory block to be allocated in bytes
|
|
|
|
* @align: alignment of the region and block's size
|
|
|
|
* @min_addr: the lower bound of the memory region from where the allocation
|
|
|
|
* is preferred (phys address)
|
|
|
|
* @max_addr: the upper bound of the memory region from where the allocation
|
2018-10-30 22:09:44 +00:00
|
|
|
* is preferred (phys address), or %MEMBLOCK_ALLOC_ACCESSIBLE to
|
2014-01-21 23:50:19 +00:00
|
|
|
* allocate only from memory limited by memblock.current_limit value
|
|
|
|
* @nid: nid of the free area to find, %NUMA_NO_NODE for any node
|
|
|
|
*
|
2018-10-30 22:08:04 +00:00
|
|
|
* Public panicking version of memblock_alloc_try_nid_nopanic()
|
2014-01-21 23:50:19 +00:00
|
|
|
* which provides debug information (including caller info), if enabled,
|
|
|
|
* and panics if the request can not be satisfied.
|
|
|
|
*
|
2018-06-30 14:55:02 +00:00
|
|
|
* Return:
|
2014-01-21 23:50:19 +00:00
|
|
|
* Virtual address of allocated memory block on success, NULL on failure.
|
|
|
|
*/
|
2018-10-30 22:08:04 +00:00
|
|
|
void * __init memblock_alloc_try_nid(
|
2014-01-21 23:50:19 +00:00
|
|
|
phys_addr_t size, phys_addr_t align,
|
|
|
|
phys_addr_t min_addr, phys_addr_t max_addr,
|
|
|
|
int nid)
|
|
|
|
{
|
|
|
|
void *ptr;
|
|
|
|
|
2018-08-17 22:47:17 +00:00
|
|
|
memblock_dbg("%s: %llu bytes align=0x%llx nid=%d from=%pa max_addr=%pa %pF\n",
|
|
|
|
__func__, (u64)size, (u64)align, nid, &min_addr,
|
|
|
|
&max_addr, (void *)_RET_IP_);
|
2018-10-30 22:08:04 +00:00
|
|
|
ptr = memblock_alloc_internal(size, align,
|
2014-01-21 23:50:19 +00:00
|
|
|
min_addr, max_addr, nid);
|
2017-11-16 01:36:27 +00:00
|
|
|
if (ptr) {
|
|
|
|
memset(ptr, 0, size);
|
2014-01-21 23:50:19 +00:00
|
|
|
return ptr;
|
2017-11-16 01:36:27 +00:00
|
|
|
}
|
2014-01-21 23:50:19 +00:00
|
|
|
|
2018-08-17 22:47:17 +00:00
|
|
|
panic("%s: Failed to allocate %llu bytes align=0x%llx nid=%d from=%pa max_addr=%pa\n",
|
|
|
|
__func__, (u64)size, (u64)align, nid, &min_addr, &max_addr);
|
2014-01-21 23:50:19 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2018-06-30 14:55:03 +00:00
|
|
|
/**
|
2014-01-21 23:50:19 +00:00
|
|
|
* __memblock_free_late - free bootmem block pages directly to buddy allocator
|
2018-06-30 14:55:03 +00:00
|
|
|
* @base: phys starting address of the boot memory block
|
2014-01-21 23:50:19 +00:00
|
|
|
* @size: size of the boot memory block in bytes
|
|
|
|
*
|
|
|
|
* This is only useful when the bootmem allocator has already been torn
|
|
|
|
* down, but we are still initializing the system. Pages are released directly
|
|
|
|
* to the buddy allocator, no bootmem metadata is updated because it is gone.
|
|
|
|
*/
|
|
|
|
void __init __memblock_free_late(phys_addr_t base, phys_addr_t size)
|
|
|
|
{
|
2018-08-17 22:47:17 +00:00
|
|
|
phys_addr_t cursor, end;
|
2014-01-21 23:50:19 +00:00
|
|
|
|
2018-08-17 22:47:17 +00:00
|
|
|
end = base + size - 1;
|
|
|
|
memblock_dbg("%s: [%pa-%pa] %pF\n",
|
|
|
|
__func__, &base, &end, (void *)_RET_IP_);
|
2016-10-11 20:55:11 +00:00
|
|
|
kmemleak_free_part_phys(base, size);
|
2014-01-21 23:50:19 +00:00
|
|
|
cursor = PFN_UP(base);
|
|
|
|
end = PFN_DOWN(base + size);
|
|
|
|
|
|
|
|
for (; cursor < end; cursor++) {
|
2018-10-30 22:09:36 +00:00
|
|
|
memblock_free_pages(pfn_to_page(cursor), cursor, 0);
|
2018-12-28 08:34:29 +00:00
|
|
|
totalram_pages_inc();
|
2014-01-21 23:50:19 +00:00
|
|
|
}
|
|
|
|
}
|
2010-07-06 22:39:17 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Remaining API functions
|
|
|
|
*/
|
|
|
|
|
2016-02-05 23:36:19 +00:00
|
|
|
phys_addr_t __init_memblock memblock_phys_mem_size(void)
|
2010-07-12 04:36:09 +00:00
|
|
|
{
|
2011-12-08 18:22:08 +00:00
|
|
|
return memblock.memory.total_size;
|
2010-07-12 04:36:09 +00:00
|
|
|
}
|
|
|
|
|
2016-10-07 23:59:18 +00:00
|
|
|
phys_addr_t __init_memblock memblock_reserved_size(void)
|
|
|
|
{
|
|
|
|
return memblock.reserved.total_size;
|
|
|
|
}
|
|
|
|
|
2013-01-24 20:20:09 +00:00
|
|
|
phys_addr_t __init memblock_mem_size(unsigned long limit_pfn)
|
|
|
|
{
|
|
|
|
unsigned long pages = 0;
|
|
|
|
struct memblock_region *r;
|
|
|
|
unsigned long start_pfn, end_pfn;
|
|
|
|
|
|
|
|
for_each_memblock(memory, r) {
|
|
|
|
start_pfn = memblock_region_memory_base_pfn(r);
|
|
|
|
end_pfn = memblock_region_memory_end_pfn(r);
|
|
|
|
start_pfn = min_t(unsigned long, start_pfn, limit_pfn);
|
|
|
|
end_pfn = min_t(unsigned long, end_pfn, limit_pfn);
|
|
|
|
pages += end_pfn - start_pfn;
|
|
|
|
}
|
|
|
|
|
2014-04-07 22:37:53 +00:00
|
|
|
return PFN_PHYS(pages);
|
2013-01-24 20:20:09 +00:00
|
|
|
}
|
|
|
|
|
2011-11-01 00:08:16 +00:00
|
|
|
/* lowest address */
|
|
|
|
phys_addr_t __init_memblock memblock_start_of_DRAM(void)
|
|
|
|
{
|
|
|
|
return memblock.memory.regions[0].base;
|
|
|
|
}
|
|
|
|
|
2010-07-28 05:43:02 +00:00
|
|
|
phys_addr_t __init_memblock memblock_end_of_DRAM(void)
|
2010-07-12 04:36:09 +00:00
|
|
|
{
|
|
|
|
int idx = memblock.memory.cnt - 1;
|
|
|
|
|
2010-08-04 04:06:41 +00:00
|
|
|
return (memblock.memory.regions[idx].base + memblock.memory.regions[idx].size);
|
2010-07-12 04:36:09 +00:00
|
|
|
}
|
|
|
|
|
2016-07-28 22:48:26 +00:00
|
|
|
static phys_addr_t __init_memblock __find_max_addr(phys_addr_t limit)
|
2010-07-12 04:36:09 +00:00
|
|
|
{
|
2018-06-08 00:06:15 +00:00
|
|
|
phys_addr_t max_addr = PHYS_ADDR_MAX;
|
2014-04-07 22:37:52 +00:00
|
|
|
struct memblock_region *r;
|
2010-07-12 04:36:09 +00:00
|
|
|
|
2016-07-28 22:48:26 +00:00
|
|
|
/*
|
|
|
|
* translate the memory @limit size into the max address within one of
|
|
|
|
* the memory memblock regions, if the @limit exceeds the total size
|
2018-06-08 00:06:15 +00:00
|
|
|
* of those regions, max_addr will keep original value PHYS_ADDR_MAX
|
2016-07-28 22:48:26 +00:00
|
|
|
*/
|
2014-04-07 22:37:52 +00:00
|
|
|
for_each_memblock(memory, r) {
|
2011-12-08 18:22:07 +00:00
|
|
|
if (limit <= r->size) {
|
|
|
|
max_addr = r->base + limit;
|
|
|
|
break;
|
2010-07-12 04:36:09 +00:00
|
|
|
}
|
2011-12-08 18:22:07 +00:00
|
|
|
limit -= r->size;
|
2010-07-12 04:36:09 +00:00
|
|
|
}
|
2011-12-08 18:22:07 +00:00
|
|
|
|
2016-07-28 22:48:26 +00:00
|
|
|
return max_addr;
|
|
|
|
}
|
|
|
|
|
|
|
|
void __init memblock_enforce_memory_limit(phys_addr_t limit)
|
|
|
|
{
|
2018-06-08 00:06:15 +00:00
|
|
|
phys_addr_t max_addr = PHYS_ADDR_MAX;
|
2016-07-28 22:48:26 +00:00
|
|
|
|
|
|
|
if (!limit)
|
|
|
|
return;
|
|
|
|
|
|
|
|
max_addr = __find_max_addr(limit);
|
|
|
|
|
|
|
|
/* @limit exceeds the total size of the memory, do nothing */
|
2018-06-08 00:06:15 +00:00
|
|
|
if (max_addr == PHYS_ADDR_MAX)
|
2016-07-28 22:48:26 +00:00
|
|
|
return;
|
|
|
|
|
2011-12-08 18:22:07 +00:00
|
|
|
/* truncate both memory and reserved regions */
|
2014-01-29 17:16:01 +00:00
|
|
|
memblock_remove_range(&memblock.memory, max_addr,
|
2018-06-08 00:06:15 +00:00
|
|
|
PHYS_ADDR_MAX);
|
2014-01-29 17:16:01 +00:00
|
|
|
memblock_remove_range(&memblock.reserved, max_addr,
|
2018-06-08 00:06:15 +00:00
|
|
|
PHYS_ADDR_MAX);
|
2010-07-12 04:36:09 +00:00
|
|
|
}
|
|
|
|
|
2017-04-03 02:23:55 +00:00
|
|
|
void __init memblock_cap_memory_range(phys_addr_t base, phys_addr_t size)
|
|
|
|
{
|
|
|
|
int start_rgn, end_rgn;
|
|
|
|
int i, ret;
|
|
|
|
|
|
|
|
if (!size)
|
|
|
|
return;
|
|
|
|
|
|
|
|
ret = memblock_isolate_range(&memblock.memory, base, size,
|
|
|
|
&start_rgn, &end_rgn);
|
|
|
|
if (ret)
|
|
|
|
return;
|
|
|
|
|
|
|
|
/* remove all the MAP regions */
|
|
|
|
for (i = memblock.memory.cnt - 1; i >= end_rgn; i--)
|
|
|
|
if (!memblock_is_nomap(&memblock.memory.regions[i]))
|
|
|
|
memblock_remove_region(&memblock.memory, i);
|
|
|
|
|
|
|
|
for (i = start_rgn - 1; i >= 0; i--)
|
|
|
|
if (!memblock_is_nomap(&memblock.memory.regions[i]))
|
|
|
|
memblock_remove_region(&memblock.memory, i);
|
|
|
|
|
|
|
|
/* truncate the reserved regions */
|
|
|
|
memblock_remove_range(&memblock.reserved, 0, base);
|
|
|
|
memblock_remove_range(&memblock.reserved,
|
2018-06-08 00:06:15 +00:00
|
|
|
base + size, PHYS_ADDR_MAX);
|
2017-04-03 02:23:55 +00:00
|
|
|
}
|
|
|
|
|
2016-07-28 22:48:26 +00:00
|
|
|
void __init memblock_mem_limit_remove_map(phys_addr_t limit)
|
|
|
|
{
|
|
|
|
phys_addr_t max_addr;
|
|
|
|
|
|
|
|
if (!limit)
|
|
|
|
return;
|
|
|
|
|
|
|
|
max_addr = __find_max_addr(limit);
|
|
|
|
|
|
|
|
/* @limit exceeds the total size of the memory, do nothing */
|
2018-06-08 00:06:15 +00:00
|
|
|
if (max_addr == PHYS_ADDR_MAX)
|
2016-07-28 22:48:26 +00:00
|
|
|
return;
|
|
|
|
|
2017-04-03 02:23:55 +00:00
|
|
|
memblock_cap_memory_range(0, max_addr);
|
2016-07-28 22:48:26 +00:00
|
|
|
}
|
|
|
|
|
2010-10-11 19:34:09 +00:00
|
|
|
static int __init_memblock memblock_search(struct memblock_type *type, phys_addr_t addr)
|
2010-08-04 04:38:47 +00:00
|
|
|
{
|
|
|
|
unsigned int left = 0, right = type->cnt;
|
|
|
|
|
|
|
|
do {
|
|
|
|
unsigned int mid = (right + left) / 2;
|
|
|
|
|
|
|
|
if (addr < type->regions[mid].base)
|
|
|
|
right = mid;
|
|
|
|
else if (addr >= (type->regions[mid].base +
|
|
|
|
type->regions[mid].size))
|
|
|
|
left = mid + 1;
|
|
|
|
else
|
|
|
|
return mid;
|
|
|
|
} while (left < right);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2018-12-14 22:17:06 +00:00
|
|
|
bool __init_memblock memblock_is_reserved(phys_addr_t addr)
|
2010-07-12 04:36:09 +00:00
|
|
|
{
|
2010-08-04 04:38:47 +00:00
|
|
|
return memblock_search(&memblock.reserved, addr) != -1;
|
|
|
|
}
|
2010-07-12 04:36:09 +00:00
|
|
|
|
2016-01-14 23:18:54 +00:00
|
|
|
bool __init_memblock memblock_is_memory(phys_addr_t addr)
|
2010-08-04 04:38:47 +00:00
|
|
|
{
|
|
|
|
return memblock_search(&memblock.memory, addr) != -1;
|
|
|
|
}
|
|
|
|
|
2018-02-06 23:41:18 +00:00
|
|
|
bool __init_memblock memblock_is_map_memory(phys_addr_t addr)
|
2015-11-30 12:28:15 +00:00
|
|
|
{
|
|
|
|
int i = memblock_search(&memblock.memory, addr);
|
|
|
|
|
|
|
|
if (i == -1)
|
|
|
|
return false;
|
|
|
|
return !memblock_is_nomap(&memblock.memory.regions[i]);
|
|
|
|
}
|
|
|
|
|
2013-09-11 21:22:17 +00:00
|
|
|
#ifdef CONFIG_HAVE_MEMBLOCK_NODE_MAP
|
|
|
|
int __init_memblock memblock_search_pfn_nid(unsigned long pfn,
|
|
|
|
unsigned long *start_pfn, unsigned long *end_pfn)
|
|
|
|
{
|
|
|
|
struct memblock_type *type = &memblock.memory;
|
2014-04-07 22:37:53 +00:00
|
|
|
int mid = memblock_search(type, PFN_PHYS(pfn));
|
2013-09-11 21:22:17 +00:00
|
|
|
|
|
|
|
if (mid == -1)
|
|
|
|
return -1;
|
|
|
|
|
2014-06-04 23:07:51 +00:00
|
|
|
*start_pfn = PFN_DOWN(type->regions[mid].base);
|
|
|
|
*end_pfn = PFN_DOWN(type->regions[mid].base + type->regions[mid].size);
|
2013-09-11 21:22:17 +00:00
|
|
|
|
|
|
|
return type->regions[mid].nid;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2012-05-24 07:45:21 +00:00
|
|
|
/**
|
|
|
|
* memblock_is_region_memory - check if a region is a subset of memory
|
|
|
|
* @base: base of region to check
|
|
|
|
* @size: size of region to check
|
|
|
|
*
|
2018-06-30 14:55:02 +00:00
|
|
|
* Check if the region [@base, @base + @size) is a subset of a memory block.
|
2012-05-24 07:45:21 +00:00
|
|
|
*
|
2018-06-30 14:55:02 +00:00
|
|
|
* Return:
|
2012-05-24 07:45:21 +00:00
|
|
|
* 0 if false, non-zero if true
|
|
|
|
*/
|
2018-02-06 23:41:18 +00:00
|
|
|
bool __init_memblock memblock_is_region_memory(phys_addr_t base, phys_addr_t size)
|
2010-08-04 04:38:47 +00:00
|
|
|
{
|
2011-01-20 22:44:20 +00:00
|
|
|
int idx = memblock_search(&memblock.memory, base);
|
2011-12-08 18:22:07 +00:00
|
|
|
phys_addr_t end = base + memblock_cap_size(base, &size);
|
2010-08-04 04:38:47 +00:00
|
|
|
|
|
|
|
if (idx == -1)
|
2018-02-06 23:41:18 +00:00
|
|
|
return false;
|
2017-02-22 23:45:04 +00:00
|
|
|
return (memblock.memory.regions[idx].base +
|
2011-12-08 18:22:07 +00:00
|
|
|
memblock.memory.regions[idx].size) >= end;
|
2010-07-12 04:36:09 +00:00
|
|
|
}
|
|
|
|
|
2012-05-24 07:45:21 +00:00
|
|
|
/**
|
|
|
|
* memblock_is_region_reserved - check if a region intersects reserved memory
|
|
|
|
* @base: base of region to check
|
|
|
|
* @size: size of region to check
|
|
|
|
*
|
2018-06-30 14:55:02 +00:00
|
|
|
* Check if the region [@base, @base + @size) intersects a reserved
|
|
|
|
* memory block.
|
2012-05-24 07:45:21 +00:00
|
|
|
*
|
2018-06-30 14:55:02 +00:00
|
|
|
* Return:
|
2015-09-08 22:02:00 +00:00
|
|
|
* True if they intersect, false if not.
|
2012-05-24 07:45:21 +00:00
|
|
|
*/
|
2015-09-08 22:02:00 +00:00
|
|
|
bool __init_memblock memblock_is_region_reserved(phys_addr_t base, phys_addr_t size)
|
2010-07-12 04:36:09 +00:00
|
|
|
{
|
2011-12-08 18:22:07 +00:00
|
|
|
memblock_cap_size(base, &size);
|
2015-09-08 22:02:00 +00:00
|
|
|
return memblock_overlaps_region(&memblock.reserved, base, size);
|
2010-07-12 04:36:09 +00:00
|
|
|
}
|
|
|
|
|
2012-10-22 23:35:18 +00:00
|
|
|
void __init_memblock memblock_trim_memory(phys_addr_t align)
|
|
|
|
{
|
|
|
|
phys_addr_t start, end, orig_start, orig_end;
|
2014-04-07 22:37:52 +00:00
|
|
|
struct memblock_region *r;
|
2012-10-22 23:35:18 +00:00
|
|
|
|
2014-04-07 22:37:52 +00:00
|
|
|
for_each_memblock(memory, r) {
|
|
|
|
orig_start = r->base;
|
|
|
|
orig_end = r->base + r->size;
|
2012-10-22 23:35:18 +00:00
|
|
|
start = round_up(orig_start, align);
|
|
|
|
end = round_down(orig_end, align);
|
|
|
|
|
|
|
|
if (start == orig_start && end == orig_end)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
if (start < end) {
|
2014-04-07 22:37:52 +00:00
|
|
|
r->base = start;
|
|
|
|
r->size = end - start;
|
2012-10-22 23:35:18 +00:00
|
|
|
} else {
|
2014-04-07 22:37:52 +00:00
|
|
|
memblock_remove_region(&memblock.memory,
|
|
|
|
r - memblock.memory.regions);
|
|
|
|
r--;
|
2012-10-22 23:35:18 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2010-07-06 22:39:01 +00:00
|
|
|
|
2010-09-15 20:05:29 +00:00
|
|
|
void __init_memblock memblock_set_current_limit(phys_addr_t limit)
|
2010-07-06 22:39:01 +00:00
|
|
|
{
|
|
|
|
memblock.current_limit = limit;
|
|
|
|
}
|
|
|
|
|
2014-02-27 00:23:43 +00:00
|
|
|
phys_addr_t __init_memblock memblock_get_current_limit(void)
|
|
|
|
{
|
|
|
|
return memblock.current_limit;
|
|
|
|
}
|
|
|
|
|
2017-02-24 22:55:59 +00:00
|
|
|
static void __init_memblock memblock_dump(struct memblock_type *type)
|
2010-07-12 04:36:48 +00:00
|
|
|
{
|
2017-02-22 23:46:42 +00:00
|
|
|
phys_addr_t base, end, size;
|
2018-06-30 14:55:01 +00:00
|
|
|
enum memblock_flags flags;
|
2016-01-14 23:20:42 +00:00
|
|
|
int idx;
|
|
|
|
struct memblock_region *rgn;
|
2010-07-12 04:36:48 +00:00
|
|
|
|
2017-02-24 22:55:59 +00:00
|
|
|
pr_info(" %s.cnt = 0x%lx\n", type->name, type->cnt);
|
2010-07-12 04:36:48 +00:00
|
|
|
|
2017-11-16 01:33:42 +00:00
|
|
|
for_each_memblock_type(idx, type, rgn) {
|
2011-07-14 09:43:42 +00:00
|
|
|
char nid_buf[32] = "";
|
|
|
|
|
|
|
|
base = rgn->base;
|
|
|
|
size = rgn->size;
|
2017-02-22 23:46:42 +00:00
|
|
|
end = base + size - 1;
|
2014-01-21 23:49:20 +00:00
|
|
|
flags = rgn->flags;
|
2011-07-14 09:43:42 +00:00
|
|
|
#ifdef CONFIG_HAVE_MEMBLOCK_NODE_MAP
|
|
|
|
if (memblock_get_region_node(rgn) != MAX_NUMNODES)
|
|
|
|
snprintf(nid_buf, sizeof(nid_buf), " on node %d",
|
|
|
|
memblock_get_region_node(rgn));
|
|
|
|
#endif
|
2018-06-30 14:55:01 +00:00
|
|
|
pr_info(" %s[%#x]\t[%pa-%pa], %pa bytes%s flags: %#x\n",
|
2017-02-24 22:55:59 +00:00
|
|
|
type->name, idx, &base, &end, &size, nid_buf, flags);
|
2010-07-12 04:36:48 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-12-08 18:22:06 +00:00
|
|
|
void __init_memblock __memblock_dump_all(void)
|
2010-07-12 04:36:48 +00:00
|
|
|
{
|
|
|
|
pr_info("MEMBLOCK configuration:\n");
|
2017-02-22 23:46:42 +00:00
|
|
|
pr_info(" memory size = %pa reserved size = %pa\n",
|
|
|
|
&memblock.memory.total_size,
|
|
|
|
&memblock.reserved.total_size);
|
2010-07-12 04:36:48 +00:00
|
|
|
|
2017-02-24 22:55:59 +00:00
|
|
|
memblock_dump(&memblock.memory);
|
|
|
|
memblock_dump(&memblock.reserved);
|
2017-02-24 22:55:56 +00:00
|
|
|
#ifdef CONFIG_HAVE_MEMBLOCK_PHYS_MAP
|
2017-02-24 22:55:59 +00:00
|
|
|
memblock_dump(&memblock.physmem);
|
2017-02-24 22:55:56 +00:00
|
|
|
#endif
|
2010-07-12 04:36:48 +00:00
|
|
|
}
|
|
|
|
|
2011-12-08 18:22:08 +00:00
|
|
|
void __init memblock_allow_resize(void)
|
2010-07-12 04:36:48 +00:00
|
|
|
{
|
2010-07-06 22:39:13 +00:00
|
|
|
memblock_can_resize = 1;
|
2010-07-12 04:36:48 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static int __init early_memblock(char *p)
|
|
|
|
{
|
|
|
|
if (p && strstr(p, "debug"))
|
|
|
|
memblock_debug = 1;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
early_param("memblock", early_memblock);
|
|
|
|
|
2018-10-30 22:09:40 +00:00
|
|
|
static void __init __free_pages_memory(unsigned long start, unsigned long end)
|
|
|
|
{
|
|
|
|
int order;
|
|
|
|
|
|
|
|
while (start < end) {
|
|
|
|
order = min(MAX_ORDER - 1UL, __ffs(start));
|
|
|
|
|
|
|
|
while (start + (1UL << order) > end)
|
|
|
|
order--;
|
|
|
|
|
|
|
|
memblock_free_pages(pfn_to_page(start), start, order);
|
|
|
|
|
|
|
|
start += (1UL << order);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static unsigned long __init __free_memory_core(phys_addr_t start,
|
|
|
|
phys_addr_t end)
|
|
|
|
{
|
|
|
|
unsigned long start_pfn = PFN_UP(start);
|
|
|
|
unsigned long end_pfn = min_t(unsigned long,
|
|
|
|
PFN_DOWN(end), max_low_pfn);
|
|
|
|
|
|
|
|
if (start_pfn >= end_pfn)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
__free_pages_memory(start_pfn, end_pfn);
|
|
|
|
|
|
|
|
return end_pfn - start_pfn;
|
|
|
|
}
|
|
|
|
|
|
|
|
static unsigned long __init free_low_memory_core_early(void)
|
|
|
|
{
|
|
|
|
unsigned long count = 0;
|
|
|
|
phys_addr_t start, end;
|
|
|
|
u64 i;
|
|
|
|
|
|
|
|
memblock_clear_hotplug(0, -1);
|
|
|
|
|
|
|
|
for_each_reserved_mem_region(i, &start, &end)
|
|
|
|
reserve_bootmem_region(start, end);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* We need to use NUMA_NO_NODE instead of NODE_DATA(0)->node_id
|
|
|
|
* because in some case like Node0 doesn't have RAM installed
|
|
|
|
* low ram will be on Node1
|
|
|
|
*/
|
|
|
|
for_each_free_mem_range(i, NUMA_NO_NODE, MEMBLOCK_NONE, &start, &end,
|
|
|
|
NULL)
|
|
|
|
count += __free_memory_core(start, end);
|
|
|
|
|
|
|
|
return count;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int reset_managed_pages_done __initdata;
|
|
|
|
|
|
|
|
void reset_node_managed_pages(pg_data_t *pgdat)
|
|
|
|
{
|
|
|
|
struct zone *z;
|
|
|
|
|
|
|
|
for (z = pgdat->node_zones; z < pgdat->node_zones + MAX_NR_ZONES; z++)
|
2018-12-28 08:34:24 +00:00
|
|
|
atomic_long_set(&z->managed_pages, 0);
|
2018-10-30 22:09:40 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void __init reset_all_zones_managed_pages(void)
|
|
|
|
{
|
|
|
|
struct pglist_data *pgdat;
|
|
|
|
|
|
|
|
if (reset_managed_pages_done)
|
|
|
|
return;
|
|
|
|
|
|
|
|
for_each_online_pgdat(pgdat)
|
|
|
|
reset_node_managed_pages(pgdat);
|
|
|
|
|
|
|
|
reset_managed_pages_done = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* memblock_free_all - release free pages to the buddy allocator
|
|
|
|
*
|
|
|
|
* Return: the number of pages actually released.
|
|
|
|
*/
|
|
|
|
unsigned long __init memblock_free_all(void)
|
|
|
|
{
|
|
|
|
unsigned long pages;
|
|
|
|
|
|
|
|
reset_all_zones_managed_pages();
|
|
|
|
|
|
|
|
pages = free_low_memory_core_early();
|
2018-12-28 08:34:29 +00:00
|
|
|
totalram_pages_add(pages);
|
2018-10-30 22:09:40 +00:00
|
|
|
|
|
|
|
return pages;
|
|
|
|
}
|
|
|
|
|
2011-07-14 09:46:03 +00:00
|
|
|
#if defined(CONFIG_DEBUG_FS) && !defined(CONFIG_ARCH_DISCARD_MEMBLOCK)
|
2010-07-06 22:39:19 +00:00
|
|
|
|
|
|
|
static int memblock_debug_show(struct seq_file *m, void *private)
|
|
|
|
{
|
|
|
|
struct memblock_type *type = m->private;
|
|
|
|
struct memblock_region *reg;
|
|
|
|
int i;
|
2017-02-22 23:46:42 +00:00
|
|
|
phys_addr_t end;
|
2010-07-06 22:39:19 +00:00
|
|
|
|
|
|
|
for (i = 0; i < type->cnt; i++) {
|
|
|
|
reg = &type->regions[i];
|
2017-02-22 23:46:42 +00:00
|
|
|
end = reg->base + reg->size - 1;
|
2010-07-06 22:39:19 +00:00
|
|
|
|
2017-02-22 23:46:42 +00:00
|
|
|
seq_printf(m, "%4d: ", i);
|
|
|
|
seq_printf(m, "%pa..%pa\n", ®->base, &end);
|
2010-07-06 22:39:19 +00:00
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
2018-04-05 23:23:16 +00:00
|
|
|
DEFINE_SHOW_ATTRIBUTE(memblock_debug);
|
2010-07-06 22:39:19 +00:00
|
|
|
|
|
|
|
static int __init memblock_init_debugfs(void)
|
|
|
|
{
|
|
|
|
struct dentry *root = debugfs_create_dir("memblock", NULL);
|
|
|
|
if (!root)
|
|
|
|
return -ENXIO;
|
2018-06-14 22:27:58 +00:00
|
|
|
debugfs_create_file("memory", 0444, root,
|
|
|
|
&memblock.memory, &memblock_debug_fops);
|
|
|
|
debugfs_create_file("reserved", 0444, root,
|
|
|
|
&memblock.reserved, &memblock_debug_fops);
|
2014-01-29 17:16:01 +00:00
|
|
|
#ifdef CONFIG_HAVE_MEMBLOCK_PHYS_MAP
|
2018-06-14 22:27:58 +00:00
|
|
|
debugfs_create_file("physmem", 0444, root,
|
|
|
|
&memblock.physmem, &memblock_debug_fops);
|
2014-01-29 17:16:01 +00:00
|
|
|
#endif
|
2010-07-06 22:39:19 +00:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
__initcall(memblock_init_debugfs);
|
|
|
|
|
|
|
|
#endif /* CONFIG_DEBUG_FS */
|