From: Zhen Lei <[email protected]>
arm64_memblock_init()
reserve_crashkernel() (1)
paging_init()
map_mem() (2)
unflatten_device_tree or parse ACPI (3)
bootmem_init()
zone_sizes_init()
Update arm64_dma_phys_limit (4)
late_reserve_crashkernel() (5)
For most arm64 platforms, DMA-capable devices can access the whole low 4G
memory without SMMU enabled. So we can directly use SZ_4G as upper limit
to do memblock alloc. However, DMA zone does not cover all the 32-bit
addressable memory on some specific platforms (e.g. 30-bit on Raspberry
Pi 4), and the upper limit of DMA zone (arm64_dma_phys_limit) is updated
after map_mem(), see (3)(4) above. Let's change the allocation direction
of low memory from top-town to bottom-up. In this way, as long as DMA zone
has continuous free memory that meets the size, the memory reserved for
crash will not exceed DMA zone. Of course, it's possible that the DMA zone
is not enough, so add late_reserve_crashkernel() to perform fall back if
need:
1. For case crashkernel=X(offset is not specified)
Fall back to reserve region above DMA zone, and reserve default size of
memory in DMA zone.
2. For case crashkernel=X,high
Fall back to searching the low memory with the specified size in
crashkernel=,high.
In reserve_crashkernel(), the allocation policy is as follows:
low high
|<---DMA---|--------------------->|
| |
|<<<-------------(1)--------------| top-town
|----------------(2)----------->>>| bottom-up
(1) crashkernel=Y,high, upper limit is known, top-town.
(2) crashkernel=Y,low, crashkernel=X, upper limit is unknown, bottom-up.
(x) crashkernel=X@offset, fixed.
Signed-off-by: Zhen Lei <[email protected]>
---
arch/arm64/mm/init.c | 212 ++++++++++++++++++++++++++++++++-----------
1 file changed, 160 insertions(+), 52 deletions(-)
diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c
index d31c3a9290c5524..d2ab377520b2742 100644
--- a/arch/arm64/mm/init.c
+++ b/arch/arm64/mm/init.c
@@ -69,23 +69,168 @@ phys_addr_t __ro_after_init arm64_dma_phys_limit;
#define CRASH_ADDR_LOW_MAX arm64_dma_phys_limit
#define CRASH_ADDR_HIGH_MAX (PHYS_MASK + 1)
-#define CRASH_HIGH_SEARCH_BASE SZ_4G
+#define CRASHKERNEL_TYPE_FIXED_BASE 1
+#define CRASHKERNEL_TYPE_HIGH 2
#define DEFAULT_CRASH_KERNEL_LOW_SIZE (128UL << 20)
+static int crashkernel_type __initdata;
+
+static phys_addr_t __init crashkernel_phys_alloc_range(phys_addr_t size,
+ phys_addr_t start,
+ phys_addr_t end)
+{
+ phys_addr_t base;
+ bool old_direction;
+
+ old_direction = memblock_bottom_up();
+ if (!end) {
+ /* The upper limit is unknown, let's allocate from bottom to up */
+ end = CRASH_ADDR_HIGH_MAX;
+ memblock_set_bottom_up(true);
+ }
+ base = memblock_phys_alloc_range(size, CRASH_ALIGN, start, end);
+ memblock_set_bottom_up(old_direction);
+
+ return base;
+}
+
+static void __init crashkernel_low_rollback(void)
+{
+ if (crashk_low_res.end) {
+ release_resource(&crashk_low_res);
+ memblock_phys_free(crashk_low_res.start, resource_size(&crashk_low_res));
+ crashk_low_res.start = 0;
+ crashk_low_res.end = 0;
+ }
+}
+
+static void __init crashkernel_rollback(void)
+{
+ release_resource(&crashk_res);
+ memblock_phys_free(crashk_res.start, resource_size(&crashk_res));
+ crashk_res.start = 0;
+ crashk_res.end = 0;
+
+ crashkernel_low_rollback();
+}
+
+static void __init late_reserve_crashkernel(void)
+{
+ struct resource *res;
+ unsigned long long low_base, low_size;
+ unsigned long long crash_base, crash_size;
+
+ res = &crashk_res;
+ if (!res->end)
+ return;
+
+ crash_size = resource_size(res);
+ if (crashkernel_type == CRASHKERNEL_TYPE_HIGH) {
+ /*
+ * CRASH_ADDR_LOW_MAX
+ * |
+ * |<----DMA---->|------------|
+ * |-high-| //case1
+ * |-high-| //case2
+ * |-high-| //case3
+ */
+ if (crashk_res.end < CRASH_ADDR_LOW_MAX) /* case 1 */
+ crashkernel_low_rollback();
+ else if (crashk_res.start >= CRASH_ADDR_LOW_MAX) /* case 3 */
+ res = &crashk_low_res;
+
+ low_size = crashk_low_res.end ? resource_size(&crashk_low_res) : 0;
+ }
+
+ /* All crashkernel memory is reserved as expected */
+ if (res->end < CRASH_ADDR_LOW_MAX)
+ goto ok;
+
+ crashkernel_rollback();
+
+ /* For details, see Documentation/arch/arm64/kdump.rst */
+ if (crashkernel_type == CRASHKERNEL_TYPE_FIXED_BASE) {
+ pr_warn("crashkernel reservation failed - memory range is invalid\n");
+ return;
+ } else if (crashkernel_type == CRASHKERNEL_TYPE_HIGH) {
+ /* Above case 3(low memory is not enough) */
+ if (res == &crashk_low_res) {
+ pr_warn("cannot allocate crashkernel low memory (size:0x%llx)\n", low_size);
+ return;
+ }
+
+ /*
+ * Above case 2. Fall back to searching the low memory with
+ * the specified size in crashkernel=,high
+ */
+ crash_base = memblock_phys_alloc_range(crash_size, CRASH_ALIGN,
+ 0, CRASH_ADDR_LOW_MAX);
+ if (!crash_base) {
+ pr_warn("cannot allocate crashkernel (size:0x%llx)\n", crash_size);
+ return;
+ }
+ } else {
+ /*
+ * Fall back to reserve region above DMA zone and allocate default
+ * size of memory in DMA zone.
+ */
+ low_size = DEFAULT_CRASH_KERNEL_LOW_SIZE;
+ low_base = memblock_phys_alloc_range(low_size, CRASH_ALIGN, 0, CRASH_ADDR_LOW_MAX);
+ if (!low_base) {
+ pr_warn("cannot allocate crashkernel low memory (size:0x%llx)\n", low_size);
+ return;
+ }
+
+ crash_base = memblock_phys_alloc_range(crash_size, CRASH_ALIGN,
+ CRASH_ADDR_LOW_MAX, CRASH_ADDR_HIGH_MAX);
+ if (!crash_base) {
+ pr_warn("cannot allocate crashkernel (size:0x%llx)\n", crash_size);
+ memblock_phys_free(low_base, low_size);
+ return;
+ }
+
+ crashk_low_res.start = low_base;
+ crashk_low_res.end = low_base + low_size - 1;
+ insert_resource(&iomem_resource, &crashk_low_res);
+ }
+
+ crashk_res.start = crash_base;
+ crashk_res.end = crash_base + crash_size - 1;
+ insert_resource(&iomem_resource, &crashk_res);
+
+ok:
+ crash_base = crashk_res.start;
+ crash_size = resource_size(&crashk_res);
+ pr_info("crashkernel reserved: 0x%016llx - 0x%016llx (%lld MB)\n",
+ crash_base, crash_base + crash_size, crash_size >> 20);
+
+ if (crashk_low_res.end) {
+ low_base = crashk_low_res.start;
+ low_size = resource_size(&crashk_low_res);
+ pr_info("crashkernel low memory reserved: 0x%08llx - 0x%08llx (%lld MB)\n",
+ low_base, low_base + low_size, low_size >> 20);
+ }
+
+ /*
+ * The crashkernel memory will be removed from the kernel linear
+ * map. Inform kmemleak so that it won't try to access it.
+ */
+ kmemleak_ignore_phys(crash_base);
+ if (crashk_low_res.end)
+ kmemleak_ignore_phys(crashk_low_res.start);
+}
+
static int __init reserve_crashkernel_low(unsigned long long low_size)
{
unsigned long long low_base;
- low_base = memblock_phys_alloc_range(low_size, CRASH_ALIGN, 0, CRASH_ADDR_LOW_MAX);
+ low_base = crashkernel_phys_alloc_range(low_size, 0, CRASH_ADDR_LOW_MAX);
if (!low_base) {
pr_err("cannot allocate crashkernel low memory (size:0x%llx).\n", low_size);
return -ENOMEM;
}
- pr_info("crashkernel low memory reserved: 0x%08llx - 0x%08llx (%lld MB)\n",
- low_base, low_base + low_size, low_size >> 20);
-
crashk_low_res.start = low_base;
crashk_low_res.end = low_base + low_size - 1;
insert_resource(&iomem_resource, &crashk_low_res);
@@ -102,12 +247,10 @@ static int __init reserve_crashkernel_low(unsigned long long low_size)
*/
static void __init reserve_crashkernel(void)
{
- unsigned long long crash_low_size = 0, search_base = 0;
+ unsigned long long crash_low_size = 0;
unsigned long long crash_max = CRASH_ADDR_LOW_MAX;
unsigned long long crash_base, crash_size;
char *cmdline = boot_command_line;
- bool fixed_base = false;
- bool high = false;
int ret;
if (!IS_ENABLED(CONFIG_KEXEC_CORE))
@@ -131,9 +274,8 @@ static void __init reserve_crashkernel(void)
else if (ret)
return;
- search_base = CRASH_HIGH_SEARCH_BASE;
crash_max = CRASH_ADDR_HIGH_MAX;
- high = true;
+ crashkernel_type = CRASHKERNEL_TYPE_HIGH;
} else if (ret || !crash_size) {
/* The specified value is invalid */
return;
@@ -143,67 +285,31 @@ static void __init reserve_crashkernel(void)
/* User specifies base address explicitly. */
if (crash_base) {
- fixed_base = true;
- search_base = crash_base;
+ crashkernel_type = CRASHKERNEL_TYPE_FIXED_BASE;
crash_max = crash_base + crash_size;
}
-retry:
- crash_base = memblock_phys_alloc_range(crash_size, CRASH_ALIGN,
- search_base, crash_max);
+ crash_base = crashkernel_phys_alloc_range(crash_size, crash_base, crash_max);
if (!crash_base) {
/*
* For crashkernel=size[KMG]@offset[KMG], print out failure
* message if can't reserve the specified region.
*/
- if (fixed_base) {
+ if (crashkernel_type == CRASHKERNEL_TYPE_FIXED_BASE) {
pr_warn("crashkernel reservation failed - memory is in use.\n");
return;
}
- /*
- * For crashkernel=size[KMG], if the first attempt was for
- * low memory, fall back to high memory, the minimum required
- * low memory will be reserved later.
- */
- if (!high && crash_max == CRASH_ADDR_LOW_MAX) {
- crash_max = CRASH_ADDR_HIGH_MAX;
- search_base = CRASH_ADDR_LOW_MAX;
- crash_low_size = DEFAULT_CRASH_KERNEL_LOW_SIZE;
- goto retry;
- }
+ pr_warn("cannot allocate crashkernel (size:0x%llx)\n", crash_size);
- /*
- * For crashkernel=size[KMG],high, if the first attempt was
- * for high memory, fall back to low memory.
- */
- if (high && crash_max == CRASH_ADDR_HIGH_MAX) {
- crash_max = CRASH_ADDR_LOW_MAX;
- search_base = 0;
- goto retry;
- }
- pr_warn("cannot allocate crashkernel (size:0x%llx)\n",
- crash_size);
return;
}
- if ((crash_base >= CRASH_ADDR_LOW_MAX) && crash_low_size &&
- reserve_crashkernel_low(crash_low_size)) {
+ if (crash_low_size && reserve_crashkernel_low(crash_low_size)) {
memblock_phys_free(crash_base, crash_size);
return;
}
- pr_info("crashkernel reserved: 0x%016llx - 0x%016llx (%lld MB)\n",
- crash_base, crash_base + crash_size, crash_size >> 20);
-
- /*
- * The crashkernel memory will be removed from the kernel linear
- * map. Inform kmemleak so that it won't try to access it.
- */
- kmemleak_ignore_phys(crash_base);
- if (crashk_low_res.end)
- kmemleak_ignore_phys(crashk_low_res.start);
-
crashk_res.start = crash_base;
crashk_res.end = crash_base + crash_size - 1;
insert_resource(&iomem_resource, &crashk_res);
@@ -408,6 +514,8 @@ void __init arm64_memblock_init(void)
early_init_fdt_scan_reserved_mem();
+ reserve_crashkernel();
+
high_memory = __va(memblock_end_of_DRAM() - 1) + 1;
}
@@ -454,7 +562,7 @@ void __init bootmem_init(void)
* request_standard_resources() depends on crashkernel's memory being
* reserved, so do it here.
*/
- reserve_crashkernel();
+ late_reserve_crashkernel();
memblock_dump_all();
}
--
2.25.1
Hi,
kernel test robot noticed the following build errors:
[auto build test ERROR on arm64/for-next/core]
[also build test ERROR on linus/master v6.5-rc2 next-20230721]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/thunder-leizhen-huaweicloud-com/arm64-kdump-Allocate-crash-low-memory-in-the-bottom-up-direction/20230721-162312
base: https://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux.git for-next/core
patch link: https://lore.kernel.org/r/20230721081726.882-2-thunder.leizhen%40huaweicloud.com
patch subject: [PATCH 1/3] arm64: kdump: Allocate crash low memory in the bottom-up direction
config: arm64-allnoconfig (https://download.01.org/0day-ci/archive/20230722/[email protected]/config)
compiler: aarch64-linux-gcc (GCC) 12.3.0
reproduce: (https://download.01.org/0day-ci/archive/20230722/[email protected]/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All errors (new ones prefixed by >>):
aarch64-linux-ld: arch/arm64/mm/init.o: in function `late_reserve_crashkernel':
>> init.c:(.init.text+0x58): undefined reference to `crashk_res'
aarch64-linux-ld: arch/arm64/mm/init.o: relocation R_AARCH64_ADR_PREL_PG_HI21 against symbol `crashk_res' which may bind externally can not be used when making a shared object; recompile with -fPIC
init.c:(.init.text+0x58): dangerous relocation: unsupported relocation
>> aarch64-linux-ld: init.c:(.init.text+0x5c): undefined reference to `crashk_res'
>> aarch64-linux-ld: init.c:(.init.text+0x88): undefined reference to `crashk_low_res'
aarch64-linux-ld: arch/arm64/mm/init.o: relocation R_AARCH64_ADR_PREL_PG_HI21 against symbol `crashk_low_res' which may bind externally can not be used when making a shared object; recompile with -fPIC
init.c:(.init.text+0x88): dangerous relocation: unsupported relocation
aarch64-linux-ld: init.c:(.init.text+0x90): undefined reference to `crashk_res'
aarch64-linux-ld: init.c:(.init.text+0x9c): undefined reference to `crashk_low_res'
aarch64-linux-ld: init.c:(.init.text+0xd0): undefined reference to `crashk_res'
aarch64-linux-ld: init.c:(.init.text+0x13c): undefined reference to `crashk_res'
aarch64-linux-ld: init.c:(.init.text+0x150): undefined reference to `crashk_res'
aarch64-linux-ld: init.c:(.init.text+0x18c): undefined reference to `crashk_low_res'
aarch64-linux-ld: init.c:(.init.text+0x1b0): undefined reference to `crashk_low_res'
aarch64-linux-ld: init.c:(.init.text+0x204): undefined reference to `crashk_low_res'
aarch64-linux-ld: init.c:(.init.text+0x234): undefined reference to `crashk_low_res'
aarch64-linux-ld: init.c:(.init.text+0x248): undefined reference to `crashk_low_res'
aarch64-linux-ld: arch/arm64/mm/init.o:init.c:(.init.text+0x25c): more undefined references to `crashk_low_res' follow
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
On 2023/7/22 5:22, kernel test robot wrote:
> Hi,
>
> kernel test robot noticed the following build errors:
>
> [auto build test ERROR on arm64/for-next/core]
> [also build test ERROR on linus/master v6.5-rc2 next-20230721]
> [If your patch is applied to the wrong git tree, kindly drop us a note.
> And when submitting patch, we suggest to use '--base' as documented in
> https://git-scm.com/docs/git-format-patch#_base_tree_information]
>
> url: https://github.com/intel-lab-lkp/linux/commits/thunder-leizhen-huaweicloud-com/arm64-kdump-Allocate-crash-low-memory-in-the-bottom-up-direction/20230721-162312
> base: https://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux.git for-next/core
> patch link: https://lore.kernel.org/r/20230721081726.882-2-thunder.leizhen%40huaweicloud.com
> patch subject: [PATCH 1/3] arm64: kdump: Allocate crash low memory in the bottom-up direction
> config: arm64-allnoconfig (https://download.01.org/0day-ci/archive/20230722/[email protected]/config)
> compiler: aarch64-linux-gcc (GCC) 12.3.0
> reproduce: (https://download.01.org/0day-ci/archive/20230722/[email protected]/reproduce)
>
> If you fix the issue in a separate patch/commit (i.e. not just a new version of
> the same patch/commit), kindly add following tags
> | Reported-by: kernel test robot <[email protected]>
> | Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
>
> All errors (new ones prefixed by >>):
Oh, thanks. I got it. The CONFIG_KEXEC_CORE build control is move into reserve_crashkernel().
Function late_reserve_crashkernel() needs to do the same. I forgot to test turning off options
like CONFIG_KEXEC_CORE. I will do it tomorrow. Sorry.
diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c
index b544ed0ab04193d..d444721011d0b2f 100644
--- a/arch/arm64/mm/init.c
+++ b/arch/arm64/mm/init.c
@@ -122,6 +122,9 @@ static void __init late_reserve_crashkernel(void)
unsigned long long low_base, low_size;
unsigned long long crash_base, crash_size;
+ if (!IS_ENABLED(CONFIG_KEXEC_CORE))
+ return;
>
> aarch64-linux-ld: arch/arm64/mm/init.o: in function `late_reserve_crashkernel':
>>> init.c:(.init.text+0x58): undefined reference to `crashk_res'
> aarch64-linux-ld: arch/arm64/mm/init.o: relocation R_AARCH64_ADR_PREL_PG_HI21 against symbol `crashk_res' which may bind externally can not be used when making a shared object; recompile with -fPIC
> init.c:(.init.text+0x58): dangerous relocation: unsupported relocation
>>> aarch64-linux-ld: init.c:(.init.text+0x5c): undefined reference to `crashk_res'
>>> aarch64-linux-ld: init.c:(.init.text+0x88): undefined reference to `crashk_low_res'
> aarch64-linux-ld: arch/arm64/mm/init.o: relocation R_AARCH64_ADR_PREL_PG_HI21 against symbol `crashk_low_res' which may bind externally can not be used when making a shared object; recompile with -fPIC
> init.c:(.init.text+0x88): dangerous relocation: unsupported relocation
> aarch64-linux-ld: init.c:(.init.text+0x90): undefined reference to `crashk_res'
> aarch64-linux-ld: init.c:(.init.text+0x9c): undefined reference to `crashk_low_res'
> aarch64-linux-ld: init.c:(.init.text+0xd0): undefined reference to `crashk_res'
> aarch64-linux-ld: init.c:(.init.text+0x13c): undefined reference to `crashk_res'
> aarch64-linux-ld: init.c:(.init.text+0x150): undefined reference to `crashk_res'
> aarch64-linux-ld: init.c:(.init.text+0x18c): undefined reference to `crashk_low_res'
> aarch64-linux-ld: init.c:(.init.text+0x1b0): undefined reference to `crashk_low_res'
> aarch64-linux-ld: init.c:(.init.text+0x204): undefined reference to `crashk_low_res'
> aarch64-linux-ld: init.c:(.init.text+0x234): undefined reference to `crashk_low_res'
> aarch64-linux-ld: init.c:(.init.text+0x248): undefined reference to `crashk_low_res'
> aarch64-linux-ld: arch/arm64/mm/init.o:init.c:(.init.text+0x25c): more undefined references to `crashk_low_res' follow
>
--
Regards,
Zhen Lei