2019-05-27 06:55:01 +00:00
|
|
|
/* SPDX-License-Identifier: GPL-2.0-or-later */
|
2010-07-12 04:36:09 +00:00
|
|
|
#ifndef _LINUX_MEMBLOCK_H
|
|
|
|
#define _LINUX_MEMBLOCK_H
|
|
|
|
#ifdef __KERNEL__
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Logical memory blocks.
|
|
|
|
*
|
|
|
|
* Copyright (C) 2001 Peter Bergner, IBM Corp.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/init.h>
|
|
|
|
#include <linux/mm.h>
|
2018-10-30 22:09:49 +00:00
|
|
|
#include <asm/dma.h>
|
|
|
|
|
|
|
|
extern unsigned long max_low_pfn;
|
|
|
|
extern unsigned long min_low_pfn;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* highest page
|
|
|
|
*/
|
|
|
|
extern unsigned long max_pfn;
|
|
|
|
/*
|
|
|
|
* highest possible page
|
|
|
|
*/
|
|
|
|
extern unsigned long long max_possible_pfn;
|
2010-07-12 04:36:09 +00:00
|
|
|
|
2018-06-30 14:55:04 +00:00
|
|
|
/**
|
|
|
|
* enum memblock_flags - definition of memory region attributes
|
|
|
|
* @MEMBLOCK_NONE: no special request
|
|
|
|
* @MEMBLOCK_HOTPLUG: hotpluggable region
|
|
|
|
* @MEMBLOCK_MIRROR: mirrored region
|
|
|
|
* @MEMBLOCK_NOMAP: don't add to kernel direct mapping
|
|
|
|
*/
|
2018-06-30 14:55:01 +00:00
|
|
|
enum memblock_flags {
|
2015-06-24 23:58:09 +00:00
|
|
|
MEMBLOCK_NONE = 0x0, /* No special request */
|
|
|
|
MEMBLOCK_HOTPLUG = 0x1, /* hotpluggable region */
|
2015-06-24 23:58:12 +00:00
|
|
|
MEMBLOCK_MIRROR = 0x2, /* mirrored region */
|
2015-11-30 12:28:15 +00:00
|
|
|
MEMBLOCK_NOMAP = 0x4, /* don't add to kernel direct mapping */
|
2015-06-24 23:58:09 +00:00
|
|
|
};
|
2014-01-21 23:49:23 +00:00
|
|
|
|
2018-06-30 14:55:04 +00:00
|
|
|
/**
|
|
|
|
* struct memblock_region - represents a memory region
|
2020-06-03 23:03:28 +00:00
|
|
|
* @base: base address of the region
|
2018-06-30 14:55:04 +00:00
|
|
|
* @size: size of the region
|
|
|
|
* @flags: memory region attributes
|
|
|
|
* @nid: NUMA node id
|
|
|
|
*/
|
2010-08-04 04:06:41 +00:00
|
|
|
struct memblock_region {
|
2010-08-04 03:34:42 +00:00
|
|
|
phys_addr_t base;
|
|
|
|
phys_addr_t size;
|
2018-06-30 14:55:01 +00:00
|
|
|
enum memblock_flags flags;
|
2020-06-03 22:57:02 +00:00
|
|
|
#ifdef CONFIG_NEED_MULTIPLE_NODES
|
2011-07-14 09:43:42 +00:00
|
|
|
int nid;
|
|
|
|
#endif
|
2010-07-12 04:36:09 +00:00
|
|
|
};
|
|
|
|
|
2018-06-30 14:55:04 +00:00
|
|
|
/**
|
|
|
|
* struct memblock_type - collection of memory regions of certain type
|
|
|
|
* @cnt: number of regions
|
|
|
|
* @max: size of the allocated array
|
|
|
|
* @total_size: size of all regions
|
|
|
|
* @regions: array of regions
|
|
|
|
* @name: the memory type symbolic name
|
|
|
|
*/
|
2010-08-04 04:06:41 +00:00
|
|
|
struct memblock_type {
|
2018-06-30 14:55:04 +00:00
|
|
|
unsigned long cnt;
|
|
|
|
unsigned long max;
|
|
|
|
phys_addr_t total_size;
|
2010-07-06 22:39:06 +00:00
|
|
|
struct memblock_region *regions;
|
2017-02-24 22:55:59 +00:00
|
|
|
char *name;
|
2010-07-12 04:36:09 +00:00
|
|
|
};
|
|
|
|
|
2018-06-30 14:55:04 +00:00
|
|
|
/**
|
|
|
|
* struct memblock - memblock allocator metadata
|
|
|
|
* @bottom_up: is bottom up direction?
|
|
|
|
* @current_limit: physical address of the current allocation limit
|
2020-06-03 23:03:28 +00:00
|
|
|
* @memory: usable memory regions
|
2018-06-30 14:55:04 +00:00
|
|
|
* @reserved: reserved memory regions
|
|
|
|
*/
|
2010-07-12 04:36:09 +00:00
|
|
|
struct memblock {
|
2013-11-12 23:07:59 +00:00
|
|
|
bool bottom_up; /* is bottom up direction? */
|
2010-08-04 03:34:42 +00:00
|
|
|
phys_addr_t current_limit;
|
2010-08-04 04:06:41 +00:00
|
|
|
struct memblock_type memory;
|
|
|
|
struct memblock_type reserved;
|
2010-07-12 04:36:09 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
extern struct memblock memblock;
|
2010-07-28 05:07:21 +00:00
|
|
|
|
2019-05-14 00:22:59 +00:00
|
|
|
#ifndef CONFIG_ARCH_KEEP_MEMBLOCK
|
2016-01-16 00:57:11 +00:00
|
|
|
#define __init_memblock __meminit
|
|
|
|
#define __initdata_memblock __meminitdata
|
2017-08-18 22:16:05 +00:00
|
|
|
void memblock_discard(void);
|
2016-01-16 00:57:11 +00:00
|
|
|
#else
|
|
|
|
#define __init_memblock
|
|
|
|
#define __initdata_memblock
|
2019-05-14 00:22:59 +00:00
|
|
|
static inline void memblock_discard(void) {}
|
2016-01-16 00:57:11 +00:00
|
|
|
#endif
|
|
|
|
|
2011-07-12 07:58:10 +00:00
|
|
|
phys_addr_t memblock_find_in_range(phys_addr_t start, phys_addr_t end,
|
|
|
|
phys_addr_t size, phys_addr_t align);
|
2011-12-08 18:22:08 +00:00
|
|
|
void memblock_allow_resize(void);
|
2011-12-08 18:22:08 +00:00
|
|
|
int memblock_add_node(phys_addr_t base, phys_addr_t size, int nid);
|
2011-12-08 18:22:06 +00:00
|
|
|
int memblock_add(phys_addr_t base, phys_addr_t size);
|
|
|
|
int memblock_remove(phys_addr_t base, phys_addr_t size);
|
|
|
|
int memblock_free(phys_addr_t base, phys_addr_t size);
|
|
|
|
int memblock_reserve(phys_addr_t base, phys_addr_t size);
|
2020-01-31 06:14:20 +00:00
|
|
|
#ifdef CONFIG_HAVE_MEMBLOCK_PHYS_MAP
|
|
|
|
int memblock_physmem_add(phys_addr_t base, phys_addr_t size);
|
|
|
|
#endif
|
2012-10-22 23:35:18 +00:00
|
|
|
void memblock_trim_memory(phys_addr_t align);
|
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 memblock_overlaps_region(struct memblock_type *type,
|
|
|
|
phys_addr_t base, phys_addr_t size);
|
2014-01-21 23:49:23 +00:00
|
|
|
int memblock_mark_hotplug(phys_addr_t base, phys_addr_t size);
|
|
|
|
int memblock_clear_hotplug(phys_addr_t base, phys_addr_t size);
|
2015-06-24 23:58:12 +00:00
|
|
|
int memblock_mark_mirror(phys_addr_t base, phys_addr_t size);
|
2015-11-30 12:28:15 +00:00
|
|
|
int memblock_mark_nomap(phys_addr_t base, phys_addr_t size);
|
2017-04-03 02:23:54 +00:00
|
|
|
int memblock_clear_nomap(phys_addr_t base, phys_addr_t size);
|
2014-01-29 17:16:01 +00:00
|
|
|
|
2018-10-30 22:09:49 +00:00
|
|
|
unsigned long memblock_free_all(void);
|
|
|
|
void reset_node_managed_pages(pg_data_t *pgdat);
|
|
|
|
void reset_all_zones_managed_pages(void);
|
|
|
|
|
2014-01-29 17:16:01 +00:00
|
|
|
/* Low level functions */
|
2018-06-30 14:55:01 +00:00
|
|
|
void __next_mem_range(u64 *idx, int nid, enum memblock_flags flags,
|
2015-06-24 23:58:09 +00:00
|
|
|
struct memblock_type *type_a,
|
2014-01-29 17:16:01 +00:00
|
|
|
struct memblock_type *type_b, phys_addr_t *out_start,
|
|
|
|
phys_addr_t *out_end, int *out_nid);
|
|
|
|
|
2018-06-30 14:55:01 +00:00
|
|
|
void __next_mem_range_rev(u64 *idx, int nid, enum memblock_flags flags,
|
2015-06-24 23:58:09 +00:00
|
|
|
struct memblock_type *type_a,
|
2014-01-29 17:16:01 +00:00
|
|
|
struct memblock_type *type_b, phys_addr_t *out_start,
|
|
|
|
phys_addr_t *out_end, int *out_nid);
|
|
|
|
|
2017-08-18 22:16:05 +00:00
|
|
|
void __memblock_free_late(phys_addr_t base, phys_addr_t size);
|
|
|
|
|
2020-07-01 14:18:29 +00:00
|
|
|
#ifdef CONFIG_HAVE_MEMBLOCK_PHYS_MAP
|
|
|
|
static inline void __next_physmem_range(u64 *idx, struct memblock_type *type,
|
|
|
|
phys_addr_t *out_start,
|
|
|
|
phys_addr_t *out_end)
|
|
|
|
{
|
|
|
|
extern struct memblock_type physmem;
|
|
|
|
|
|
|
|
__next_mem_range(idx, NUMA_NO_NODE, MEMBLOCK_NONE, &physmem, type,
|
|
|
|
out_start, out_end, NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* for_each_physmem_range - iterate through physmem areas not included in type.
|
|
|
|
* @i: u64 used as loop variable
|
|
|
|
* @type: ptr to memblock_type which excludes from the iteration, can be %NULL
|
|
|
|
* @p_start: ptr to phys_addr_t for start address of the range, can be %NULL
|
|
|
|
* @p_end: ptr to phys_addr_t for end address of the range, can be %NULL
|
|
|
|
*/
|
|
|
|
#define for_each_physmem_range(i, type, p_start, p_end) \
|
|
|
|
for (i = 0, __next_physmem_range(&i, type, p_start, p_end); \
|
|
|
|
i != (u64)ULLONG_MAX; \
|
|
|
|
__next_physmem_range(&i, type, p_start, p_end))
|
|
|
|
#endif /* CONFIG_HAVE_MEMBLOCK_PHYS_MAP */
|
|
|
|
|
2014-01-29 17:16:01 +00:00
|
|
|
/**
|
2020-10-13 23:57:59 +00:00
|
|
|
* __for_each_mem_range - iterate through memblock areas from type_a and not
|
2014-01-29 17:16:01 +00:00
|
|
|
* included in type_b. Or just type_a if type_b is NULL.
|
|
|
|
* @i: u64 used as loop variable
|
|
|
|
* @type_a: ptr to memblock_type to iterate
|
|
|
|
* @type_b: ptr to memblock_type which excludes from the iteration
|
|
|
|
* @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
|
|
|
* @p_start: ptr to phys_addr_t for start address of the range, can be %NULL
|
|
|
|
* @p_end: ptr to phys_addr_t for end address of the range, can be %NULL
|
|
|
|
* @p_nid: ptr to int for nid of the range, can be %NULL
|
|
|
|
*/
|
2020-10-13 23:57:59 +00:00
|
|
|
#define __for_each_mem_range(i, type_a, type_b, nid, flags, \
|
2014-01-29 17:16:01 +00:00
|
|
|
p_start, p_end, p_nid) \
|
2015-06-24 23:58:09 +00:00
|
|
|
for (i = 0, __next_mem_range(&i, nid, flags, type_a, type_b, \
|
2014-01-29 17:16:01 +00:00
|
|
|
p_start, p_end, p_nid); \
|
|
|
|
i != (u64)ULLONG_MAX; \
|
2015-06-24 23:58:09 +00:00
|
|
|
__next_mem_range(&i, nid, flags, type_a, type_b, \
|
2014-01-29 17:16:01 +00:00
|
|
|
p_start, p_end, p_nid))
|
|
|
|
|
|
|
|
/**
|
2020-10-13 23:57:59 +00:00
|
|
|
* __for_each_mem_range_rev - reverse iterate through memblock areas from
|
2014-01-29 17:16:01 +00:00
|
|
|
* type_a and not included in type_b. Or just type_a if type_b is NULL.
|
|
|
|
* @i: u64 used as loop variable
|
|
|
|
* @type_a: ptr to memblock_type to iterate
|
|
|
|
* @type_b: ptr to memblock_type which excludes from the iteration
|
|
|
|
* @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
|
|
|
* @p_start: ptr to phys_addr_t for start address of the range, can be %NULL
|
|
|
|
* @p_end: ptr to phys_addr_t for end address of the range, can be %NULL
|
|
|
|
* @p_nid: ptr to int for nid of the range, can be %NULL
|
|
|
|
*/
|
2020-10-13 23:57:59 +00:00
|
|
|
#define __for_each_mem_range_rev(i, type_a, type_b, nid, flags, \
|
|
|
|
p_start, p_end, p_nid) \
|
2014-01-29 17:16:01 +00:00
|
|
|
for (i = (u64)ULLONG_MAX, \
|
2020-10-13 23:57:59 +00:00
|
|
|
__next_mem_range_rev(&i, nid, flags, type_a, type_b, \
|
2016-07-26 22:24:47 +00:00
|
|
|
p_start, p_end, p_nid); \
|
2014-01-29 17:16:01 +00:00
|
|
|
i != (u64)ULLONG_MAX; \
|
2015-06-24 23:58:09 +00:00
|
|
|
__next_mem_range_rev(&i, nid, flags, type_a, type_b, \
|
2014-01-29 17:16:01 +00:00
|
|
|
p_start, p_end, p_nid))
|
|
|
|
|
2020-10-13 23:57:59 +00:00
|
|
|
/**
|
|
|
|
* for_each_mem_range - iterate through memory areas.
|
|
|
|
* @i: u64 used as loop variable
|
|
|
|
* @p_start: ptr to phys_addr_t for start address of the range, can be %NULL
|
|
|
|
* @p_end: ptr to phys_addr_t for end address of the range, can be %NULL
|
|
|
|
*/
|
|
|
|
#define for_each_mem_range(i, p_start, p_end) \
|
|
|
|
__for_each_mem_range(i, &memblock.memory, NULL, NUMA_NO_NODE, \
|
memblock: make for_each_mem_range() traverse MEMBLOCK_HOTPLUG regions
commit 79e482e9c3ae86e849c701c846592e72baddda5a upstream.
Commit b10d6bca8720 ("arch, drivers: replace for_each_membock() with
for_each_mem_range()") didn't take into account that when there is
movable_node parameter in the kernel command line, for_each_mem_range()
would skip ranges marked with MEMBLOCK_HOTPLUG.
The page table setup code in POWER uses for_each_mem_range() to create
the linear mapping of the physical memory and since the regions marked
as MEMORY_HOTPLUG are skipped, they never make it to the linear map.
A later access to the memory in those ranges will fail:
BUG: Unable to handle kernel data access on write at 0xc000000400000000
Faulting instruction address: 0xc00000000008a3c0
Oops: Kernel access of bad area, sig: 11 [#1]
LE PAGE_SIZE=64K MMU=Radix SMP NR_CPUS=2048 NUMA pSeries
Modules linked in:
CPU: 0 PID: 53 Comm: kworker/u2:0 Not tainted 5.13.0 #7
NIP: c00000000008a3c0 LR: c0000000003c1ed8 CTR: 0000000000000040
REGS: c000000008a57770 TRAP: 0300 Not tainted (5.13.0)
MSR: 8000000002009033 <SF,VEC,EE,ME,IR,DR,RI,LE> CR: 84222202 XER: 20040000
CFAR: c0000000003c1ed4 DAR: c000000400000000 DSISR: 42000000 IRQMASK: 0
GPR00: c0000000003c1ed8 c000000008a57a10 c0000000019da700 c000000400000000
GPR04: 0000000000000280 0000000000000180 0000000000000400 0000000000000200
GPR08: 0000000000000100 0000000000000080 0000000000000040 0000000000000300
GPR12: 0000000000000380 c000000001bc0000 c0000000001660c8 c000000006337e00
GPR16: 0000000000000000 0000000000000000 0000000000000000 0000000000000000
GPR20: 0000000040000000 0000000020000000 c000000001a81990 c000000008c30000
GPR24: c000000008c20000 c000000001a81998 000fffffffff0000 c000000001a819a0
GPR28: c000000001a81908 c00c000001000000 c000000008c40000 c000000008a64680
NIP clear_user_page+0x50/0x80
LR __handle_mm_fault+0xc88/0x1910
Call Trace:
__handle_mm_fault+0xc44/0x1910 (unreliable)
handle_mm_fault+0x130/0x2a0
__get_user_pages+0x248/0x610
__get_user_pages_remote+0x12c/0x3e0
get_arg_page+0x54/0xf0
copy_string_kernel+0x11c/0x210
kernel_execve+0x16c/0x220
call_usermodehelper_exec_async+0x1b0/0x2f0
ret_from_kernel_thread+0x5c/0x70
Instruction dump:
79280fa4 79271764 79261f24 794ae8e2 7ca94214 7d683a14 7c893a14 7d893050
7d4903a6 60000000 60000000 60000000 <7c001fec> 7c091fec 7c081fec 7c051fec
---[ end trace 490b8c67e6075e09 ]---
Making for_each_mem_range() include MEMBLOCK_HOTPLUG regions in the
traversal fixes this issue.
Link: https://bugzilla.redhat.com/show_bug.cgi?id=1976100
Link: https://lkml.kernel.org/r/20210712071132.20902-1-rppt@kernel.org
Fixes: b10d6bca8720 ("arch, drivers: replace for_each_membock() with for_each_mem_range()")
Signed-off-by: Mike Rapoport <rppt@linux.ibm.com>
Tested-by: Greg Kurz <groug@kaod.org>
Reviewed-by: David Hildenbrand <david@redhat.com>
Cc: <stable@vger.kernel.org> [5.10+]
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2021-07-23 22:50:26 +00:00
|
|
|
MEMBLOCK_HOTPLUG, p_start, p_end, NULL)
|
2020-10-13 23:57:59 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
* for_each_mem_range_rev - reverse iterate through memblock areas from
|
|
|
|
* type_a and not included in type_b. Or just type_a if type_b is NULL.
|
|
|
|
* @i: u64 used as loop variable
|
|
|
|
* @p_start: ptr to phys_addr_t for start address of the range, can be %NULL
|
|
|
|
* @p_end: ptr to phys_addr_t for end address of the range, can be %NULL
|
|
|
|
*/
|
|
|
|
#define for_each_mem_range_rev(i, p_start, p_end) \
|
|
|
|
__for_each_mem_range_rev(i, &memblock.memory, NULL, NUMA_NO_NODE, \
|
memblock: make for_each_mem_range() traverse MEMBLOCK_HOTPLUG regions
commit 79e482e9c3ae86e849c701c846592e72baddda5a upstream.
Commit b10d6bca8720 ("arch, drivers: replace for_each_membock() with
for_each_mem_range()") didn't take into account that when there is
movable_node parameter in the kernel command line, for_each_mem_range()
would skip ranges marked with MEMBLOCK_HOTPLUG.
The page table setup code in POWER uses for_each_mem_range() to create
the linear mapping of the physical memory and since the regions marked
as MEMORY_HOTPLUG are skipped, they never make it to the linear map.
A later access to the memory in those ranges will fail:
BUG: Unable to handle kernel data access on write at 0xc000000400000000
Faulting instruction address: 0xc00000000008a3c0
Oops: Kernel access of bad area, sig: 11 [#1]
LE PAGE_SIZE=64K MMU=Radix SMP NR_CPUS=2048 NUMA pSeries
Modules linked in:
CPU: 0 PID: 53 Comm: kworker/u2:0 Not tainted 5.13.0 #7
NIP: c00000000008a3c0 LR: c0000000003c1ed8 CTR: 0000000000000040
REGS: c000000008a57770 TRAP: 0300 Not tainted (5.13.0)
MSR: 8000000002009033 <SF,VEC,EE,ME,IR,DR,RI,LE> CR: 84222202 XER: 20040000
CFAR: c0000000003c1ed4 DAR: c000000400000000 DSISR: 42000000 IRQMASK: 0
GPR00: c0000000003c1ed8 c000000008a57a10 c0000000019da700 c000000400000000
GPR04: 0000000000000280 0000000000000180 0000000000000400 0000000000000200
GPR08: 0000000000000100 0000000000000080 0000000000000040 0000000000000300
GPR12: 0000000000000380 c000000001bc0000 c0000000001660c8 c000000006337e00
GPR16: 0000000000000000 0000000000000000 0000000000000000 0000000000000000
GPR20: 0000000040000000 0000000020000000 c000000001a81990 c000000008c30000
GPR24: c000000008c20000 c000000001a81998 000fffffffff0000 c000000001a819a0
GPR28: c000000001a81908 c00c000001000000 c000000008c40000 c000000008a64680
NIP clear_user_page+0x50/0x80
LR __handle_mm_fault+0xc88/0x1910
Call Trace:
__handle_mm_fault+0xc44/0x1910 (unreliable)
handle_mm_fault+0x130/0x2a0
__get_user_pages+0x248/0x610
__get_user_pages_remote+0x12c/0x3e0
get_arg_page+0x54/0xf0
copy_string_kernel+0x11c/0x210
kernel_execve+0x16c/0x220
call_usermodehelper_exec_async+0x1b0/0x2f0
ret_from_kernel_thread+0x5c/0x70
Instruction dump:
79280fa4 79271764 79261f24 794ae8e2 7ca94214 7d683a14 7c893a14 7d893050
7d4903a6 60000000 60000000 60000000 <7c001fec> 7c091fec 7c081fec 7c051fec
---[ end trace 490b8c67e6075e09 ]---
Making for_each_mem_range() include MEMBLOCK_HOTPLUG regions in the
traversal fixes this issue.
Link: https://bugzilla.redhat.com/show_bug.cgi?id=1976100
Link: https://lkml.kernel.org/r/20210712071132.20902-1-rppt@kernel.org
Fixes: b10d6bca8720 ("arch, drivers: replace for_each_membock() with for_each_mem_range()")
Signed-off-by: Mike Rapoport <rppt@linux.ibm.com>
Tested-by: Greg Kurz <groug@kaod.org>
Reviewed-by: David Hildenbrand <david@redhat.com>
Cc: <stable@vger.kernel.org> [5.10+]
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2021-07-23 22:50:26 +00:00
|
|
|
MEMBLOCK_HOTPLUG, p_start, p_end, NULL)
|
2020-10-13 23:57:59 +00:00
|
|
|
|
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
|
|
|
/**
|
2020-10-13 23:58:25 +00:00
|
|
|
* for_each_reserved_mem_range - iterate over all reserved memblock areas
|
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
|
|
|
* @i: u64 used as loop variable
|
|
|
|
* @p_start: ptr to phys_addr_t for start address of the range, can be %NULL
|
|
|
|
* @p_end: ptr to phys_addr_t for end address of the range, can be %NULL
|
|
|
|
*
|
|
|
|
* Walks over reserved areas of memblock. Available as soon as memblock
|
|
|
|
* is initialized.
|
|
|
|
*/
|
2020-10-13 23:58:25 +00:00
|
|
|
#define for_each_reserved_mem_range(i, p_start, p_end) \
|
|
|
|
__for_each_mem_range(i, &memblock.reserved, NULL, NUMA_NO_NODE, \
|
|
|
|
MEMBLOCK_NONE, p_start, p_end, NULL)
|
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
|
|
|
|
2014-01-21 23:49:35 +00:00
|
|
|
static inline bool memblock_is_hotpluggable(struct memblock_region *m)
|
|
|
|
{
|
|
|
|
return m->flags & MEMBLOCK_HOTPLUG;
|
|
|
|
}
|
|
|
|
|
2015-06-24 23:58:12 +00:00
|
|
|
static inline bool memblock_is_mirror(struct memblock_region *m)
|
|
|
|
{
|
|
|
|
return m->flags & MEMBLOCK_MIRROR;
|
|
|
|
}
|
|
|
|
|
2015-11-30 12:28:15 +00:00
|
|
|
static inline bool memblock_is_nomap(struct memblock_region *m)
|
|
|
|
{
|
|
|
|
return m->flags & MEMBLOCK_NOMAP;
|
|
|
|
}
|
|
|
|
|
2013-09-11 21:22:17 +00:00
|
|
|
int memblock_search_pfn_nid(unsigned long pfn, unsigned long *start_pfn,
|
|
|
|
unsigned long *end_pfn);
|
2011-12-08 18:22:09 +00:00
|
|
|
void __next_mem_pfn_range(int *idx, int nid, unsigned long *out_start_pfn,
|
|
|
|
unsigned long *out_end_pfn, int *out_nid);
|
|
|
|
|
|
|
|
/**
|
|
|
|
* for_each_mem_pfn_range - early memory pfn range iterator
|
|
|
|
* @i: an integer used as loop variable
|
|
|
|
* @nid: node selector, %MAX_NUMNODES for all nodes
|
|
|
|
* @p_start: ptr to ulong for start pfn of the range, can be %NULL
|
|
|
|
* @p_end: ptr to ulong for end pfn of the range, can be %NULL
|
|
|
|
* @p_nid: ptr to int for nid of the range, can be %NULL
|
|
|
|
*
|
2012-10-08 23:32:24 +00:00
|
|
|
* Walks over configured memory ranges.
|
2011-12-08 18:22:09 +00:00
|
|
|
*/
|
|
|
|
#define for_each_mem_pfn_range(i, nid, p_start, p_end, p_nid) \
|
|
|
|
for (i = -1, __next_mem_pfn_range(&i, nid, p_start, p_end, p_nid); \
|
|
|
|
i >= 0; __next_mem_pfn_range(&i, nid, p_start, p_end, p_nid))
|
|
|
|
|
2019-05-14 00:21:17 +00:00
|
|
|
#ifdef CONFIG_DEFERRED_STRUCT_PAGE_INIT
|
|
|
|
void __next_mem_pfn_range_in_zone(u64 *idx, struct zone *zone,
|
|
|
|
unsigned long *out_spfn,
|
|
|
|
unsigned long *out_epfn);
|
|
|
|
/**
|
|
|
|
* for_each_free_mem_range_in_zone - iterate through zone specific free
|
|
|
|
* memblock areas
|
|
|
|
* @i: u64 used as loop variable
|
|
|
|
* @zone: zone in which all of the memory blocks reside
|
|
|
|
* @p_start: ptr to phys_addr_t for start address of the range, can be %NULL
|
|
|
|
* @p_end: ptr to phys_addr_t for end address of the range, can be %NULL
|
|
|
|
*
|
|
|
|
* Walks over free (memory && !reserved) areas of memblock in a specific
|
|
|
|
* zone. Available once memblock and an empty zone is initialized. The main
|
|
|
|
* assumption is that the zone start, end, and pgdat have been associated.
|
|
|
|
* This way we can use the zone to determine NUMA node, and if a given part
|
|
|
|
* of the memblock is valid for the zone.
|
|
|
|
*/
|
|
|
|
#define for_each_free_mem_pfn_range_in_zone(i, zone, p_start, p_end) \
|
|
|
|
for (i = 0, \
|
|
|
|
__next_mem_pfn_range_in_zone(&i, zone, p_start, p_end); \
|
|
|
|
i != U64_MAX; \
|
|
|
|
__next_mem_pfn_range_in_zone(&i, zone, p_start, p_end))
|
2019-05-14 00:21:20 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
* for_each_free_mem_range_in_zone_from - iterate through zone specific
|
|
|
|
* free memblock areas from a given point
|
|
|
|
* @i: u64 used as loop variable
|
|
|
|
* @zone: zone in which all of the memory blocks reside
|
|
|
|
* @p_start: ptr to phys_addr_t for start address of the range, can be %NULL
|
|
|
|
* @p_end: ptr to phys_addr_t for end address of the range, can be %NULL
|
|
|
|
*
|
|
|
|
* Walks over free (memory && !reserved) areas of memblock in a specific
|
|
|
|
* zone, continuing from current position. Available as soon as memblock is
|
|
|
|
* initialized.
|
|
|
|
*/
|
|
|
|
#define for_each_free_mem_pfn_range_in_zone_from(i, zone, p_start, p_end) \
|
|
|
|
for (; i != U64_MAX; \
|
|
|
|
__next_mem_pfn_range_in_zone(&i, zone, p_start, p_end))
|
2020-06-03 22:59:55 +00:00
|
|
|
|
|
|
|
int __init deferred_page_init_max_threads(const struct cpumask *node_cpumask);
|
|
|
|
|
2019-05-14 00:21:17 +00:00
|
|
|
#endif /* CONFIG_DEFERRED_STRUCT_PAGE_INIT */
|
|
|
|
|
2011-07-12 09:15:59 +00:00
|
|
|
/**
|
|
|
|
* for_each_free_mem_range - iterate through free memblock areas
|
|
|
|
* @i: u64 used as loop variable
|
2014-01-21 23:50:16 +00:00
|
|
|
* @nid: node selector, %NUMA_NO_NODE for all nodes
|
2016-01-14 23:22:04 +00:00
|
|
|
* @flags: pick from blocks based on memory attributes
|
2011-07-12 09:15:59 +00:00
|
|
|
* @p_start: ptr to phys_addr_t for start address of the range, can be %NULL
|
|
|
|
* @p_end: ptr to phys_addr_t for end address of the range, can be %NULL
|
|
|
|
* @p_nid: ptr to int for nid of the range, can be %NULL
|
|
|
|
*
|
|
|
|
* Walks over free (memory && !reserved) areas of memblock. Available as
|
|
|
|
* soon as memblock is initialized.
|
|
|
|
*/
|
2015-06-24 23:58:09 +00:00
|
|
|
#define for_each_free_mem_range(i, nid, flags, p_start, p_end, p_nid) \
|
2020-10-13 23:57:59 +00:00
|
|
|
__for_each_mem_range(i, &memblock.memory, &memblock.reserved, \
|
|
|
|
nid, flags, p_start, p_end, p_nid)
|
2011-12-08 18:22:09 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
* for_each_free_mem_range_reverse - rev-iterate through free memblock areas
|
|
|
|
* @i: u64 used as loop variable
|
2014-01-21 23:50:16 +00:00
|
|
|
* @nid: node selector, %NUMA_NO_NODE for all nodes
|
2016-01-14 23:22:04 +00:00
|
|
|
* @flags: pick from blocks based on memory attributes
|
2011-12-08 18:22:09 +00:00
|
|
|
* @p_start: ptr to phys_addr_t for start address of the range, can be %NULL
|
|
|
|
* @p_end: ptr to phys_addr_t for end address of the range, can be %NULL
|
|
|
|
* @p_nid: ptr to int for nid of the range, can be %NULL
|
|
|
|
*
|
|
|
|
* Walks over free (memory && !reserved) areas of memblock in reverse
|
|
|
|
* order. Available as soon as memblock is initialized.
|
|
|
|
*/
|
2015-06-24 23:58:09 +00:00
|
|
|
#define for_each_free_mem_range_reverse(i, nid, flags, p_start, p_end, \
|
|
|
|
p_nid) \
|
2020-10-13 23:57:59 +00:00
|
|
|
__for_each_mem_range_rev(i, &memblock.memory, &memblock.reserved, \
|
|
|
|
nid, flags, p_start, p_end, p_nid)
|
2011-12-08 18:22:09 +00:00
|
|
|
|
2014-01-21 23:49:26 +00:00
|
|
|
int memblock_set_node(phys_addr_t base, phys_addr_t size,
|
|
|
|
struct memblock_type *type, int nid);
|
2011-07-14 09:43:42 +00:00
|
|
|
|
2020-06-03 22:57:02 +00:00
|
|
|
#ifdef CONFIG_NEED_MULTIPLE_NODES
|
2011-07-14 09:43:42 +00:00
|
|
|
static inline void memblock_set_region_node(struct memblock_region *r, int nid)
|
|
|
|
{
|
|
|
|
r->nid = nid;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline int memblock_get_region_node(const struct memblock_region *r)
|
|
|
|
{
|
|
|
|
return r->nid;
|
|
|
|
}
|
|
|
|
#else
|
|
|
|
static inline void memblock_set_region_node(struct memblock_region *r, int nid)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline int memblock_get_region_node(const struct memblock_region *r)
|
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
2020-06-03 22:57:02 +00:00
|
|
|
#endif /* CONFIG_NEED_MULTIPLE_NODES */
|
2011-07-14 09:43:42 +00:00
|
|
|
|
2018-10-30 22:09:49 +00:00
|
|
|
/* Flags for memblock allocation APIs */
|
|
|
|
#define MEMBLOCK_ALLOC_ANYWHERE (~(phys_addr_t)0)
|
|
|
|
#define MEMBLOCK_ALLOC_ACCESSIBLE 0
|
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
|
|
|
#define MEMBLOCK_ALLOC_KASAN 1
|
2018-10-30 22:09:49 +00:00
|
|
|
|
|
|
|
/* We are using top down, so it is safe to use 0 here */
|
|
|
|
#define MEMBLOCK_LOW_LIMIT 0
|
|
|
|
|
|
|
|
#ifndef ARCH_LOW_ADDRESS_LIMIT
|
|
|
|
#define ARCH_LOW_ADDRESS_LIMIT 0xffffffffUL
|
|
|
|
#endif
|
|
|
|
|
2019-03-12 06:29:16 +00:00
|
|
|
phys_addr_t memblock_phys_alloc_range(phys_addr_t size, phys_addr_t align,
|
|
|
|
phys_addr_t start, phys_addr_t end);
|
2020-04-10 21:32:42 +00:00
|
|
|
phys_addr_t memblock_alloc_range_nid(phys_addr_t size,
|
|
|
|
phys_addr_t align, phys_addr_t start,
|
|
|
|
phys_addr_t end, int nid, bool exact_nid);
|
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 memblock_phys_alloc_try_nid(phys_addr_t size, phys_addr_t align, int nid);
|
2010-07-06 22:39:17 +00:00
|
|
|
|
2021-12-17 02:07:54 +00:00
|
|
|
static __always_inline phys_addr_t memblock_phys_alloc(phys_addr_t size,
|
|
|
|
phys_addr_t align)
|
2019-03-12 06:29:26 +00:00
|
|
|
{
|
|
|
|
return memblock_phys_alloc_range(size, align, 0,
|
|
|
|
MEMBLOCK_ALLOC_ACCESSIBLE);
|
|
|
|
}
|
2010-07-06 22:39:01 +00:00
|
|
|
|
2019-12-01 01:56:27 +00:00
|
|
|
void *memblock_alloc_exact_nid_raw(phys_addr_t size, phys_addr_t align,
|
|
|
|
phys_addr_t min_addr, phys_addr_t max_addr,
|
|
|
|
int nid);
|
2018-10-30 22:09:49 +00:00
|
|
|
void *memblock_alloc_try_nid_raw(phys_addr_t size, phys_addr_t align,
|
|
|
|
phys_addr_t min_addr, phys_addr_t max_addr,
|
|
|
|
int nid);
|
|
|
|
void *memblock_alloc_try_nid(phys_addr_t size, phys_addr_t align,
|
|
|
|
phys_addr_t min_addr, phys_addr_t max_addr,
|
|
|
|
int nid);
|
|
|
|
|
|
|
|
static inline void * __init memblock_alloc(phys_addr_t size, phys_addr_t align)
|
|
|
|
{
|
|
|
|
return memblock_alloc_try_nid(size, align, MEMBLOCK_LOW_LIMIT,
|
|
|
|
MEMBLOCK_ALLOC_ACCESSIBLE, NUMA_NO_NODE);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void * __init memblock_alloc_raw(phys_addr_t size,
|
|
|
|
phys_addr_t align)
|
|
|
|
{
|
|
|
|
return memblock_alloc_try_nid_raw(size, align, MEMBLOCK_LOW_LIMIT,
|
|
|
|
MEMBLOCK_ALLOC_ACCESSIBLE,
|
|
|
|
NUMA_NO_NODE);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void * __init memblock_alloc_from(phys_addr_t size,
|
|
|
|
phys_addr_t align,
|
|
|
|
phys_addr_t min_addr)
|
|
|
|
{
|
|
|
|
return memblock_alloc_try_nid(size, align, min_addr,
|
|
|
|
MEMBLOCK_ALLOC_ACCESSIBLE, NUMA_NO_NODE);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void * __init memblock_alloc_low(phys_addr_t size,
|
|
|
|
phys_addr_t align)
|
|
|
|
{
|
|
|
|
return memblock_alloc_try_nid(size, align, MEMBLOCK_LOW_LIMIT,
|
|
|
|
ARCH_LOW_ADDRESS_LIMIT, NUMA_NO_NODE);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void * __init memblock_alloc_node(phys_addr_t size,
|
|
|
|
phys_addr_t align, int nid)
|
|
|
|
{
|
|
|
|
return memblock_alloc_try_nid(size, align, MEMBLOCK_LOW_LIMIT,
|
|
|
|
MEMBLOCK_ALLOC_ACCESSIBLE, nid);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void __init memblock_free_early(phys_addr_t base,
|
|
|
|
phys_addr_t size)
|
|
|
|
{
|
2018-12-28 08:35:29 +00:00
|
|
|
memblock_free(base, size);
|
2018-10-30 22:09:49 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static inline void __init memblock_free_early_nid(phys_addr_t base,
|
|
|
|
phys_addr_t size, int nid)
|
|
|
|
{
|
2018-12-28 08:35:29 +00:00
|
|
|
memblock_free(base, size);
|
2018-10-30 22:09:49 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static inline void __init memblock_free_late(phys_addr_t base, phys_addr_t size)
|
|
|
|
{
|
|
|
|
__memblock_free_late(base, size);
|
|
|
|
}
|
|
|
|
|
2013-11-12 23:07:59 +00:00
|
|
|
/*
|
|
|
|
* Set the allocation direction to bottom-up or top-down.
|
|
|
|
*/
|
2014-08-06 23:05:03 +00:00
|
|
|
static inline void __init memblock_set_bottom_up(bool enable)
|
2013-11-12 23:07:59 +00:00
|
|
|
{
|
|
|
|
memblock.bottom_up = enable;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Check if the allocation direction is bottom-up or not.
|
|
|
|
* if this is true, that said, memblock will allocate memory
|
|
|
|
* in bottom-up direction.
|
|
|
|
*/
|
|
|
|
static inline bool memblock_bottom_up(void)
|
|
|
|
{
|
|
|
|
return memblock.bottom_up;
|
|
|
|
}
|
|
|
|
|
2011-12-08 18:22:06 +00:00
|
|
|
phys_addr_t memblock_phys_mem_size(void);
|
2016-10-07 23:59:18 +00:00
|
|
|
phys_addr_t memblock_reserved_size(void);
|
2011-12-08 18:22:06 +00:00
|
|
|
phys_addr_t memblock_start_of_DRAM(void);
|
|
|
|
phys_addr_t memblock_end_of_DRAM(void);
|
|
|
|
void memblock_enforce_memory_limit(phys_addr_t memory_limit);
|
2017-04-03 02:23:55 +00:00
|
|
|
void memblock_cap_memory_range(phys_addr_t base, phys_addr_t size);
|
2016-07-28 22:48:26 +00:00
|
|
|
void memblock_mem_limit_remove_map(phys_addr_t limit);
|
2016-01-14 23:18:54 +00:00
|
|
|
bool memblock_is_memory(phys_addr_t addr);
|
2018-02-06 23:41:18 +00:00
|
|
|
bool memblock_is_map_memory(phys_addr_t addr);
|
|
|
|
bool memblock_is_region_memory(phys_addr_t base, phys_addr_t size);
|
2016-01-14 23:18:54 +00:00
|
|
|
bool memblock_is_reserved(phys_addr_t addr);
|
2015-09-08 22:02:00 +00:00
|
|
|
bool memblock_is_region_reserved(phys_addr_t base, phys_addr_t size);
|
2011-12-08 18:22:06 +00:00
|
|
|
|
2020-10-13 23:57:54 +00:00
|
|
|
void memblock_dump_all(void);
|
2010-07-12 04:36:09 +00:00
|
|
|
|
2010-07-06 22:39:01 +00:00
|
|
|
/**
|
|
|
|
* memblock_set_current_limit - Set the current allocation limit to allow
|
|
|
|
* limiting allocations to what is currently
|
|
|
|
* accessible during boot
|
|
|
|
* @limit: New limit value (physical address)
|
|
|
|
*/
|
2011-12-08 18:22:06 +00:00
|
|
|
void memblock_set_current_limit(phys_addr_t limit);
|
2010-07-06 22:39:01 +00:00
|
|
|
|
2010-07-06 22:38:58 +00:00
|
|
|
|
2014-02-27 00:23:43 +00:00
|
|
|
phys_addr_t memblock_get_current_limit(void);
|
|
|
|
|
2010-08-04 03:40:38 +00:00
|
|
|
/*
|
|
|
|
* pfn conversion functions
|
|
|
|
*
|
|
|
|
* While the memory MEMBLOCKs should always be page aligned, the reserved
|
|
|
|
* MEMBLOCKs may not be. This accessor attempt to provide a very clear
|
|
|
|
* idea of what they return for such non aligned MEMBLOCKs.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/**
|
2018-06-30 14:55:02 +00:00
|
|
|
* memblock_region_memory_base_pfn - get the lowest pfn of the memory region
|
2010-08-04 03:40:38 +00:00
|
|
|
* @reg: memblock_region structure
|
2018-06-30 14:55:02 +00:00
|
|
|
*
|
|
|
|
* Return: the lowest pfn intersecting with the memory region
|
2010-08-04 03:40:38 +00:00
|
|
|
*/
|
2010-10-12 21:07:09 +00:00
|
|
|
static inline unsigned long memblock_region_memory_base_pfn(const struct memblock_region *reg)
|
2010-08-04 03:40:38 +00:00
|
|
|
{
|
2010-10-12 21:07:09 +00:00
|
|
|
return PFN_UP(reg->base);
|
2010-08-04 03:40:38 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2018-06-30 14:55:02 +00:00
|
|
|
* memblock_region_memory_end_pfn - get the end pfn of the memory region
|
2010-08-04 03:40:38 +00:00
|
|
|
* @reg: memblock_region structure
|
2018-06-30 14:55:02 +00:00
|
|
|
*
|
|
|
|
* Return: the end_pfn of the reserved region
|
2010-08-04 03:40:38 +00:00
|
|
|
*/
|
2010-10-12 21:07:09 +00:00
|
|
|
static inline unsigned long memblock_region_memory_end_pfn(const struct memblock_region *reg)
|
2010-08-04 03:40:38 +00:00
|
|
|
{
|
2010-10-12 21:07:09 +00:00
|
|
|
return PFN_DOWN(reg->base + reg->size);
|
2010-08-04 03:40:38 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2018-06-30 14:55:02 +00:00
|
|
|
* memblock_region_reserved_base_pfn - get the lowest pfn of the reserved region
|
2010-08-04 03:40:38 +00:00
|
|
|
* @reg: memblock_region structure
|
2018-06-30 14:55:02 +00:00
|
|
|
*
|
|
|
|
* Return: the lowest pfn intersecting with the reserved region
|
2010-08-04 03:40:38 +00:00
|
|
|
*/
|
2010-10-12 21:07:09 +00:00
|
|
|
static inline unsigned long memblock_region_reserved_base_pfn(const struct memblock_region *reg)
|
2010-08-04 03:40:38 +00:00
|
|
|
{
|
2010-10-12 21:07:09 +00:00
|
|
|
return PFN_DOWN(reg->base);
|
2010-08-04 03:40:38 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2018-06-30 14:55:02 +00:00
|
|
|
* memblock_region_reserved_end_pfn - get the end pfn of the reserved region
|
2010-08-04 03:40:38 +00:00
|
|
|
* @reg: memblock_region structure
|
2018-06-30 14:55:02 +00:00
|
|
|
*
|
|
|
|
* Return: the end_pfn of the reserved region
|
2010-08-04 03:40:38 +00:00
|
|
|
*/
|
2010-10-12 21:07:09 +00:00
|
|
|
static inline unsigned long memblock_region_reserved_end_pfn(const struct memblock_region *reg)
|
2010-08-04 03:40:38 +00:00
|
|
|
{
|
2010-10-12 21:07:09 +00:00
|
|
|
return PFN_UP(reg->base + reg->size);
|
2010-08-04 03:40:38 +00:00
|
|
|
}
|
|
|
|
|
2020-10-13 23:58:30 +00:00
|
|
|
/**
|
|
|
|
* for_each_mem_region - itereate over memory regions
|
|
|
|
* @region: loop variable
|
|
|
|
*/
|
|
|
|
#define for_each_mem_region(region) \
|
|
|
|
for (region = memblock.memory.regions; \
|
|
|
|
region < (memblock.memory.regions + memblock.memory.cnt); \
|
|
|
|
region++)
|
|
|
|
|
|
|
|
/**
|
|
|
|
* for_each_reserved_mem_region - itereate over reserved memory regions
|
|
|
|
* @region: loop variable
|
|
|
|
*/
|
|
|
|
#define for_each_reserved_mem_region(region) \
|
|
|
|
for (region = memblock.reserved.regions; \
|
|
|
|
region < (memblock.reserved.regions + memblock.reserved.cnt); \
|
2010-08-04 03:40:38 +00:00
|
|
|
region++)
|
|
|
|
|
2018-10-30 22:09:49 +00:00
|
|
|
extern void *alloc_large_system_hash(const char *tablename,
|
|
|
|
unsigned long bucketsize,
|
|
|
|
unsigned long numentries,
|
|
|
|
int scale,
|
|
|
|
int flags,
|
|
|
|
unsigned int *_hash_shift,
|
|
|
|
unsigned int *_hash_mask,
|
|
|
|
unsigned long low_limit,
|
|
|
|
unsigned long high_limit);
|
|
|
|
|
|
|
|
#define HASH_EARLY 0x00000001 /* Allocating during early boot? */
|
|
|
|
#define HASH_SMALL 0x00000002 /* sub-page allocation allowed, min
|
|
|
|
* shift passed via *_hash_shift */
|
|
|
|
#define HASH_ZERO 0x00000004 /* Zero allocated hash table */
|
|
|
|
|
|
|
|
/* Only NUMA needs hash distribution. 64bit NUMA architectures have
|
|
|
|
* sufficient vmalloc space.
|
|
|
|
*/
|
|
|
|
#ifdef CONFIG_NUMA
|
|
|
|
#define HASHDIST_DEFAULT IS_ENABLED(CONFIG_64BIT)
|
|
|
|
extern int hashdist; /* Distribute hashes across NUMA nodes? */
|
|
|
|
#else
|
|
|
|
#define hashdist (0)
|
|
|
|
#endif
|
|
|
|
|
2015-04-14 22:48:27 +00:00
|
|
|
#ifdef CONFIG_MEMTEST
|
2015-04-14 22:48:30 +00:00
|
|
|
extern void early_memtest(phys_addr_t start, phys_addr_t end);
|
2015-04-14 22:48:27 +00:00
|
|
|
#else
|
2015-04-14 22:48:30 +00:00
|
|
|
static inline void early_memtest(phys_addr_t start, phys_addr_t end)
|
2015-04-14 22:48:27 +00:00
|
|
|
{
|
|
|
|
}
|
|
|
|
#endif
|
2010-07-28 05:28:21 +00:00
|
|
|
|
2010-07-12 04:36:09 +00:00
|
|
|
#endif /* __KERNEL__ */
|
|
|
|
|
|
|
|
#endif /* _LINUX_MEMBLOCK_H */
|