{"id":2218965,"url":"http://patchwork.ozlabs.org/api/patches/2218965/?format=json","web_url":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/20260402072701.628293-12-ruanjinjie@huawei.com/","project":{"id":2,"url":"http://patchwork.ozlabs.org/api/projects/2/?format=json","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":"<20260402072701.628293-12-ruanjinjie@huawei.com>","list_archive_url":"https://lore.kernel.org/linuxppc-dev/20260402072701.628293-12-ruanjinjie@huawei.com/","date":"2026-04-02T07:26:57","name":"[v12,11/15] riscv: kexec_file: Use crash_prepare_headers() helper to simplify code","commit_ref":null,"pull_url":null,"state":"handled-elsewhere","archived":false,"hash":"b8a8ebdb71d7c85eccaf42018f298d56b418a777","submitter":{"id":84791,"url":"http://patchwork.ozlabs.org/api/people/84791/?format=json","name":"Jinjie Ruan","email":"ruanjinjie@huawei.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/20260402072701.628293-12-ruanjinjie@huawei.com/mbox/","series":[{"id":498443,"url":"http://patchwork.ozlabs.org/api/series/498443/?format=json","web_url":"http://patchwork.ozlabs.org/project/linuxppc-dev/list/?series=498443","date":"2026-04-02T07:26:46","name":"arm64/riscv: Add support for crashkernel CMA reservation","version":12,"mbox":"http://patchwork.ozlabs.org/series/498443/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2218965/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2218965/checks/","tags":{},"related":[],"headers":{"Return-Path":"\n ","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=06PqlyXu;\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-19202-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=06PqlyXu;\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\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)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4fmYMj5kM8z1yCs\n\tfor ; Thu, 02 Apr 2026 18:27:13 +1100 (AEDT)","from boromir.ozlabs.org (localhost [127.0.0.1])\n\tby lists.ozlabs.org (Postfix) with ESMTP id 4fmYLk1DXBz30N8;\n\tThu, 02 Apr 2026 18:26:22 +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)\n\t(No client certificate requested)\n\tby lists.ozlabs.org (Postfix) with ESMTPS id 4fmYLh5sdNz2yhG\n\tfor ; Thu, 02 Apr 2026 18:26:20 +1100 (AEDT)","from mail.maildlp.com (unknown [172.19.162.92])\n\tby canpmsgout10.his.huawei.com (SkyGuard) with ESMTPS id 4fmYCZ3DkMz1K9Wp;\n\tThu, 2 Apr 2026 15:20:10 +0800 (CST)","from dggpemf500011.china.huawei.com (unknown [7.185.36.131])\n\tby mail.maildlp.com (Postfix) with ESMTPS id 8A39E4056C;\n\tThu, 2 Apr 2026 15:26:18 +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, 2 Apr\n 2026 15:26:15 +0800"],"ARC-Seal":"i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1775114782;\n\tcv=none;\n b=b59UBmK6fj7xhC19fnurHahA2405sjNFRNGIPSCN5bEMQVwHElPUOCpaOSE7/HlEQrAIIxV1XS0p09WzHJ2YjAPLUly11Qi7TBcpBJxTqJbCGnj27jXhAzSRaKGPK2z2ZwSbGnS3SGSlOXXdCdgB5rEATEySCs2EL27tFPZkLlSylNxp+63QsIi2jHN6J9jwk3XmeGtHXBDKqyklNMWCZYNLBMv4HWz19cQFH7pixAWhqpth7LwCrU4qXdxrvmnmhVd1gVlVKTB28EFzFi6hT4/VH1GDlmOGWTrnSXpg8M1T3C1nZ5jgX2Mo7dbBhDO3o/Cjf1HLSFKZmuw131TLMQ==","ARC-Message-Signature":"i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707;\n\tt=1775114782; c=relaxed/relaxed;\n\tbh=3Eg34L1NkEbJLz0tAXfv4ZOYJRtudNWYgsYt1jTzuFE=;\n\th=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References:\n\t MIME-Version:Content-Type;\n b=E1TzlYCJxizsROxtKdXGbSk2o6VFteS9oor2vUAgQPQ30WKPm/alSRNb40MK2hnh0fiyLJa52uQLqnudayt5qEan8WGAWjed7F+LClr2SIvesXXWS5wzdGgGqS3/ErcaRRqgR1BNmDQqVC9F6OW0pVRLGQaFQfyuNEmLQMgs3N2GRgQiIN61Yy0AeoSa7Xn9Xey1YOEorHb6iMhUWbnI57tLUfDhbyX0ebtsqsNLbPdhDJbdOg92Bl4ojnGAxM52n2G0IHcG60R2c3nyWAnuWMzOr7vsO0DINblXGI+7eDvGXzodDz2dM98lMC/Y9rbf3ZkrMkiPwNVgwd9L6fpZ7g==","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=06PqlyXu; 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=3Eg34L1NkEbJLz0tAXfv4ZOYJRtudNWYgsYt1jTzuFE=;\n\tb=06PqlyXuqN4yd2EMIi9F5fc2N61TxRawPQaKJxv/t2cwp1FAsku6mTI7AzFEznd2DO1hDl9SB\n\tOszIy9RbCNexta74MnK3Gwe7ZF7xOam6Tzt8s6FvRO3X19B8evA61OJsRSxzdM3mJek/pU5xDUQ\n\t9EgLMFf8uBXuv/In31UC/gA=","From":"Jinjie Ruan ","To":", , ,\n\t, , ,\n\t, , ,\n\t, , ,\n\t, , ,\n\t, , ,\n\t, , ,\n\t, , ,\n\t, , ,\n\t, ,\n\t, , ,\n\t, , ,\n\t, , ,\n\t, , ,\n\t, , ,\n\t, , ,\n\t, , ,\n\t, ,\n\t, , ,\n\t, ,\n\t, ,\n\t, ,\n\t, ,\n\t","CC":"","Subject":"[PATCH v12 11/15] riscv: kexec_file: Use crash_prepare_headers()\n helper to simplify code","Date":"Thu, 2 Apr 2026 15:26:57 +0800","Message-ID":"<20260402072701.628293-12-ruanjinjie@huawei.com>","X-Mailer":"git-send-email 2.34.1","In-Reply-To":"<20260402072701.628293-1-ruanjinjie@huawei.com>","References":"<20260402072701.628293-1-ruanjinjie@huawei.com>","X-Mailing-List":"linuxppc-dev@lists.ozlabs.org","List-Id":"","List-Help":"","List-Owner":"","List-Post":"","List-Archive":",\n ","List-Subscribe":",\n ,\n ","List-Unsubscribe":"","Precedence":"list","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Content-Type":"text/plain","X-Originating-IP":"[10.90.53.73]","X-ClientProxiedBy":"kwepems100002.china.huawei.com (7.221.188.206) 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":"Use the newly introduced crash_prepare_headers() function to replace\nthe existing prepare_elf_headers(), allocate cmem and exclude crash kernel\nmemory in the crash core, which reduce code duplication.\n\nOnly the following two architecture functions need to be implemented:\n- arch_get_system_nr_ranges(). Call get_nr_ram_ranges_callback()\n to pre-counts the max number of memory ranges.\n\n- arch_crash_populate_cmem(). Use prepare_elf64_ram_headers_callback()\n to collects the memory ranges and fills them into cmem.\n\nCc: Paul Walmsley \nCc: Palmer Dabbelt \nCc: Albert Ou \nCc: Alexandre Ghiti \nCc: Guo Ren \nReviewed-by: Sourabh Jain \nAcked-by: Baoquan He \nAcked-by: Mike Rapoport (Microsoft) \nSigned-off-by: Jinjie Ruan \n---\n arch/riscv/kernel/machine_kexec_file.c | 47 +++++++-------------------\n 1 file changed, 12 insertions(+), 35 deletions(-)","diff":"diff --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;\n","prefixes":["v12","11/15"]}