Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/2195906/?format=api
{ "id": 2195906, "url": "http://patchwork.ozlabs.org/api/patches/2195906/?format=api", "web_url": "http://patchwork.ozlabs.org/project/linuxppc-dev/patch/20260212101001.343158-3-ruanjinjie@huawei.com/", "project": { "id": 2, "url": "http://patchwork.ozlabs.org/api/projects/2/?format=api", "name": "Linux PPC development", "link_name": "linuxppc-dev", "list_id": "linuxppc-dev.lists.ozlabs.org", "list_email": "linuxppc-dev@lists.ozlabs.org", "web_url": "https://github.com/linuxppc/wiki/wiki", "scm_url": "https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git", "webscm_url": "https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git/", "list_archive_url": "https://lore.kernel.org/linuxppc-dev/", "list_archive_url_format": "https://lore.kernel.org/linuxppc-dev/{}/", "commit_url_format": "https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git/commit/?id={}" }, "msgid": "<20260212101001.343158-3-ruanjinjie@huawei.com>", "list_archive_url": "https://lore.kernel.org/linuxppc-dev/20260212101001.343158-3-ruanjinjie@huawei.com/", "date": "2026-02-12T10:09:59", "name": "[v5,2/4] crash: Exclude crash kernel memory in crash core", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "03d0d3dd97f051f427416df4add5b297e8a70227", "submitter": { "id": 84791, "url": "http://patchwork.ozlabs.org/api/people/84791/?format=api", "name": "Jinjie Ruan", "email": "ruanjinjie@huawei.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/linuxppc-dev/patch/20260212101001.343158-3-ruanjinjie@huawei.com/mbox/", "series": [ { "id": 491953, "url": "http://patchwork.ozlabs.org/api/series/491953/?format=api", "web_url": "http://patchwork.ozlabs.org/project/linuxppc-dev/list/?series=491953", "date": "2026-02-12T10:09:57", "name": "arm64/riscv: Add support for crashkernel CMA reservation", "version": 5, "mbox": "http://patchwork.ozlabs.org/series/491953/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/2195906/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2195906/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "\n <linuxppc-dev+bounces-16837-incoming=patchwork.ozlabs.org@lists.ozlabs.org>", "X-Original-To": [ "incoming@patchwork.ozlabs.org", "linuxppc-dev@lists.ozlabs.org" ], "Delivered-To": "patchwork-incoming@legolas.ozlabs.org", "Authentication-Results": [ "legolas.ozlabs.org;\n\tdkim=pass (1024-bit key;\n unprotected) header.d=huawei.com header.i=@huawei.com header.a=rsa-sha256\n header.s=dkim header.b=1ZfVuAnP;\n\tdkim-atps=neutral", "legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=lists.ozlabs.org\n (client-ip=2404:9400:21b9:f100::1; helo=lists.ozlabs.org;\n envelope-from=linuxppc-dev+bounces-16837-incoming=patchwork.ozlabs.org@lists.ozlabs.org;\n receiver=patchwork.ozlabs.org)", "lists.ozlabs.org;\n arc=none smtp.remote-ip=113.46.200.221", "lists.ozlabs.org;\n dmarc=pass (p=quarantine dis=none) header.from=huawei.com", "lists.ozlabs.org;\n\tdkim=pass (1024-bit key;\n unprotected) header.d=huawei.com header.i=@huawei.com header.a=rsa-sha256\n header.s=dkim header.b=1ZfVuAnP;\n\tdkim-atps=neutral", "lists.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=huawei.com\n (client-ip=113.46.200.221; helo=canpmsgout06.his.huawei.com;\n envelope-from=ruanjinjie@huawei.com; receiver=lists.ozlabs.org)" ], "Received": [ "from lists.ozlabs.org (lists.ozlabs.org\n [IPv6:2404:9400:21b9:f100::1])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519 server-signature ECDSA (secp384r1 raw public key)\n server-digest SHA384)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4fBWHT3xtRz1xpY\n\tfor <incoming@patchwork.ozlabs.org>; Thu, 12 Feb 2026 21:09:25 +1100 (AEDT)", "from boromir.ozlabs.org (localhost [127.0.0.1])\n\tby lists.ozlabs.org (Postfix) with ESMTP id 4fBWHN3d4gz30VV;\n\tThu, 12 Feb 2026 21:09:20 +1100 (AEDT)", "from canpmsgout06.his.huawei.com (canpmsgout06.his.huawei.com\n [113.46.200.221])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519)\n\t(No client certificate requested)\n\tby lists.ozlabs.org (Postfix) with ESMTPS id 4fBWHJ5nc5z2yFm\n\tfor <linuxppc-dev@lists.ozlabs.org>; Thu, 12 Feb 2026 21:09:16 +1100 (AEDT)", "from mail.maildlp.com (unknown [172.19.162.197])\n\tby canpmsgout06.his.huawei.com (SkyGuard) with ESMTPS id 4fBW9t5cMPzRhTq;\n\tThu, 12 Feb 2026 18:04:34 +0800 (CST)", "from dggpemf500011.china.huawei.com (unknown [7.185.36.131])\n\tby mail.maildlp.com (Postfix) with ESMTPS id 2E24D40363;\n\tThu, 12 Feb 2026 18:09:13 +0800 (CST)", "from huawei.com (10.90.53.73) by dggpemf500011.china.huawei.com\n (7.185.36.131) with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.11; Thu, 12 Feb\n 2026 18:09:10 +0800" ], "ARC-Seal": "i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1770890960;\n\tcv=none;\n b=faFkwXk1Gv+c+tadYWNnATZvM8AcjRuLyD2K/aSTyGsTkha4FsydKUwC88jTyu9ql3bYP0rX2t40ASgbLIm5mifgj1unF2zhoZiogfLZPqToH9oyv0FCobDWvevsqcSBsCvAI9v8GqGgy1ay49d59Mj/TSbcrzps8zr56uXpyUNUs0ZpQB1ALfDo7tSgXKIf5NHMnQf/IXs1VogKbjIVWAIaUqHti/Kx4Cu6Mm7rcOo2JEF2oPr2eX9/lZFDnQhQQUFehL5+tQEPWBA3GG22u53FDR/xAV/X6FECnJ/MlVfQMpYFUTlExirKAoC1INpOu8gZ1KfyTuTjxop4NlrHFg==", "ARC-Message-Signature": "i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707;\n\tt=1770890960; c=relaxed/relaxed;\n\tbh=zXN+U1fKk/yF3wsz6geQ5mHoWp5G9NiYIKEuE7hV9tc=;\n\th=From:To:Subject:Date:Message-ID:In-Reply-To:References:\n\t MIME-Version:Content-Type;\n b=WzKfaS/4Pz6PCnsjlJ6xFLboA0Z5ydXGZVhvD6LlpLciWDASmvKVsSUjwoywg/p6HQ4f8WA2GqcNfAXC0btRvRjinCov/RUQI8MjdgKLiYtB2BlqiHy6Ki87BJ0aRupWp+dWlc6d3IkkeVzD2nUtYF0jQwVLhUKlI6MIxixUSmGe6oqy32yAU6H2gDBiZY5Jv/TpY9UrdhhoQLnrCcdt4m4YzyxbDjKZITvT2lX1t1XIl1UwJiC9+KomueJDM2ZTCVkFz0FXUTgq4ZGpgy6Vj4zwL8GxzreR0O7lKx9QtcEkItBRQO6ujjxiFdUwPdf54i3xvEyIPma/TEsexNYktQ==", "ARC-Authentication-Results": "i=1; lists.ozlabs.org;\n dmarc=pass (p=quarantine dis=none) header.from=huawei.com;\n dkim=pass (1024-bit key;\n unprotected) header.d=huawei.com header.i=@huawei.com header.a=rsa-sha256\n header.s=dkim header.b=1ZfVuAnP; dkim-atps=neutral;\n spf=pass (client-ip=113.46.200.221; helo=canpmsgout06.his.huawei.com;\n envelope-from=ruanjinjie@huawei.com;\n receiver=lists.ozlabs.org) smtp.mailfrom=huawei.com", "dkim-signature": "v=1; a=rsa-sha256; d=huawei.com; s=dkim;\n\tc=relaxed/relaxed; q=dns/txt;\n\th=From;\n\tbh=zXN+U1fKk/yF3wsz6geQ5mHoWp5G9NiYIKEuE7hV9tc=;\n\tb=1ZfVuAnPHDTRjAw2jYD//J3Ds+bkyAtzuG92+TNyT89LBU0GVpuKFNNTKnxR4FbN7j011/Zts\n\tC5Jnw845IXz/ZorqI7vrPjCgkjkABsZkcfpNV+SeRrvWvqUmSyOCKYkzSLHXmLKJXICZi/AZXNH\n\tqTsHZ57FRXSSTaaio5zdClo=", "From": "Jinjie Ruan <ruanjinjie@huawei.com>", "To": "<corbet@lwn.net>, <skhan@linuxfoundation.org>, <catalin.marinas@arm.com>,\n\t<will@kernel.org>, <chenhuacai@kernel.org>, <kernel@xen0n.name>,\n\t<maddy@linux.ibm.com>, <mpe@ellerman.id.au>, <npiggin@gmail.com>,\n\t<chleroy@kernel.org>, <pjw@kernel.org>, <palmer@dabbelt.com>,\n\t<aou@eecs.berkeley.edu>, <alex@ghiti.fr>, <tglx@kernel.org>,\n\t<mingo@redhat.com>, <bp@alien8.de>, <dave.hansen@linux.intel.com>,\n\t<hpa@zytor.com>, <akpm@linux-foundation.org>, <bhe@redhat.com>,\n\t<vgoyal@redhat.com>, <dyoung@redhat.com>, <rdunlap@infradead.org>,\n\t<kees@kernel.org>, <elver@google.com>, <paulmck@kernel.org>, <arnd@arndb.de>,\n\t<ruanjinjie@huawei.com>, <fvdl@google.com>, <thuth@redhat.com>,\n\t<ardb@kernel.org>, <leitao@debian.org>, <rppt@kernel.org>, <osandov@fb.com>,\n\t<cfsworks@gmail.com>, <sourabhjain@linux.ibm.com>, <ryan.roberts@arm.com>,\n\t<tangyouling@kylinos.cn>, <eajames@linux.ibm.com>, <hbathini@linux.ibm.com>,\n\t<ritesh.list@gmail.com>, <songshuaishuai@tinylab.org>, <bjorn@rivosinc.com>,\n\t<samuel.holland@sifive.com>, <kevin.brodsky@arm.com>,\n\t<junhui.liu@pigmoral.tech>, <vishal.moola@gmail.com>, <dwmw@amazon.co.uk>,\n\t<pbonzini@redhat.com>, <kai.huang@intel.com>, <ubizjak@gmail.com>,\n\t<coxu@redhat.com>, <fuqiang.wang@easystack.cn>, <liaoyuanhong@vivo.com>,\n\t<brgerst@gmail.com>, <jbohac@suse.cz>, <x86@kernel.org>,\n\t<linux-doc@vger.kernel.org>, <linux-kernel@vger.kernel.org>,\n\t<linux-arm-kernel@lists.infradead.org>, <loongarch@lists.linux.dev>,\n\t<linuxppc-dev@lists.ozlabs.org>, <linux-riscv@lists.infradead.org>,\n\t<kexec@lists.infradead.org>", "Subject": "[PATCH v5 2/4] crash: Exclude crash kernel memory in crash core", "Date": "Thu, 12 Feb 2026 18:09:59 +0800", "Message-ID": "<20260212101001.343158-3-ruanjinjie@huawei.com>", "X-Mailer": "git-send-email 2.34.1", "In-Reply-To": "<20260212101001.343158-1-ruanjinjie@huawei.com>", "References": "<20260212101001.343158-1-ruanjinjie@huawei.com>", "X-Mailing-List": "linuxppc-dev@lists.ozlabs.org", "List-Id": "<linuxppc-dev.lists.ozlabs.org>", "List-Help": "<mailto:linuxppc-dev+help@lists.ozlabs.org>", "List-Owner": "<mailto:linuxppc-dev+owner@lists.ozlabs.org>", "List-Post": "<mailto:linuxppc-dev@lists.ozlabs.org>", "List-Archive": "<https://lore.kernel.org/linuxppc-dev/>,\n <https://lists.ozlabs.org/pipermail/linuxppc-dev/>", "List-Subscribe": "<mailto:linuxppc-dev+subscribe@lists.ozlabs.org>,\n <mailto:linuxppc-dev+subscribe-digest@lists.ozlabs.org>,\n <mailto:linuxppc-dev+subscribe-nomail@lists.ozlabs.org>", "List-Unsubscribe": "<mailto:linuxppc-dev+unsubscribe@lists.ozlabs.org>", "Precedence": "list", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain", "X-Originating-IP": "[10.90.53.73]", "X-ClientProxiedBy": "kwepems200002.china.huawei.com (7.221.188.68) To\n dggpemf500011.china.huawei.com (7.185.36.131)", "X-Spam-Status": "No, score=-0.2 required=3.0 tests=DKIM_SIGNED,DKIM_VALID,\n\tDKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=disabled\n\tversion=4.0.1 OzLabs 8", "X-Spam-Checker-Version": "SpamAssassin 4.0.1 (2024-03-25) on lists.ozlabs.org" }, "content": "The exclude of crashk_res, crashk_low_res and crashk_cma memory\nare almost identical across different architectures, handling them\nin the crash core would eliminate a lot of duplication, so do\nthem in the common code.\n\nAnd move the size calculation (and the realloc if needed) into the\ngeneric crash core so that:\n\n- New CMA regions or future crash-memory types can automatically\n accounted for in crash core;\n\n- Each architecture no longer has to play whack-a-mole with\n its private array size.\n\nTo achieve the above goal, 4 architecture-specific functions are\nintroduced:\n\n- arch_get_system_nr_ranges() and arch_prepare_elf64_ram_headers().\n The 1st function pre-counts the number of memory ranges, and\n the 2st function fill the memory ranges into the cmem->ranges[] array,\n and count the actual number of ranges filled.\n\n- arch_crash_exclude_mem_range(). Realloc for powerpc. The default\n implementation is crash_exclude_mem_range(), and use\n crash_exclude_mem_range_guarded() to implement the arch version\n for powerpc.\n\n- arch_get_crash_memory_ranges(). Get crash memory ranges for arch and\n the default implementation is generic across x86, arm64, riscv, and\n loongson by using the first two arch functions above. powerpc has its\n own implementation by calling get_crash_memory_ranges().\n\nTested on x86, arm64 and riscv with QEMU.\n\nSigned-off-by: Jinjie Ruan <ruanjinjie@huawei.com>\n---\n arch/arm64/include/asm/kexec.h | 9 +-\n arch/arm64/kernel/machine_kexec_file.c | 41 +++-----\n arch/loongarch/include/asm/kexec.h | 9 +-\n arch/loongarch/kernel/machine_kexec_file.c | 41 +++-----\n arch/powerpc/include/asm/kexec.h | 13 +++\n arch/powerpc/include/asm/kexec_ranges.h | 3 -\n arch/powerpc/kexec/crash.c | 68 ++++++++------\n arch/powerpc/kexec/file_load_64.c | 17 ++--\n arch/powerpc/kexec/ranges.c | 18 +---\n arch/riscv/include/asm/kexec.h | 9 +-\n arch/riscv/kernel/machine_kexec_file.c | 37 +++-----\n arch/x86/include/asm/kexec.h | 9 ++\n arch/x86/kernel/crash.c | 104 +++------------------\n include/linux/crash_core.h | 75 +++++++++++++--\n kernel/crash_core.c | 85 +++++++++++++++--\n 15 files changed, 289 insertions(+), 249 deletions(-)", "diff": "diff --git a/arch/arm64/include/asm/kexec.h b/arch/arm64/include/asm/kexec.h\nindex 892e5bebda95..67f790e3ba14 100644\n--- a/arch/arm64/include/asm/kexec.h\n+++ b/arch/arm64/include/asm/kexec.h\n@@ -119,6 +119,7 @@ struct kimage_arch {\n };\n \n #ifdef CONFIG_KEXEC_FILE\n+struct crash_mem;\n extern const struct kexec_file_ops kexec_image_ops;\n \n int arch_kimage_file_post_load_cleanup(struct kimage *image);\n@@ -128,7 +129,13 @@ extern int load_other_segments(struct kimage *image,\n \t\tunsigned long kernel_load_addr, unsigned long kernel_size,\n \t\tchar *initrd, unsigned long initrd_len,\n \t\tchar *cmdline);\n-#endif\n+\n+int arch_get_system_nr_ranges(unsigned int *nr_ranges);\n+#define arch_get_system_nr_ranges arch_get_system_nr_ranges\n+\n+int arch_prepare_elf64_ram_headers(struct crash_mem *cmem);\n+#define arch_prepare_elf64_ram_headers arch_prepare_elf64_ram_headers\n+#endif /* CONFIG_KEXEC_FILE */\n \n #endif /* __ASSEMBLER__ */\n \ndiff --git a/arch/arm64/kernel/machine_kexec_file.c b/arch/arm64/kernel/machine_kexec_file.c\nindex 410060ebd86d..506a165117b1 100644\n--- a/arch/arm64/kernel/machine_kexec_file.c\n+++ b/arch/arm64/kernel/machine_kexec_file.c\n@@ -40,23 +40,22 @@ int arch_kimage_file_post_load_cleanup(struct kimage *image)\n }\n \n #ifdef CONFIG_CRASH_DUMP\n-static int prepare_elf_headers(void **addr, unsigned long *sz)\n+int arch_get_system_nr_ranges(unsigned int *nr_ranges)\n {\n-\tstruct crash_mem *cmem;\n-\tunsigned int nr_ranges;\n-\tint ret;\n-\tu64 i;\n \tphys_addr_t start, end;\n+\tu64 i;\n \n-\tnr_ranges = 2; /* for exclusion of crashkernel region */\n \tfor_each_mem_range(i, &start, &end)\n-\t\tnr_ranges++;\n+\t\t(*nr_ranges)++;\n+\n+\treturn 0;\n+}\n \n-\tcmem = kmalloc(struct_size(cmem, ranges, nr_ranges), GFP_KERNEL);\n-\tif (!cmem)\n-\t\treturn -ENOMEM;\n+int arch_prepare_elf64_ram_headers(struct crash_mem *cmem)\n+{\n+\tphys_addr_t start, end;\n+\tu64 i;\n \n-\tcmem->max_nr_ranges = nr_ranges;\n \tcmem->nr_ranges = 0;\n \tfor_each_mem_range(i, &start, &end) {\n \t\tcmem->ranges[cmem->nr_ranges].start = start;\n@@ -64,22 +63,7 @@ static int prepare_elf_headers(void **addr, unsigned long *sz)\n \t\tcmem->nr_ranges++;\n \t}\n \n-\t/* Exclude crashkernel region */\n-\tret = crash_exclude_mem_range(cmem, crashk_res.start, crashk_res.end);\n-\tif (ret)\n-\t\tgoto out;\n-\n-\tif (crashk_low_res.end) {\n-\t\tret = crash_exclude_mem_range(cmem, crashk_low_res.start, crashk_low_res.end);\n-\t\tif (ret)\n-\t\t\tgoto out;\n-\t}\n-\n-\tret = crash_prepare_elf64_headers(cmem, true, addr, sz);\n-\n-out:\n-\tkfree(cmem);\n-\treturn ret;\n+\treturn 0;\n }\n #endif\n \n@@ -109,7 +93,8 @@ int load_other_segments(struct kimage *image,\n \tvoid *headers;\n \tunsigned long headers_sz;\n \tif (image->type == KEXEC_TYPE_CRASH) {\n-\t\tret = prepare_elf_headers(&headers, &headers_sz);\n+\t\tret = crash_prepare_elf64_headers(true, &headers, &headers_sz,\n+\t\t\t\t\t\t NULL, NULL, NULL);\n \t\tif (ret) {\n \t\t\tpr_err(\"Preparing elf core header failed\\n\");\n \t\t\tgoto out_err;\ndiff --git a/arch/loongarch/include/asm/kexec.h b/arch/loongarch/include/asm/kexec.h\nindex 209fa43222e1..2cb585f25e3f 100644\n--- a/arch/loongarch/include/asm/kexec.h\n+++ b/arch/loongarch/include/asm/kexec.h\n@@ -42,6 +42,7 @@ struct kimage_arch {\n };\n \n #ifdef CONFIG_KEXEC_FILE\n+struct crash_mem;\n extern const struct kexec_file_ops kexec_efi_ops;\n extern const struct kexec_file_ops kexec_elf_ops;\n \n@@ -51,7 +52,13 @@ int arch_kimage_file_post_load_cleanup(struct kimage *image);\n extern int load_other_segments(struct kimage *image,\n \t\tunsigned long kernel_load_addr, unsigned long kernel_size,\n \t\tchar *initrd, unsigned long initrd_len, char *cmdline, unsigned long cmdline_len);\n-#endif\n+\n+int arch_get_system_nr_ranges(unsigned int *nr_ranges);\n+#define arch_get_system_nr_ranges arch_get_system_nr_ranges\n+\n+int arch_prepare_elf64_ram_headers(struct crash_mem *cmem);\n+#define arch_prepare_elf64_ram_headers arch_prepare_elf64_ram_headers\n+#endif /* CONFIG_KEXEC_FILE */\n \n typedef void (*do_kexec_t)(unsigned long efi_boot,\n \t\t\t unsigned long cmdline_ptr,\ndiff --git a/arch/loongarch/kernel/machine_kexec_file.c b/arch/loongarch/kernel/machine_kexec_file.c\nindex fb57026f5f25..e8bc7e65d400 100644\n--- a/arch/loongarch/kernel/machine_kexec_file.c\n+++ b/arch/loongarch/kernel/machine_kexec_file.c\n@@ -56,23 +56,22 @@ static void cmdline_add_initrd(struct kimage *image, unsigned long *cmdline_tmpl\n }\n \n #ifdef CONFIG_CRASH_DUMP\n-\n-static int prepare_elf_headers(void **addr, unsigned long *sz)\n+int arch_get_system_nr_ranges(unsigned int *nr_ranges)\n {\n-\tint ret, nr_ranges;\n-\tuint64_t i;\n \tphys_addr_t start, end;\n-\tstruct crash_mem *cmem;\n+\tuint64_t i;\n \n-\tnr_ranges = 2; /* for exclusion of crashkernel region */\n \tfor_each_mem_range(i, &start, &end)\n-\t\tnr_ranges++;\n+\t\t(*nr_ranges)++;\n \n-\tcmem = kmalloc(struct_size(cmem, ranges, nr_ranges), GFP_KERNEL);\n-\tif (!cmem)\n-\t\treturn -ENOMEM;\n+\treturn 0;\n+}\n+\n+int arch_prepare_elf64_ram_headers(struct crash_mem *cmem)\n+{\n+\tphys_addr_t start, end;\n+\tuint64_t i;\n \n-\tcmem->max_nr_ranges = nr_ranges;\n \tcmem->nr_ranges = 0;\n \tfor_each_mem_range(i, &start, &end) {\n \t\tcmem->ranges[cmem->nr_ranges].start = start;\n@@ -80,22 +79,7 @@ static int prepare_elf_headers(void **addr, unsigned long *sz)\n \t\tcmem->nr_ranges++;\n \t}\n \n-\t/* Exclude crashkernel region */\n-\tret = crash_exclude_mem_range(cmem, crashk_res.start, crashk_res.end);\n-\tif (ret < 0)\n-\t\tgoto out;\n-\n-\tif (crashk_low_res.end) {\n-\t\tret = crash_exclude_mem_range(cmem, crashk_low_res.start, crashk_low_res.end);\n-\t\tif (ret < 0)\n-\t\t\tgoto out;\n-\t}\n-\n-\tret = crash_prepare_elf64_headers(cmem, true, addr, sz);\n-\n-out:\n-\tkfree(cmem);\n-\treturn ret;\n+\treturn 0;\n }\n \n /*\n@@ -163,7 +147,8 @@ int load_other_segments(struct kimage *image,\n \t\tvoid *headers;\n \t\tunsigned long headers_sz;\n \n-\t\tret = prepare_elf_headers(&headers, &headers_sz);\n+\t\tret = crash_prepare_elf64_headers(true, &headers, &headers_sz,\n+\t\t\t\t\t\t NULL, NULL, NULL);\n \t\tif (ret < 0) {\n \t\t\tpr_err(\"Preparing elf core header failed\\n\");\n \t\t\tgoto out_err;\ndiff --git a/arch/powerpc/include/asm/kexec.h b/arch/powerpc/include/asm/kexec.h\nindex bd4a6c42a5f3..1cadf34d8050 100644\n--- a/arch/powerpc/include/asm/kexec.h\n+++ b/arch/powerpc/include/asm/kexec.h\n@@ -212,6 +212,19 @@ static inline void reset_sprs(void)\n }\n #endif\n \n+#ifdef CONFIG_CRASH_DUMP\n+struct crash_mem;\n+struct memory_notify;\n+\n+int arch_crash_exclude_mem_range(struct crash_mem **mem, unsigned long long mstart,\n+\t\t\t\t unsigned long long mend);\n+#define arch_crash_exclude_mem_range arch_crash_exclude_mem_range\n+\n+int arch_get_crash_memory_ranges(struct crash_mem **cmem, unsigned long *nr_mem_ranges,\n+\t\t\t\t struct kimage *image, struct memory_notify *mn);\n+#define arch_get_crash_memory_ranges arch_get_crash_memory_ranges\n+#endif\n+\n #endif /* ! __ASSEMBLER__ */\n #endif /* __KERNEL__ */\n #endif /* _ASM_POWERPC_KEXEC_H */\ndiff --git a/arch/powerpc/include/asm/kexec_ranges.h b/arch/powerpc/include/asm/kexec_ranges.h\nindex ad95e3792d10..8489e844b447 100644\n--- a/arch/powerpc/include/asm/kexec_ranges.h\n+++ b/arch/powerpc/include/asm/kexec_ranges.h\n@@ -7,9 +7,6 @@\n void sort_memory_ranges(struct crash_mem *mrngs, bool merge);\n struct crash_mem *realloc_mem_ranges(struct crash_mem **mem_ranges);\n int add_mem_range(struct crash_mem **mem_ranges, u64 base, u64 size);\n-int crash_exclude_mem_range_guarded(struct crash_mem **mem_ranges,\n-\t\t\t\t unsigned long long mstart,\n-\t\t\t\t unsigned long long mend);\n int get_exclude_memory_ranges(struct crash_mem **mem_ranges);\n int get_reserved_memory_ranges(struct crash_mem **mem_ranges);\n int get_crash_memory_ranges(struct crash_mem **mem_ranges);\ndiff --git a/arch/powerpc/kexec/crash.c b/arch/powerpc/kexec/crash.c\nindex 898742a5205c..07463f91b2ec 100644\n--- a/arch/powerpc/kexec/crash.c\n+++ b/arch/powerpc/kexec/crash.c\n@@ -399,6 +399,43 @@ void default_machine_crash_shutdown(struct pt_regs *regs)\n \t\tppc_md.kexec_cpu_down(1, 0);\n }\n \n+int arch_get_crash_memory_ranges(struct crash_mem **cmem, unsigned long *nr_mem_ranges,\n+\t\t\t\t struct kimage *image, struct memory_notify *mn)\n+{\n+#ifdef CONFIG_CRASH_HOTPLUG\n+\tunsigned long base_addr, size, end;\n+#endif\n+\tint ret;\n+\n+\tret = get_crash_memory_ranges(cmem);\n+\tif (ret) {\n+\t\tpr_err(\"Failed to get crash mem range\\n\");\n+\t\treturn ret;\n+\t}\n+\n+\tif (!image || !mn)\n+\t\treturn 0;\n+\n+\t/*\n+\t * The hot unplugged memory is part of crash memory ranges,\n+\t * remove it here.\n+\t */\n+#ifdef CONFIG_CRASH_HOTPLUG\n+\tif (image->hp_action == KEXEC_CRASH_HP_REMOVE_MEMORY) {\n+\t\tbase_addr = PFN_PHYS(mn->start_pfn);\n+\t\tsize = mn->nr_pages * PAGE_SIZE;\n+\t\tend = base_addr + size - 1;\n+\t\tret = arch_crash_exclude_mem_range(cmem, base_addr, end);\n+\t\tif (ret) {\n+\t\t\tpr_err(\"Failed to remove hot-unplugged memory from crash memory ranges\\n\");\n+\t\t\treturn ret;\n+\t\t}\n+\t}\n+#endif\n+\n+\treturn 0;\n+}\n+\n #ifdef CONFIG_CRASH_HOTPLUG\n #undef pr_fmt\n #define pr_fmt(fmt) \"crash hp: \" fmt\n@@ -427,38 +464,16 @@ unsigned int arch_crash_get_elfcorehdr_size(void)\n */\n static void update_crash_elfcorehdr(struct kimage *image, struct memory_notify *mn)\n {\n-\tint ret;\n-\tstruct crash_mem *cmem = NULL;\n-\tstruct kexec_segment *ksegment;\n \tvoid *ptr, *mem, *elfbuf = NULL;\n-\tunsigned long elfsz, memsz, base_addr, size, end;\n+\tstruct kexec_segment *ksegment;\n+\tunsigned long elfsz, memsz;\n+\tint ret;\n \n \tksegment = &image->segment[image->elfcorehdr_index];\n \tmem = (void *) ksegment->mem;\n \tmemsz = ksegment->memsz;\n \n-\tret = get_crash_memory_ranges(&cmem);\n-\tif (ret) {\n-\t\tpr_err(\"Failed to get crash mem range\\n\");\n-\t\treturn;\n-\t}\n-\n-\t/*\n-\t * The hot unplugged memory is part of crash memory ranges,\n-\t * remove it here.\n-\t */\n-\tif (image->hp_action == KEXEC_CRASH_HP_REMOVE_MEMORY) {\n-\t\tbase_addr = PFN_PHYS(mn->start_pfn);\n-\t\tsize = mn->nr_pages * PAGE_SIZE;\n-\t\tend = base_addr + size - 1;\n-\t\tret = crash_exclude_mem_range_guarded(&cmem, base_addr, end);\n-\t\tif (ret) {\n-\t\t\tpr_err(\"Failed to remove hot-unplugged memory from crash memory ranges\\n\");\n-\t\t\tgoto out;\n-\t\t}\n-\t}\n-\n-\tret = crash_prepare_elf64_headers(cmem, false, &elfbuf, &elfsz);\n+\tret = crash_prepare_elf64_headers(false, &elfbuf, &elfsz, NULL, image, mn);\n \tif (ret) {\n \t\tpr_err(\"Failed to prepare elf header\\n\");\n \t\tgoto out;\n@@ -487,7 +502,6 @@ static void update_crash_elfcorehdr(struct kimage *image, struct memory_notify *\n \t\txchg(&kexec_crash_image, image);\n \t}\n out:\n-\tkvfree(cmem);\n \tkvfree(elfbuf);\n }\n \ndiff --git a/arch/powerpc/kexec/file_load_64.c b/arch/powerpc/kexec/file_load_64.c\nindex e7ef8b2a2554..6fe13031236c 100644\n--- a/arch/powerpc/kexec/file_load_64.c\n+++ b/arch/powerpc/kexec/file_load_64.c\n@@ -401,17 +401,17 @@ static void update_backup_region_phdr(struct kimage *image, Elf64_Ehdr *ehdr)\n \t}\n }\n \n-static unsigned int kdump_extra_elfcorehdr_size(struct crash_mem *cmem)\n+static unsigned int kdump_extra_elfcorehdr_size(unsigned long nr_mem_ranges)\n {\n #if defined(CONFIG_CRASH_HOTPLUG) && defined(CONFIG_MEMORY_HOTPLUG)\n \tunsigned int extra_sz = 0;\n \n \tif (CONFIG_CRASH_MAX_MEMORY_RANGES > (unsigned int)PN_XNUM)\n \t\tpr_warn(\"Number of Phdrs %u exceeds max\\n\", CONFIG_CRASH_MAX_MEMORY_RANGES);\n-\telse if (cmem->nr_ranges >= CONFIG_CRASH_MAX_MEMORY_RANGES)\n+\telse if (nr_mem_ranges >= CONFIG_CRASH_MAX_MEMORY_RANGES)\n \t\tpr_warn(\"Configured crash mem ranges may not be enough\\n\");\n \telse\n-\t\textra_sz = (CONFIG_CRASH_MAX_MEMORY_RANGES - cmem->nr_ranges) * sizeof(Elf64_Phdr);\n+\t\textra_sz = (CONFIG_CRASH_MAX_MEMORY_RANGES - nr_mem_ranges) * sizeof(Elf64_Phdr);\n \n \treturn extra_sz;\n #endif\n@@ -428,17 +428,13 @@ static unsigned int kdump_extra_elfcorehdr_size(struct crash_mem *cmem)\n */\n static int load_elfcorehdr_segment(struct kimage *image, struct kexec_buf *kbuf)\n {\n-\tstruct crash_mem *cmem = NULL;\n+\tunsigned long nr_mem_ranges;\n \tunsigned long headers_sz;\n \tvoid *headers = NULL;\n \tint ret;\n \n-\tret = get_crash_memory_ranges(&cmem);\n-\tif (ret)\n-\t\tgoto out;\n-\n \t/* Setup elfcorehdr segment */\n-\tret = crash_prepare_elf64_headers(cmem, false, &headers, &headers_sz);\n+\tret = crash_prepare_elf64_headers(false, &headers, &headers_sz, &nr_mem_ranges, NULL, NULL);\n \tif (ret) {\n \t\tpr_err(\"Failed to prepare elf headers for the core\\n\");\n \t\tgoto out;\n@@ -450,7 +446,7 @@ static int load_elfcorehdr_segment(struct kimage *image, struct kexec_buf *kbuf)\n \tkbuf->buffer = headers;\n \tkbuf->mem = KEXEC_BUF_MEM_UNKNOWN;\n \tkbuf->bufsz = headers_sz;\n-\tkbuf->memsz = headers_sz + kdump_extra_elfcorehdr_size(cmem);\n+\tkbuf->memsz = headers_sz + kdump_extra_elfcorehdr_size(nr_mem_ranges);\n \tkbuf->top_down = false;\n \n \tret = kexec_add_buffer(kbuf);\n@@ -463,7 +459,6 @@ static int load_elfcorehdr_segment(struct kimage *image, struct kexec_buf *kbuf)\n \timage->elf_headers_sz = headers_sz;\n \timage->elf_headers = headers;\n out:\n-\tkfree(cmem);\n \treturn ret;\n }\n \ndiff --git a/arch/powerpc/kexec/ranges.c b/arch/powerpc/kexec/ranges.c\nindex 6c58bcc3e130..15dfd3b9d538 100644\n--- a/arch/powerpc/kexec/ranges.c\n+++ b/arch/powerpc/kexec/ranges.c\n@@ -553,9 +553,9 @@ int get_usable_memory_ranges(struct crash_mem **mem_ranges)\n #endif /* CONFIG_KEXEC_FILE */\n \n #ifdef CONFIG_CRASH_DUMP\n-int crash_exclude_mem_range_guarded(struct crash_mem **mem_ranges,\n-\t\t\t\t\t unsigned long long mstart,\n-\t\t\t\t\t unsigned long long mend)\n+int arch_crash_exclude_mem_range(struct crash_mem **mem_ranges,\n+\t\t\t\t unsigned long long mstart,\n+\t\t\t\t unsigned long long mend)\n {\n \tstruct crash_mem *tmem = *mem_ranges;\n \n@@ -604,18 +604,6 @@ int get_crash_memory_ranges(struct crash_mem **mem_ranges)\n \t\t\tsort_memory_ranges(*mem_ranges, true);\n \t}\n \n-\t/* Exclude crashkernel region */\n-\tret = crash_exclude_mem_range_guarded(mem_ranges, crashk_res.start, crashk_res.end);\n-\tif (ret)\n-\t\tgoto out;\n-\n-\tfor (i = 0; i < crashk_cma_cnt; ++i) {\n-\t\tret = crash_exclude_mem_range_guarded(mem_ranges, crashk_cma_ranges[i].start,\n-\t\t\t\t\t crashk_cma_ranges[i].end);\n-\t\tif (ret)\n-\t\t\tgoto out;\n-\t}\n-\n \t/*\n \t * FIXME: For now, stay in parity with kexec-tools but if RTAS/OPAL\n \t * regions are exported to save their context at the time of\ndiff --git a/arch/riscv/include/asm/kexec.h b/arch/riscv/include/asm/kexec.h\nindex b9ee8346cc8c..1eb28d24a5ef 100644\n--- a/arch/riscv/include/asm/kexec.h\n+++ b/arch/riscv/include/asm/kexec.h\n@@ -73,6 +73,13 @@ int load_extra_segments(struct kimage *image, unsigned long kernel_start,\n \t\t\tunsigned long kernel_len, char *initrd,\n \t\t\tunsigned long initrd_len, char *cmdline,\n \t\t\tunsigned long cmdline_len);\n-#endif\n+\n+int arch_get_system_nr_ranges(unsigned int *nr_ranges);\n+#define arch_get_system_nr_ranges arch_get_system_nr_ranges\n+\n+struct crash_mem;\n+int arch_prepare_elf64_ram_headers(struct crash_mem *cmem);\n+#define arch_prepare_elf64_ram_headers arch_prepare_elf64_ram_headers\n+#endif /* CONFIG_KEXEC_FILE */\n \n #endif\ndiff --git a/arch/riscv/kernel/machine_kexec_file.c b/arch/riscv/kernel/machine_kexec_file.c\nindex dd9d92a96517..2f0e7bbeb2f0 100644\n--- a/arch/riscv/kernel/machine_kexec_file.c\n+++ b/arch/riscv/kernel/machine_kexec_file.c\n@@ -44,6 +44,13 @@ static int get_nr_ram_ranges_callback(struct resource *res, void *arg)\n \treturn 0;\n }\n \n+int arch_get_system_nr_ranges(unsigned int *nr_ranges)\n+{\n+\twalk_system_ram_res(0, -1, nr_ranges, get_nr_ram_ranges_callback);\n+\n+\treturn 0;\n+}\n+\n static int prepare_elf64_ram_headers_callback(struct resource *res, void *arg)\n {\n \tstruct crash_mem *cmem = arg;\n@@ -55,33 +62,10 @@ static int prepare_elf64_ram_headers_callback(struct resource *res, void *arg)\n \treturn 0;\n }\n \n-static int prepare_elf_headers(void **addr, unsigned long *sz)\n+int arch_prepare_elf64_ram_headers(struct crash_mem *cmem)\n {\n-\tstruct crash_mem *cmem;\n-\tunsigned int nr_ranges;\n-\tint ret;\n-\n-\tnr_ranges = 1; /* For exclusion of crashkernel region */\n-\twalk_system_ram_res(0, -1, &nr_ranges, get_nr_ram_ranges_callback);\n-\n-\tcmem = kmalloc(struct_size(cmem, ranges, nr_ranges), GFP_KERNEL);\n-\tif (!cmem)\n-\t\treturn -ENOMEM;\n-\n-\tcmem->max_nr_ranges = nr_ranges;\n \tcmem->nr_ranges = 0;\n-\tret = walk_system_ram_res(0, -1, cmem, prepare_elf64_ram_headers_callback);\n-\tif (ret)\n-\t\tgoto out;\n-\n-\t/* Exclude crashkernel region */\n-\tret = crash_exclude_mem_range(cmem, crashk_res.start, crashk_res.end);\n-\tif (!ret)\n-\t\tret = crash_prepare_elf64_headers(cmem, true, addr, sz);\n-\n-out:\n-\tkfree(cmem);\n-\treturn ret;\n+\treturn walk_system_ram_res(0, -1, cmem, prepare_elf64_ram_headers_callback);\n }\n \n static char *setup_kdump_cmdline(struct kimage *image, char *cmdline,\n@@ -273,7 +257,8 @@ int load_extra_segments(struct kimage *image, unsigned long kernel_start,\n \tif (image->type == KEXEC_TYPE_CRASH) {\n \t\tvoid *headers;\n \t\tunsigned long headers_sz;\n-\t\tret = prepare_elf_headers(&headers, &headers_sz);\n+\n+\t\tret = crash_prepare_elf64_headers(true, &headers, &headers_sz, NULL, NULL, NULL);\n \t\tif (ret) {\n \t\t\tpr_err(\"Preparing elf core header failed\\n\");\n \t\t\tgoto out;\ndiff --git a/arch/x86/include/asm/kexec.h b/arch/x86/include/asm/kexec.h\nindex 5cfb27f26583..3b04d2b4dee6 100644\n--- a/arch/x86/include/asm/kexec.h\n+++ b/arch/x86/include/asm/kexec.h\n@@ -232,6 +232,15 @@ unsigned int arch_crash_get_elfcorehdr_size(void);\n #define crash_get_elfcorehdr_size arch_crash_get_elfcorehdr_size\n #endif\n \n+#if defined(CONFIG_KEXEC_FILE) || defined(CONFIG_CRASH_HOTPLUG)\n+struct crash_mem;\n+int arch_get_system_nr_ranges(unsigned int *nr_ranges);\n+#define arch_get_system_nr_ranges arch_get_system_nr_ranges\n+\n+int arch_prepare_elf64_ram_headers(struct crash_mem *cmem);\n+#define arch_prepare_elf64_ram_headers arch_prepare_elf64_ram_headers\n+#endif\n+\n #endif /* __ASSEMBLER__ */\n \n #endif /* _ASM_X86_KEXEC_H */\ndiff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c\nindex 335fd2ee9766..3fbbd518604a 100644\n--- a/arch/x86/kernel/crash.c\n+++ b/arch/x86/kernel/crash.c\n@@ -152,73 +152,15 @@ static int get_nr_ram_ranges_callback(struct resource *res, void *arg)\n \treturn 0;\n }\n \n-/* Gather all the required information to prepare elf headers for ram regions */\n-static struct crash_mem *fill_up_crash_elf_data(void)\n+int arch_get_system_nr_ranges(unsigned int *nr_ranges)\n {\n-\tunsigned int nr_ranges = 0;\n-\tstruct crash_mem *cmem;\n+\tint ret;\n \n-\twalk_system_ram_res(0, -1, &nr_ranges, get_nr_ram_ranges_callback);\n+\tret = walk_system_ram_res(0, -1, &nr_ranges, get_nr_ram_ranges_callback);\n \tif (!nr_ranges)\n-\t\treturn NULL;\n-\n-\t/*\n-\t * Exclusion of crash region, crashk_low_res and/or crashk_cma_ranges\n-\t * may cause range splits. So add extra slots here.\n-\t *\n-\t * Exclusion of low 1M may not cause another range split, because the\n-\t * range of exclude is [0, 1M] and the condition for splitting a new\n-\t * region is that the start, end parameters are both in a certain\n-\t * existing region in cmem and cannot be equal to existing region's\n-\t * start or end. Obviously, the start of [0, 1M] cannot meet this\n-\t * condition.\n-\t *\n-\t * But in order to lest the low 1M could be changed in the future,\n-\t * (e.g. [start, 1M]), add a extra slot.\n-\t */\n-\tnr_ranges += 3 + crashk_cma_cnt;\n-\tcmem = vzalloc(struct_size(cmem, ranges, nr_ranges));\n-\tif (!cmem)\n-\t\treturn NULL;\n-\n-\tcmem->max_nr_ranges = nr_ranges;\n-\n-\treturn cmem;\n-}\n-\n-/*\n- * Look for any unwanted ranges between mstart, mend and remove them. This\n- * might lead to split and split ranges are put in cmem->ranges[] array\n- */\n-static int elf_header_exclude_ranges(struct crash_mem *cmem)\n-{\n-\tint ret = 0;\n-\tint i;\n-\n-\t/* Exclude the low 1M because it is always reserved */\n-\tret = crash_exclude_mem_range(cmem, 0, SZ_1M - 1);\n-\tif (ret)\n-\t\treturn ret;\n-\n-\t/* Exclude crashkernel region */\n-\tret = crash_exclude_mem_range(cmem, crashk_res.start, crashk_res.end);\n-\tif (ret)\n-\t\treturn ret;\n-\n-\tif (crashk_low_res.end)\n-\t\tret = crash_exclude_mem_range(cmem, crashk_low_res.start,\n-\t\t\t\t\t crashk_low_res.end);\n-\tif (ret)\n-\t\treturn ret;\n-\n-\tfor (i = 0; i < crashk_cma_cnt; ++i) {\n-\t\tret = crash_exclude_mem_range(cmem, crashk_cma_ranges[i].start,\n-\t\t\t\t\t crashk_cma_ranges[i].end);\n-\t\tif (ret)\n-\t\t\treturn ret;\n-\t}\n+\t\treturn -ENOMEM;\n \n-\treturn 0;\n+\treturn ret;\n }\n \n static int prepare_elf64_ram_headers_callback(struct resource *res, void *arg)\n@@ -232,35 +174,9 @@ static int prepare_elf64_ram_headers_callback(struct resource *res, void *arg)\n \treturn 0;\n }\n \n-/* Prepare elf headers. Return addr and size */\n-static int prepare_elf_headers(void **addr, unsigned long *sz,\n-\t\t\t unsigned long *nr_mem_ranges)\n+int arch_prepare_elf64_ram_headers(struct crash_mem *cmem)\n {\n-\tstruct crash_mem *cmem;\n-\tint ret;\n-\n-\tcmem = fill_up_crash_elf_data();\n-\tif (!cmem)\n-\t\treturn -ENOMEM;\n-\n-\tret = walk_system_ram_res(0, -1, cmem, prepare_elf64_ram_headers_callback);\n-\tif (ret)\n-\t\tgoto out;\n-\n-\t/* Exclude unwanted mem ranges */\n-\tret = elf_header_exclude_ranges(cmem);\n-\tif (ret)\n-\t\tgoto out;\n-\n-\t/* Return the computed number of memory ranges, for hotplug usage */\n-\t*nr_mem_ranges = cmem->nr_ranges;\n-\n-\t/* By default prepare 64bit headers */\n-\tret = crash_prepare_elf64_headers(cmem, IS_ENABLED(CONFIG_X86_64), addr, sz);\n-\n-out:\n-\tvfree(cmem);\n-\treturn ret;\n+\treturn walk_system_ram_res(0, -1, cmem, prepare_elf64_ram_headers_callback);\n }\n #endif\n \n@@ -418,7 +334,8 @@ int crash_load_segments(struct kimage *image)\n \t\t\t\t .buf_max = ULONG_MAX, .top_down = false };\n \n \t/* Prepare elf headers and add a segment */\n-\tret = prepare_elf_headers(&kbuf.buffer, &kbuf.bufsz, &pnum);\n+\tret = crash_prepare_elf64_headers(IS_ENABLED(CONFIG_X86_64), &kbuf.buffer,\n+\t\t\t\t\t &kbuf.bufsz, &pnum, NULL, NULL);\n \tif (ret)\n \t\treturn ret;\n \n@@ -529,7 +446,8 @@ void arch_crash_handle_hotplug_event(struct kimage *image, void *arg)\n \t * Create the new elfcorehdr reflecting the changes to CPU and/or\n \t * memory resources.\n \t */\n-\tif (prepare_elf_headers(&elfbuf, &elfsz, &nr_mem_ranges)) {\n+\tif (crash_prepare_elf64_headers(IS_ENABLED(CONFIG_X86_64), &elfbuf, &elfsz,\n+\t\t\t\t\t&nr_mem_ranges, NULL, NULL)) {\n \t\tpr_err(\"unable to create new elfcorehdr\");\n \t\tgoto out;\n \t}\ndiff --git a/include/linux/crash_core.h b/include/linux/crash_core.h\nindex d35726d6a415..3105d28fd0c6 100644\n--- a/include/linux/crash_core.h\n+++ b/include/linux/crash_core.h\n@@ -2,11 +2,14 @@\n #ifndef LINUX_CRASH_CORE_H\n #define LINUX_CRASH_CORE_H\n \n-#include <linux/linkage.h>\n #include <linux/elfcore.h>\n #include <linux/elf.h>\n+#include <linux/kexec.h>\n+#include <linux/linkage.h>\n+#include <linux/vmalloc.h>\n \n struct kimage;\n+struct memory_notify;\n \n struct crash_mem {\n \tunsigned int max_nr_ranges;\n@@ -54,6 +57,66 @@ static inline int arch_crash_hotplug_support(struct kimage *image, unsigned long\n }\n #endif\n \n+extern int crash_exclude_mem_range(struct crash_mem *mem,\n+\t\t\t\t unsigned long long mstart,\n+\t\t\t\t unsigned long long mend);\n+\n+#ifndef arch_crash_exclude_mem_range\n+static __always_inline int arch_crash_exclude_mem_range(struct crash_mem **mem_ranges,\n+\t\t\t\t\t\t\tunsigned long long mstart,\n+\t\t\t\t\t\t\tunsigned long long mend)\n+{\n+\treturn crash_exclude_mem_range(*mem_ranges, mstart, mend);\n+}\n+#endif\n+\n+#ifndef arch_get_system_nr_ranges\n+static inline int arch_get_system_nr_ranges(unsigned int *nr_ranges)\n+{\n+\treturn -EINVAL;\n+}\n+#endif\n+\n+#ifndef arch_prepare_elf64_ram_headers\n+static inline int arch_prepare_elf64_ram_headers(struct crash_mem *cmem)\n+{\n+\treturn -EINVAL;\n+}\n+#endif\n+\n+#ifndef arch_get_crash_memory_ranges\n+static inline int arch_get_crash_memory_ranges(struct crash_mem **cmem,\n+\t\t\t\t\t unsigned long *nr_mem_ranges,\n+\t\t\t\t\t struct kimage *image,\n+\t\t\t\t\t struct memory_notify *mn)\n+{\n+\tunsigned int nr_ranges;\n+\tint ret;\n+\n+\t/*\n+\t * Exclusion of crash region, crashk_low_res and/or crashk_cma_ranges\n+\t * may cause range splits. So add extra slots here.\n+\t */\n+\tnr_ranges = 1 + (crashk_low_res.end != 0) + crashk_cma_cnt;\n+\tret = arch_get_system_nr_ranges(&nr_ranges);\n+\tif (ret)\n+\t\treturn ret;\n+\n+\t*cmem = kvzalloc(struct_size(*cmem, ranges, nr_ranges), GFP_KERNEL);\n+\tif (!(*cmem))\n+\t\treturn -ENOMEM;\n+\n+\t(*cmem)->max_nr_ranges = nr_ranges;\n+\tret = arch_prepare_elf64_ram_headers(*cmem);\n+\tif (ret) {\n+\t\tkvfree(*cmem);\n+\t\treturn ret;\n+\t}\n+\n+\treturn 0;\n+}\n+#endif\n+\n #ifndef crash_get_elfcorehdr_size\n static inline unsigned int crash_get_elfcorehdr_size(void) { return 0; }\n #endif\n@@ -61,11 +124,11 @@ static inline unsigned int crash_get_elfcorehdr_size(void) { return 0; }\n /* Alignment required for elf header segment */\n #define ELF_CORE_HEADER_ALIGN 4096\n \n-extern int crash_exclude_mem_range(struct crash_mem *mem,\n-\t\t\t\t unsigned long long mstart,\n-\t\t\t\t unsigned long long mend);\n-extern int crash_prepare_elf64_headers(struct crash_mem *mem, int need_kernel_map,\n-\t\t\t\t void **addr, unsigned long *sz);\n+extern int crash_prepare_elf64_headers(int need_kernel_map,\n+\t\t\t\t void **addr, unsigned long *sz,\n+\t\t\t\t unsigned long *nr_mem_ranges,\n+\t\t\t\t struct kimage *image,\n+\t\t\t\t struct memory_notify *mn);\n \n struct kimage;\n struct kexec_segment;\ndiff --git a/kernel/crash_core.c b/kernel/crash_core.c\nindex 99dac1aa972a..99a0d6abf88e 100644\n--- a/kernel/crash_core.c\n+++ b/kernel/crash_core.c\n@@ -18,6 +18,7 @@\n #include <linux/memblock.h>\n #include <linux/kmemleak.h>\n #include <linux/crash_core.h>\n+#include <linux/crash_reserve.h>\n #include <linux/reboot.h>\n #include <linux/btf.h>\n #include <linux/objtool.h>\n@@ -161,19 +162,80 @@ static inline resource_size_t crash_resource_size(const struct resource *res)\n \treturn !res->end ? 0 : resource_size(res);\n }\n \n+static int crash_exclude_mem_ranges(struct crash_mem *cmem,\n+\t\t\t\t unsigned long *nr_mem_ranges)\n+{\n+\tint ret, i;\n+\n+#if defined(CONFIG_X86_64) || defined(CONFIG_X86_32)\n+\t/*\n+\t * Exclusion of low 1M may not cause another range split, because the\n+\t * range of exclude is [0, 1M] and the condition for splitting a new\n+\t * region is that the start, end parameters are both in a certain\n+\t * existing region in cmem and cannot be equal to existing region's\n+\t * start or end. Obviously, the start of [0, 1M] cannot meet this\n+\t * condition.\n+\t *\n+\t * But in order to lest the low 1M could be changed in the future,\n+\t * (e.g. [start, 1M]), add a extra slot.\n+\t */\n+\tcmem->max_nr_ranges++;\n \n+\t/* Exclude the low 1M because it is always reserved */\n+\tret = arch_crash_exclude_mem_range(&cmem, 0, SZ_1M - 1);\n+\tif (ret)\n+\t\treturn ret;\n+#endif\n \n+\t/* Exclude crashkernel region */\n+\tret = arch_crash_exclude_mem_range(&cmem, crashk_res.start, crashk_res.end);\n+\tif (ret)\n+\t\treturn ret;\n \n-int crash_prepare_elf64_headers(struct crash_mem *mem, int need_kernel_map,\n-\t\t\t void **addr, unsigned long *sz)\n+\tif (crashk_low_res.end) {\n+\t\tret = arch_crash_exclude_mem_range(&cmem, crashk_low_res.start, crashk_low_res.end);\n+\t\tif (ret)\n+\t\t\treturn ret;\n+\t}\n+\n+\tfor (i = 0; i < crashk_cma_cnt; ++i) {\n+\t\tret = arch_crash_exclude_mem_range(&cmem, crashk_cma_ranges[i].start,\n+\t\t\t\t\t\t crashk_cma_ranges[i].end);\n+\t\tif (ret)\n+\t\t\treturn ret;\n+\t}\n+\n+\t/* Return the computed number of memory ranges, for hotplug usage */\n+\tif (nr_mem_ranges)\n+\t\t*nr_mem_ranges = cmem->nr_ranges;\n+\n+\treturn 0;\n+}\n+\n+int crash_prepare_elf64_headers(int need_kernel_map, void **addr,\n+\t\t\t\tunsigned long *sz, unsigned long *nr_mem_ranges,\n+\t\t\t\tstruct kimage *image, struct memory_notify *mn)\n {\n-\tElf64_Ehdr *ehdr;\n-\tElf64_Phdr *phdr;\n \tunsigned long nr_cpus = num_possible_cpus(), nr_phdr, elf_sz;\n-\tunsigned char *buf;\n-\tunsigned int cpu, i;\n \tunsigned long long notes_addr;\n+\tstruct crash_mem *mem = NULL;\n \tunsigned long mstart, mend;\n+\tunsigned int cpu, i;\n+\tunsigned char *buf;\n+\tElf64_Ehdr *ehdr;\n+\tElf64_Phdr *phdr;\n+\tint ret = 0;\n+\n+\tret = arch_get_crash_memory_ranges(&mem, nr_mem_ranges, image, mn);\n+\tif (ret)\n+\t\treturn ret;\n+\n+\tif (!mem)\n+\t\treturn -ENOMEM;\n+\n+\tret = crash_exclude_mem_ranges(mem, nr_mem_ranges);\n+\tif (ret)\n+\t\tgoto out;\n \n \t/* extra phdr for vmcoreinfo ELF note */\n \tnr_phdr = nr_cpus + 1;\n@@ -192,8 +254,10 @@ int crash_prepare_elf64_headers(struct crash_mem *mem, int need_kernel_map,\n \telf_sz = ALIGN(elf_sz, ELF_CORE_HEADER_ALIGN);\n \n \tbuf = vzalloc(elf_sz);\n-\tif (!buf)\n-\t\treturn -ENOMEM;\n+\tif (!buf) {\n+\t\tret = -ENOMEM;\n+\t\tgoto out;\n+\t}\n \n \tehdr = (Elf64_Ehdr *)buf;\n \tphdr = (Elf64_Phdr *)(ehdr + 1);\n@@ -262,7 +326,10 @@ int crash_prepare_elf64_headers(struct crash_mem *mem, int need_kernel_map,\n \n \t*addr = buf;\n \t*sz = elf_sz;\n-\treturn 0;\n+\n+out:\n+\tkvfree(mem);\n+\treturn ret;\n }\n \n /**\n", "prefixes": [ "v5", "2/4" ] }