Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/2217374/?format=api
{ "id": 2217374, "url": "http://patchwork.ozlabs.org/api/patches/2217374/?format=api", "web_url": "http://patchwork.ozlabs.org/project/linuxppc-dev/patch/20260328074013.3589544-9-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": "<20260328074013.3589544-9-ruanjinjie@huawei.com>", "list_archive_url": "https://lore.kernel.org/linuxppc-dev/20260328074013.3589544-9-ruanjinjie@huawei.com/", "date": "2026-03-28T07:40:10", "name": "[v11,08/11] crash: Exclude crash kernel memory in crash core", "commit_ref": null, "pull_url": null, "state": "handled-elsewhere", "archived": false, "hash": "cd402305605ebf9a1cd75d1ad0cc5c7f3d7f7a8f", "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/20260328074013.3589544-9-ruanjinjie@huawei.com/mbox/", "series": [ { "id": 497856, "url": "http://patchwork.ozlabs.org/api/series/497856/?format=api", "web_url": "http://patchwork.ozlabs.org/project/linuxppc-dev/list/?series=497856", "date": "2026-03-28T07:40:03", "name": "arm64/riscv: Add support for crashkernel CMA reservation", "version": 11, "mbox": "http://patchwork.ozlabs.org/series/497856/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/2217374/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2217374/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "\n <linuxppc-dev+bounces-18957-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=ms6TEfYQ;\n\tdkim-atps=neutral", "legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=lists.ozlabs.org\n (client-ip=112.213.38.117; helo=lists.ozlabs.org;\n envelope-from=linuxppc-dev+bounces-18957-incoming=patchwork.ozlabs.org@lists.ozlabs.org;\n receiver=patchwork.ozlabs.org)", "lists.ozlabs.org;\n arc=none smtp.remote-ip=113.46.200.225", "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=ms6TEfYQ;\n\tdkim-atps=neutral", "lists.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=huawei.com\n (client-ip=113.46.200.225; helo=canpmsgout10.his.huawei.com;\n envelope-from=ruanjinjie@huawei.com; receiver=lists.ozlabs.org)" ], "Received": [ "from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117])\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 legolas.ozlabs.org (Postfix) with ESMTPS id 4fjTxZ2FB2z1xy1\n\tfor <incoming@patchwork.ozlabs.org>; Sat, 28 Mar 2026 18:42:26 +1100 (AEDT)", "from boromir.ozlabs.org (localhost [127.0.0.1])\n\tby lists.ozlabs.org (Postfix) with ESMTP id 4fjTwl5sB0z2yyy;\n\tSat, 28 Mar 2026 18:41:43 +1100 (AEDT)", "from canpmsgout10.his.huawei.com (canpmsgout10.his.huawei.com\n [113.46.200.225])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519 server-signature RSA-PSS (2048 bits) server-digest\n SHA256)\n\t(No client certificate requested)\n\tby lists.ozlabs.org (Postfix) with ESMTPS id 4fjTwk4DWhz2ygm\n\tfor <linuxppc-dev@lists.ozlabs.org>; Sat, 28 Mar 2026 18:41:42 +1100 (AEDT)", "from mail.maildlp.com (unknown [172.19.163.200])\n\tby canpmsgout10.his.huawei.com (SkyGuard) with ESMTPS id 4fjTnf0yMzz1K9Bl;\n\tSat, 28 Mar 2026 15:35:34 +0800 (CST)", "from dggpemf500011.china.huawei.com (unknown [7.185.36.131])\n\tby mail.maildlp.com (Postfix) with ESMTPS id 2C8884055B;\n\tSat, 28 Mar 2026 15:41:39 +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; Sat, 28 Mar\n 2026 15:41:36 +0800" ], "ARC-Seal": "i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1774683703;\n\tcv=none;\n b=RS+2tZ7G7z3A6truM1i+eVS0yBXSBh9E/Xm6YvwsX/uoJL5GKK8OpxryrgLdfAWNG7N0+E/FiTLaCofKGZpBebtz7qxEIM+iXh+GViUXzWtsKr7bquEWd6wXP5WiY/kQ00O7KvCbRXqBRQ7JeEBN/r1tpGU7vWec+25UBflSdleE6U0Rn67euLXnlXFxPlyqV68TvTbKBqXlpjlimNQtN76U3UxCSVdFykaDjrIgCKPix6rIbyvkpGwFDQyIBHFu4PFDxjOZmW9nqZPJpR0N0c8bCW6cUc6lnQEfxNOypz9lXbaXpcnauqX5lhB74dqTYojccLZGUdFQULElnjgH/Q==", "ARC-Message-Signature": "i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707;\n\tt=1774683703; c=relaxed/relaxed;\n\tbh=+sSWz7bnD/KV37dPjZGhcAZm3k/W/RdGCPDVup5nN9I=;\n\th=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References:\n\t MIME-Version:Content-Type;\n b=EaxgTuA18KDumcLDzd67uym40xw/8Qt14S1z2iW4h2dNCsQr65ChslzdDHmsuNDiVB1w42+jmpGbg3WZ+11hcA5XEHMkotORNNpHmsQIzWD23BGK9nbYn1/K8Oq815X39YnF1Qk9iElodOTXcpVLz7iEoRWIB9E6au+oFYdhX659y1fNRTqurviKaQIxBpUdrLzSZoDaQAIR8z2Su02nAwMWgQ620CO95dPboQb3OdnU2wx+kWrzNKt0j5yRC5OK6VJif3ZdVP2BRLJf982zq13LXVPBvNX10xDjyETD6qOQabvEP4AH3VYTyL6e5pvb0CMpbUDB698nW4te/MbcfQ==", "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=ms6TEfYQ; dkim-atps=neutral;\n spf=pass (client-ip=113.46.200.225; helo=canpmsgout10.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=+sSWz7bnD/KV37dPjZGhcAZm3k/W/RdGCPDVup5nN9I=;\n\tb=ms6TEfYQU7f4vkAm2zx1fG1YcvGC8430Uz+xfEFHYqKuviex9FJjNxHi55c+p1aI+WzRXD4Ac\n\tHnnM0LYBq1EJCt0KkWQAQFt/C/MOaQd84Y//H4D1nYGmP/rbfHr/CW9+Wf+fL/wsVdBCHART4s7\n\t6WZU1rQlqe6gS5FkFsCmWTI=", "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>, <robh@kernel.org>, <saravanak@kernel.org>,\n\t<akpm@linux-foundation.org>, <bhe@redhat.com>, <vgoyal@redhat.com>,\n\t<dyoung@redhat.com>, <rdunlap@infradead.org>, <peterz@infradead.org>,\n\t<feng.tang@linux.alibaba.com>, <pawan.kumar.gupta@linux.intel.com>,\n\t<dapeng1.mi@linux.intel.com>, <kees@kernel.org>, <elver@google.com>,\n\t<paulmck@kernel.org>, <lirongqing@baidu.com>, <rppt@kernel.org>,\n\t<leitao@debian.org>, <ardb@kernel.org>, <cfsworks@gmail.com>,\n\t<osandov@fb.com>, <jbohac@suse.cz>, <tangyouling@kylinos.cn>,\n\t<sourabhjain@linux.ibm.com>, <ritesh.list@gmail.com>,\n\t<eajames@linux.ibm.com>, <songshuaishuai@tinylab.org>,\n\t<kevin.brodsky@arm.com>, <vishal.moola@gmail.com>,\n\t<junhui.liu@pigmoral.tech>, <coxu@redhat.com>, <fuqiang.wang@easystack.cn>,\n\t<liaoyuanhong@vivo.com>, <guoren@kernel.org>, <chenjiahao16@huawei.com>,\n\t<hbathini@linux.ibm.com>, <takahiro.akashi@linaro.org>,\n\t<james.morse@arm.com>, <lizhengyu3@huawei.com>, <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<devicetree@vger.kernel.org>, <kexec@lists.infradead.org>", "CC": "<ruanjinjie@huawei.com>", "Subject": "[PATCH v11 08/11] crash: Exclude crash kernel memory in crash core", "Date": "Sat, 28 Mar 2026 15:40:10 +0800", "Message-ID": "<20260328074013.3589544-9-ruanjinjie@huawei.com>", "X-Mailer": "git-send-email 2.34.1", "In-Reply-To": "<20260328074013.3589544-1-ruanjinjie@huawei.com>", "References": "<20260328074013.3589544-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": "kwepems100001.china.huawei.com (7.221.188.238) 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 crash memory alloc, and the exclude of crashk_res, crashk_low_res\nand crashk_cma memory are almost identical across different architectures,\nhandling them in the crash core would eliminate a lot of duplication, so\ndo them in the common code.\n\nTo achieve the above goal, three architecture-specific functions are\nintroduced:\n\n- arch_get_system_nr_ranges(). Pre-counts the max number of memory ranges.\n\n- arch_crash_populate_cmem(). Collects the memory ranges and fills them\n into cmem.\n\n- arch_crash_exclude_ranges(). Architecture's additional crash memory\n ranges exclusion, defaulting to empty.\n\nAcked-by: Catalin Marinas <catalin.marinas@arm.com> # arm64\nReviewed-by: Sourabh Jain <sourabhjain@linux.ibm.com>\nAcked-by: Baoquan He <bhe@redhat.com>\nAcked-by: Mike Rapoport (Microsoft) <rppt@kernel.org>\nSigned-off-by: Jinjie Ruan <ruanjinjie@huawei.com>\n---\n arch/arm64/kernel/machine_kexec_file.c | 46 ++++-------\n arch/loongarch/kernel/machine_kexec_file.c | 46 ++++-------\n arch/riscv/kernel/machine_kexec_file.c | 47 +++---------\n arch/x86/kernel/crash.c | 89 +++-------------------\n include/linux/crash_core.h | 5 ++\n kernel/crash_core.c | 82 +++++++++++++++++++-\n 6 files changed, 136 insertions(+), 179 deletions(-)", "diff": "diff --git a/arch/arm64/kernel/machine_kexec_file.c b/arch/arm64/kernel/machine_kexec_file.c\nindex df52ac4474c9..558408f403b5 100644\n--- a/arch/arm64/kernel/machine_kexec_file.c\n+++ b/arch/arm64/kernel/machine_kexec_file.c\n@@ -40,51 +40,33 @@ 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+unsigned int arch_get_system_nr_ranges(void)\n {\n-\tstruct crash_mem *cmem;\n-\tunsigned int nr_ranges;\n-\tint ret;\n-\tu64 i;\n+\tunsigned int nr_ranges = 2; /* for exclusion of crashkernel region */\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 \n-\tcmem = kmalloc_flex(*cmem, ranges, nr_ranges);\n-\tif (!cmem)\n-\t\treturn -ENOMEM;\n+\treturn nr_ranges;\n+}\n+\n+int arch_crash_populate_cmem(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\tif (cmem->nr_ranges >= cmem->max_nr_ranges) {\n-\t\t\tret = -ENOMEM;\n-\t\t\tgoto out;\n-\t\t}\n+\t\tif (cmem->nr_ranges >= cmem->max_nr_ranges)\n+\t\t\treturn -ENOMEM;\n \n \t\tcmem->ranges[cmem->nr_ranges].start = start;\n \t\tcmem->ranges[cmem->nr_ranges].end = end - 1;\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@@ -114,7 +96,7 @@ 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_headers(true, &headers, &headers_sz, 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/kernel/machine_kexec_file.c b/arch/loongarch/kernel/machine_kexec_file.c\nindex 167392c1da33..3d0386ee18ef 100644\n--- a/arch/loongarch/kernel/machine_kexec_file.c\n+++ b/arch/loongarch/kernel/machine_kexec_file.c\n@@ -56,51 +56,33 @@ 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+unsigned int arch_get_system_nr_ranges(void)\n {\n-\tint ret, nr_ranges;\n-\tuint64_t i;\n+\tint nr_ranges = 2; /* for exclusion of crashkernel region */\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 \n-\tcmem = kmalloc_flex(*cmem, ranges, nr_ranges);\n-\tif (!cmem)\n-\t\treturn -ENOMEM;\n+\treturn nr_ranges;\n+}\n+\n+int arch_crash_populate_cmem(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\tif (cmem->nr_ranges >= cmem->max_nr_ranges) {\n-\t\t\tret = -ENOMEM;\n-\t\t\tgoto out;\n-\t\t}\n+\t\tif (cmem->nr_ranges >= cmem->max_nr_ranges)\n+\t\t\treturn -ENOMEM;\n \n \t\tcmem->ranges[cmem->nr_ranges].start = start;\n \t\tcmem->ranges[cmem->nr_ranges].end = end - 1;\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@@ -168,7 +150,7 @@ 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_headers(true, &headers, &headers_sz, 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/riscv/kernel/machine_kexec_file.c b/arch/riscv/kernel/machine_kexec_file.c\nindex 773a1cba8ba0..bea818f75dd6 100644\n--- a/arch/riscv/kernel/machine_kexec_file.c\n+++ b/arch/riscv/kernel/machine_kexec_file.c\n@@ -44,6 +44,15 @@ static int get_nr_ram_ranges_callback(struct resource *res, void *arg)\n \treturn 0;\n }\n \n+unsigned int arch_get_system_nr_ranges(void)\n+{\n+\tunsigned int nr_ranges = 2; /* For exclusion of crashkernel region */\n+\n+\twalk_system_ram_res(0, -1, &nr_ranges, get_nr_ram_ranges_callback);\n+\n+\treturn nr_ranges;\n+}\n+\n static int prepare_elf64_ram_headers_callback(struct resource *res, void *arg)\n {\n \tstruct crash_mem *cmem = arg;\n@@ -58,41 +67,9 @@ 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_crash_populate_cmem(struct crash_mem *cmem)\n {\n-\tstruct crash_mem *cmem;\n-\tunsigned int nr_ranges;\n-\tint ret;\n-\n-\tnr_ranges = 2; /* For exclusion of crashkernel region */\n-\twalk_system_ram_res(0, -1, &nr_ranges, get_nr_ram_ranges_callback);\n-\n-\tcmem = kmalloc_flex(*cmem, ranges, nr_ranges);\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\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 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@@ -284,7 +261,7 @@ 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+\t\tret = crash_prepare_headers(true, &headers, &headers_sz, 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/kernel/crash.c b/arch/x86/kernel/crash.c\nindex 7fa6d45ebe3f..8927184cce32 100644\n--- a/arch/x86/kernel/crash.c\n+++ b/arch/x86/kernel/crash.c\n@@ -152,16 +152,8 @@ 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+unsigned int arch_get_system_nr_ranges(void)\n {\n-\tunsigned int nr_ranges = 0;\n-\tstruct crash_mem *cmem;\n-\n-\twalk_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@@ -176,49 +168,16 @@ static struct crash_mem *fill_up_crash_elf_data(void)\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+\tunsigned int nr_ranges = 3 + crashk_cma_cnt;\n \n-\treturn cmem;\n+\twalk_system_ram_res(0, -1, &nr_ranges, get_nr_ram_ranges_callback);\n+\treturn nr_ranges;\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+int arch_crash_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-\n-\treturn 0;\n+\treturn crash_exclude_mem_range(cmem, 0, SZ_1M - 1);\n }\n \n static int prepare_elf64_ram_headers_callback(struct resource *res, void *arg)\n@@ -235,35 +194,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_crash_populate_cmem(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@@ -421,7 +354,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_headers(IS_ENABLED(CONFIG_X86_64), &kbuf.buffer,\n+\t\t\t\t &kbuf.bufsz, &pnum);\n \tif (ret)\n \t\treturn ret;\n \n@@ -532,7 +466,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_headers(IS_ENABLED(CONFIG_X86_64), &elfbuf, &elfsz,\n+\t\t\t\t &nr_mem_ranges)) {\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..033b20204aca 100644\n--- a/include/linux/crash_core.h\n+++ b/include/linux/crash_core.h\n@@ -66,6 +66,8 @@ extern int crash_exclude_mem_range(struct crash_mem *mem,\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_headers(int need_kernel_map, void **addr,\n+\t\t\t\t unsigned long *sz, unsigned long *nr_mem_ranges);\n \n struct kimage;\n struct kexec_segment;\n@@ -83,6 +85,9 @@ int kexec_should_crash(struct task_struct *p);\n int kexec_crash_loaded(void);\n void crash_save_cpu(struct pt_regs *regs, int cpu);\n extern int kimage_crash_copy_vmcoreinfo(struct kimage *image);\n+extern unsigned int arch_get_system_nr_ranges(void);\n+extern int arch_crash_populate_cmem(struct crash_mem *cmem);\n+extern int arch_crash_exclude_ranges(struct crash_mem *cmem);\n \n #else /* !CONFIG_CRASH_DUMP*/\n struct pt_regs;\ndiff --git a/kernel/crash_core.c b/kernel/crash_core.c\nindex 2c1a3791e410..96a96e511f5a 100644\n--- a/kernel/crash_core.c\n+++ b/kernel/crash_core.c\n@@ -170,9 +170,6 @@ static inline resource_size_t crash_resource_size(const struct resource *res)\n \treturn !res->end ? 0 : resource_size(res);\n }\n \n-\n-\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 {\n@@ -274,6 +271,85 @@ int crash_prepare_elf64_headers(struct crash_mem *mem, int need_kernel_map,\n \treturn 0;\n }\n \n+static struct crash_mem *alloc_cmem(unsigned int nr_ranges)\n+{\n+\tstruct crash_mem *cmem;\n+\n+\tcmem = kvzalloc_flex(*cmem, ranges, nr_ranges);\n+\tif (!cmem)\n+\t\treturn NULL;\n+\n+\tcmem->max_nr_ranges = nr_ranges;\n+\treturn cmem;\n+}\n+\n+unsigned int __weak arch_get_system_nr_ranges(void) { return 0; }\n+int __weak arch_crash_populate_cmem(struct crash_mem *cmem) { return -1; }\n+int __weak arch_crash_exclude_ranges(struct crash_mem *cmem) { return 0; }\n+\n+static int crash_exclude_core_ranges(struct crash_mem *cmem)\n+{\n+\tint ret, i;\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, 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 = 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+\n+\treturn 0;\n+}\n+\n+int crash_prepare_headers(int need_kernel_map, void **addr, unsigned long *sz,\n+\t\t\t unsigned long *nr_mem_ranges)\n+{\n+\tunsigned int max_nr_ranges;\n+\tstruct crash_mem *cmem;\n+\tint ret;\n+\n+\tmax_nr_ranges = arch_get_system_nr_ranges();\n+\tif (!max_nr_ranges)\n+\t\treturn -ENOMEM;\n+\n+\tcmem = alloc_cmem(max_nr_ranges);\n+\tif (!cmem)\n+\t\treturn -ENOMEM;\n+\n+\tret = arch_crash_populate_cmem(cmem);\n+\tif (ret)\n+\t\tgoto out;\n+\n+\tret = crash_exclude_core_ranges(cmem);\n+\tif (ret)\n+\t\tgoto out;\n+\n+\tret = arch_crash_exclude_ranges(cmem);\n+\tif (ret)\n+\t\tgoto out;\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+\tret = crash_prepare_elf64_headers(cmem, need_kernel_map, addr, sz);\n+\n+out:\n+\tkvfree(cmem);\n+\treturn ret;\n+}\n+\n /**\n * crash_exclude_mem_range - exclude a mem range for existing ranges\n * @mem: mem->range contains an array of ranges sorted in ascending order\n", "prefixes": [ "v11", "08/11" ] }