|
|
Log in / Subscribe / Register

arm64/riscv: Add support for crashkernel CMA reservation

From:  Jinjie Ruan <ruanjinjie-AT-huawei.com>
To:  <corbet-AT-lwn.net>, <skhan-AT-linuxfoundation.org>, <catalin.marinas-AT-arm.com>, <will-AT-kernel.org>, <chenhuacai-AT-kernel.org>, <kernel-AT-xen0n.name>, <maddy-AT-linux.ibm.com>, <mpe-AT-ellerman.id.au>, <npiggin-AT-gmail.com>, <chleroy-AT-kernel.org>, <pjw-AT-kernel.org>, <palmer-AT-dabbelt.com>, <aou-AT-eecs.berkeley.edu>, <alex-AT-ghiti.fr>, <tglx-AT-kernel.org>, <mingo-AT-redhat.com>, <bp-AT-alien8.de>, <dave.hansen-AT-linux.intel.com>, <hpa-AT-zytor.com>, <robh-AT-kernel.org>, <saravanak-AT-kernel.org>, <akpm-AT-linux-foundation.org>, <bhe-AT-redhat.com>, <rppt-AT-kernel.org>, <pasha.tatashin-AT-soleen.com>, <pratyush-AT-kernel.org>, <ruirui.yang-AT-linux.dev>, <rdunlap-AT-infradead.org>, <feng.tang-AT-linux.alibaba.com>, <dapeng1.mi-AT-linux.intel.com>, <kees-AT-kernel.org>, <elver-AT-google.com>, <kuba-AT-kernel.org>, <lirongqing-AT-baidu.com>, <ebiggers-AT-kernel.org>, <paulmck-AT-kernel.org>, <sourabhjain-AT-linux.ibm.com>, <thuth-AT-redhat.com>, <ardb-AT-kernel.org>, <masahiroy-AT-kernel.org>, <gshan-AT-redhat.com>, <james.morse-AT-arm.com>, <maz-AT-kernel.org>, <leitao-AT-debian.org>, <yeoreum.yun-AT-arm.com>, <coxu-AT-redhat.com>, <suzuki.poulose-AT-arm.com>, <cfsworks-AT-gmail.com>, <osandov-AT-fb.com>, <jbohac-AT-suse.cz>, <ryan.roberts-AT-arm.com>, <tangyouling-AT-kylinos.cn>, <ritesh.list-AT-gmail.com>, <adityag-AT-linux.ibm.com>, <hbathini-AT-linux.ibm.com>, <bjorn-AT-rivosinc.com>, <songshuaishuai-AT-tinylab.org>, <vishal.moola-AT-gmail.com>, <junhui.liu-AT-pigmoral.tech>, <djordje.todorovic-AT-htecgroup.com>, <austin.kim-AT-lge.com>, <namcao-AT-linutronix.de>, <djbw-AT-kernel.org>, <chao.gao-AT-intel.com>, <seanjc-AT-google.com>, <fuqiang.wang-AT-easystack.cn>, <liaoyuanhong-AT-vivo.com>, <makb-AT-juniper.net>, <graf-AT-amazon.com>, <piliu-AT-redhat.com>, <rafael.j.wysocki-AT-intel.com>, <mario.limonciello-AT-amd.com>, <jbouron-AT-amazon.com>, <chenjiahao16-AT-huawei.com>, <guoren-AT-kernel.org>, <bauerman-AT-linux.ibm.com>, <bgwin-AT-google.com>, <takahiro.akashi-AT-linaro.org>, <x86-AT-kernel.org>, <linux-doc-AT-vger.kernel.org>, <linux-kernel-AT-vger.kernel.org>, <linux-arm-kernel-AT-lists.infradead.org>, <loongarch-AT-lists.linux.dev>, <linuxppc-dev-AT-lists.ozlabs.org>, <linux-riscv-AT-lists.infradead.org>, <devicetree-AT-vger.kernel.org>, <kexec-AT-lists.infradead.org>
Subject:  [PATCH v15 00/23] arm64/riscv: Add support for crashkernel CMA reservation
Date:  Mon, 01 Jun 2026 17:47:42 +0800
Message-ID:  <20260601094805.2928614-1-ruanjinjie@huawei.com>
Cc:  <ruanjinjie-AT-huawei.com>
Archive-link:  Article

The crash memory allocation, and the exclude of crashk_res, crashk_low_res
and crashk_cma memory are almost identical across different architectures,
This patch set handle them in crash core in a general way, which eliminate
a lot of duplication code.

And add support for crashkernel CMA reservation for arm64 and riscv.

Also add support for arm64 crash hotplug.

This patch set is rebased on v7.1-rc1.

Basic second kernel boot test were performed on QEMU platforms for x86,
ARM64 and RISC-V architectures with the following parameters:

        "cma=256M crashkernel=4G crashkernel=64M,cma"

For first kernel, there will be such log:

        # dmesg | grep crash
        [    0.000000] crashkernel low memory reserved: 0xe8000000 - 0xf0000000 (128 MB)
        [    0.000000] crashkernel reserved: 0x000000023e600000 - 0x000000033e600000 (4096 MB)
        [    0.000000] crashkernel CMA reserved: 64 MB in 1 ranges

        # dmesg | grep cma
        [    0.000000] cma: Reserved 256 MiB at 0x00000000f0000000
        [    0.000000] cma: Reserved 64 MiB at 0x0000000100000000

For second kernel, there will be such log:

        [    0.000000] OF: fdt: Looking for usable-memory-range property...
        [    0.000000] OF: fdt: cap_mem_regions[0]: base=0x000000023e600000, size=0x0000000100000000
        [    0.000000] OF: fdt: cap_mem_regions[1]: base=0x00000000e8000000, size=0x0000000008000000
        [    0.000000] OF: fdt: cap_mem_regions[2]: base=0x0000000100000000, size=0x0000000004000000

Changes in v15:
- Unify the subject prefix formats as Huacai suggested.
- Fix powerpc pre-existing NULL pointer dereference [Sashiko [1]]
- Fix powerpc pre-existing __merge_memory_ranges() memory range
  truncation [Sashiko [1]].
- Fix pre-existing arm64 CMA page leaks [Sashiko[2]].
- Fix pre-existing crash_load_dm_crypt_keys() Use-After-Free and
  Double Free issue [Sashiko[3]].
- Fix vfree(headers) and uninitialized variables issue
  and simplify the fix [Sashiko[2]].
- As walk_system_ram_res() and for_each_mem_range() use different
  lock, unify and simplify the fix of TOCTOU buffer overflow via memory
  region padding [Sashiko[4]].
- Fix the arm64 crash dump issues in Sashiko[5].
- Link to v14: https://lore.kernel.org/all/20260525084932.934910-1-ruanj...

[1]: https://lore.kernel.org/all/20260525092207.96B9D1F000E9@s...
[2]: https://lore.kernel.org/all/20260525091149.1A1E01F00A3D@s...
[3]: https://lore.kernel.org/all/20260525105227.3C2421F000E9@s...
[4]: https://lore.kernel.org/all/20260525095447.944E11F000E9@s...
[5]: https://lore.kernel.org/all/20260525101746.9959D1F000E9@s...

Changes in v14:
- Fix image->elf_headers memory leak during retry loop for arm64 as Sashiko
  AI code review pointed out.
- Solve the hotplug notifier arch_crash_handle_hotplug_event() AA
  self-deadlock problem as Sashiko AI code review pointed out.
- Fix the TOCTOU issue in prepare_elf_headers() by get_online_mems().
- -ENOMEM -> -EAGAIN as Breno suggested.
- Add support for arm64 crash hotplug.
- Link to v13: https://lore.kernel.org/all/20260511030454.1730881-1-ruan...

Changes in v13:
- Rebased on v7.1-rc1.
- Update the commit message.
- Add Reviewed-by.
- Link to v12: https://lore.kernel.org/all/20260402072701.628293-1-ruanj...

Changes in v12:
- Remove the unused "nr_mem_ranges" for x86.
- Add "Fix crashk_low_res not exclude bug" test log.
- Provide a separate patch for each architecture for using
  crash_prepare_headers(), which will make the review more convenient.
- Add Reviewed-by and Tested-by.
- Link to v11: https://lore.kernel.org/all/20260328074013.3589544-1-ruan...

Changes in v11:
- Avoid silently drop crash memory if the crash kernel is built without
  CONFIG_CMA.
- Remove unnecessary "cmem->nr_ranges = 0" for arch_crash_populate_cmem()
  as we use kvzalloc().
- Provide a separate patch for each architecture to fix the existing
  buffer overflow issue.
- Add Acked-bys for arm64.

Changes in v10:
- Fix crashk_low_res not excluded bug in the existing
  RISC-V code.
- Fix an existing memory leak issue in the existing PowerPC code.
- Fix the ordering issue of adding CMA ranges to
  "linux,usable-memory-range".
- Fix an existing concurrency issue. A Concurrent memory hotplug may occur
  between reading memblock and attempting to fill cmem during kexec_load()
  for almost all existing architectures.
- Link to v9: https://lore.kernel.org/all/20260323072745.2481719-1-ruan...

Changes in v9:
- Collect Reviewed-by and Acked-by, and prepare for Sashiko AI review.
- Link to v8: https://lore.kernel.org/all/20260302035315.3892241-1-ruan...

Changes in v8:
- Fix the build issues reported by kernel test robot and Sourabh.
- Link to v7: https://lore.kernel.org/all/20260226130437.1867658-1-ruan...

Changes in v7:
- Correct the inclusion of CMA-reserved ranges for kdump kernel in of/kexec
  for arm64 and riscv.
- Add Acked-by.
- Link to v6: https://lore.kernel.org/all/20260224085342.387996-1-ruanj...

Changes in v6:
- Update the crash core exclude code as Mike suggested.
- Rebased on v7.0-rc1.
- Add acked-by.
- Link to v5: https://lore.kernel.org/all/20260212101001.343158-1-ruanj...

Jinjie Ruan (22):
  riscv: kexec_file: Fix crashk_low_res not exclude bug
  powerpc/crash: Fix possible memory leak in update_crash_elfcorehdr()
  powerpc/kexec_file: Fix NULL pointer dereference in
    kexec_extra_fdt_size_ppc64()
  powerpc/kexec_file: Fix memory range truncation in
    __merge_memory_ranges()
  kexec: Extract kexec_free_segment_cma() from kimage_free_cma()
  arm64: kexec_file: Fix CMA page leaks during segment placement retry
    loops
  arm64: kexec_file: Fix image->elf_headers memory leak during retry
    loop
  kexec: Fix UAF and Double Free in crash_load_dm_crypt_keys()
  crash_core: Introduce CRASH_HOTPLUG_SAFETY_PADDING for memory hotplug
    safety
  x86: kexec_file: Fix TOCTOU buffer overflow via memory region padding
  arm64: kexec_file: Fix TOCTOU buffer overflow via memory region
    padding
  riscv: kexec_file: Fix TOCTOU buffer overflow via memory region
    padding
  LoongArch: kexec_file: Fix TOCTOU buffer overflow via memory region
    padding
  crash: Add crash_prepare_headers() to exclude crash kernel memory
  arm64: kexec_file: Use crash_prepare_headers() helper to simplify code
  x86: kexec_file: Use crash_prepare_headers() helper to simplify code
  riscv: kexec_file: Use crash_prepare_headers() helper to simplify code
  LoongArch: kexec_file: Use crash_prepare_headers() helper to simplify
    code
  powerpc/kexec_file: Use crash_exclude_core_ranges() helper
  arm64: kexec_file: Add support for crashkernel CMA reservation
  riscv: kexec_file: Add support for crashkernel CMA reservation
  arm64: crash: Add crash hotplug support

Sourabh Jain (1):
  powerpc/crash: sort crash memory ranges before preparing elfcorehdr

 .../admin-guide/kernel-parameters.txt         |  16 +-
 arch/arm64/Kconfig                            |   3 +
 arch/arm64/include/asm/kexec.h                |  13 ++
 arch/arm64/kernel/Makefile                    |   2 +-
 arch/arm64/kernel/crash.c                     | 152 ++++++++++++++++++
 arch/arm64/kernel/kexec_image.c               |  34 ++++
 arch/arm64/kernel/machine_kexec_file.c        |  78 ++-------
 arch/arm64/mm/init.c                          |   5 +-
 arch/loongarch/kernel/machine_kexec_file.c    |  44 ++---
 arch/powerpc/include/asm/kexec_ranges.h       |   1 -
 arch/powerpc/kexec/crash.c                    |   7 +-
 arch/powerpc/kexec/file_load_64.c             |   3 +
 arch/powerpc/kexec/ranges.c                   | 113 ++-----------
 arch/riscv/kernel/machine_kexec_file.c        |  43 ++---
 arch/riscv/mm/init.c                          |   5 +-
 arch/x86/kernel/crash.c                       |  92 ++---------
 drivers/of/fdt.c                              |   9 +-
 drivers/of/kexec.c                            |   9 ++
 include/linux/crash_core.h                    |  15 ++
 include/linux/crash_reserve.h                 |   4 +-
 include/linux/kexec.h                         |   2 +
 kernel/crash_core.c                           |  89 +++++++++-
 kernel/crash_dump_dm_crypt.c                  |   4 +-
 kernel/kexec_core.c                           |  25 +--
 24 files changed, 430 insertions(+), 338 deletions(-)
 create mode 100644 arch/arm64/kernel/crash.c

-- 
2.34.1




Copyright © 2026, Eklektix, Inc.
Comments and public postings are copyrighted by their creators.
Linux is a registered trademark of Linus Torvalds