From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 3C97AC982FF for ; Tue, 22 Sep 2026 08:43:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=KnVDZ+yI4npNCIQQqlxZwSFoW6YUe6LE24tWXfIE9sY=; b=NEXAZnnsjpQF0Q4ZBzFPubLF/k yNanff1+QEEOqm9QtgKxh/hKJYB0A5R2RtVuXFeUdUWB1P1+EWOxb1ReffB5kbjrKz70yoyOwgXbD /HOTn/L9qVfeX6Yzq2QgH/rRVcthGkx2PWodyC2vS/SRT0sCkOKXsYARRlkzRR0sAJ9idamM2zT5e Vj/3CJvRwL/x6PIiwlBh1LmCiFtJGgWGSB9dd5fdBHI/ZHQzDJ9RMR82jOP3140x6Atf16ERRCiG2 gzqQ1rSxddpqv1ildPUiP+I19aej2fm1czQQpvsXxjov6RAke2UG3wSEw7fZ+iXrV0O8EZDvnJzrE cbU8/h9Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1x8w6J-00000004icA-1UJB; Tue, 22 Sep 2026 08:43:43 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1x8w6H-00000004iar-3gNr for kexec@bombadil.infradead.org; Tue, 22 Sep 2026 08:43:42 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=KnVDZ+yI4npNCIQQqlxZwSFoW6YUe6LE24tWXfIE9sY=; b=PHC02ty1gn+eMisYcNqd4nmLXk U0heX9B0qnI4DjRsU56+xxuyf/ktmb8/go5JnpnCuX2qKTuwdpuiP6I6l2vmcGbGMCpk6TDur7YrQ Pa8iozxnNHcWlpM+b9jMQ6azr9ffdP2HqOuFxaaGN+zgL3HPZyKOZCsQ5WGSZrqfWQkKC20KS70pA qfVrKkEc+hC7cL8KhNEj/kQAqorvh+N6dpcp+M1ub6UaxdunFJQGYTjAtsSpDUadvyPDMCYHcz4bh 6RgVWep8MMuzLm1vXOSO/PlF+uGLWlwzClx505CSd3qUct0rKT2anv3s68O5T8H9KfP1i4JMXXsng c1u9yJ4Q==; Received: from mail-pj2-x07.google.com ([2607:f8b0:4864:39::7]) by desiato.infradead.org with esmtps (Exim 4.99.2 #2 (Red Hat Linux)) id 1x8w6D-0000000DHUO-0zcu for kexec@lists.infradead.org; Tue, 22 Sep 2026 08:43:40 +0000 Received: by mail-pj2-x07.google.com with SMTP id d9443c01a7336-2d903e972efso19330995ad.0 for ; Tue, 22 Sep 2026 01:43:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1790066615; x=1790671415; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=KnVDZ+yI4npNCIQQqlxZwSFoW6YUe6LE24tWXfIE9sY=; b=HifKnMj3W80dqtq55Q9nwcMNWTNB9HZDB46sqTpG0+7oy0AnPv5vzzBojehQfRyXg8 cXBoJfdqLUf5yy7+ptAFDgxQUW1gQHBK36HsDbW2GNe6J2eEzSMVEIAmYzrXQR1RIL70 nepXcBhrSoc3TeT7HGX0ttaqeZK8zmUFWJvcL1tPOFxFiQIw/shlAbSdIoi4CESwJl7/ QDBUbin2dI6SxXy/taCOzmgzI6PwB1l8vqUK9uxAXKS/lO4IddoKq5YvCV7qk41yvudf UHmB5t/QJxYNFJhXDc4hlvRm1+KHEfIZ1iErWF4cSbhEO0/n5LcLl9GJeTCXuZ/pLu9k lLKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790066615; x=1790671415; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=KnVDZ+yI4npNCIQQqlxZwSFoW6YUe6LE24tWXfIE9sY=; b=k+uYXOL57ZDV1bPBvfMKL3qS/PxVClwaGa05eJjrCzAKmbSwj3HlOL/Euzkq+uttRM GTB9VH7lmPzTIUXR0cn/JbzEtx4vLwzJA+tIQ1bvA6WssAcWK27ZG1nliJSoi12hq4kx ymfWkbqjKXWRUtdIPXXkh2rixgQeTDiDewN99dInsJWFNpa1EHGhoBsizuYRBPq9/Rau MRG829m9KUxGISqtnZJaJKGSXBkdAgx7cOaghpz4mIttGmKzk/jSDUqL8p25qsOwR/oZ 5C1IO0QMfxA3X0A/DscSiDPqgO1EmV2NB4E9dcZOfoiigPHXiH+lwu90DrmqPoTs7HCp nPHg== X-Forwarded-Encrypted: i=1; AKwUvBwG/A1sAb7WNnWdGeG3qwqOYQISFOX7oj23a4bqOllXypURQPONCX9YncD52BTvT6wrU1ai6A==@lists.infradead.org X-Gm-Message-State: AFuF++n0zRiruCRJjLrgyWxEYC6t3m1jQbyN3k9j747bhXa/uP77TMHL ryb+gKy2pds12gar8CEsYuu+YzSCdfAgPt71T5b2iZIKGRO3Uavwp4PK X-Gm-Gg: AYBFou3EQpGUZg5bTTWKUYgg0LTsfILggmMSJh40KHDpLcneR07dz9VqXh4VWJOqfr0 5aJB2HvJYYiYNt7bBqzx13WPhsN5FwWH4lCAWZg06GuBwIuvmaOA4B5zzit5Sqyl1hSpFckAJlc D0rJxdUzgzwBVBLlVYNgFdBCEKDtVurL/q07IuK2U9ssb8su04R9DZCRiQlMwR4OxWkYMz6aVHM VXewFbm5t9jwRaAtq/ygLVdqnsWZc9LWxvy7qxizjWqYzqzmRKYjZ4xLEwN9u0Xm5Vzl8nD8dlT cQflxAIO2xAyqKDJd0pD3yTJAdA4QhdRjH6r0jL64WJdUejbiNgFGnbvqqPwQt9VO+nSzAwJyfY 7XPBXekUmBCcC2JIgLrfbfaPzpF4MWL3iFA9LSBzj4FmG1qo1iUa2GFkvoAOpZXQ++fzuewIMdR 1Nzq/ERLQUCI0BGJ+Of7kDGdsaCbSTUMiXjomxtHPxVbx67mlq2pYP3G+N3uwENFaAlfaSFTaVc dvtMrnGji7UFZ5S0cU9ug== X-Received: by 2002:a17:90b:1a88:b0:39e:252:ae4d with SMTP id 98e67ed59e1d1-3a073112d3bmr471304a91.17.1790066615322; Tue, 22 Sep 2026 01:43:35 -0700 (PDT) Received: from intel.company.local ([122.11.210.25]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3a0674a5ae4sm3670016a91.12.2026.09.22.01.43.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Sep 2026 01:43:34 -0700 (PDT) From: Wandun Chen To: robh@kernel.org, baoquan.he@linux.dev, rppt@kernel.org, m.szyprowski@samsung.com Cc: catalin.marinas@arm.com, will@kernel.org, mark.rutland@arm.com, chenhuacai@kernel.org, kernel@xen0n.name, pjw@kernel.org, palmer@dabbelt.com, aou@eecs.berkeley.edu, alex@ghiti.fr, tglx@kernel.org, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, x86@kernel.org, hpa@zytor.com, saravanak@kernel.org, akpm@linux-foundation.org, pasha.tatashin@soleen.com, pratyush@kernel.org, ruirui.yang@linux.dev, robin.murphy@arm.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, loongarch@lists.linux.dev, linux-riscv@lists.infradead.org, devicetree@vger.kernel.org, kexec@lists.infradead.org, linux-mm@kvack.org, iommu@lists.linux.dev Subject: [PATCH v7 2/9] crash_core: fold duplicated memblock arch hooks into the weak default Date: Tue, 22 Sep 2026 16:42:49 +0800 Message-ID: <20260922084256.1515554-3-chenwandun1@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260922084256.1515554-1-chenwandun1@gmail.com> References: <20260922084256.1515554-1-chenwandun1@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260922_094339_174890_C30593BB X-CRM114-Status: GOOD ( 15.99 ) X-BeenThere: kexec@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "kexec" Errors-To: kexec-bounces+kexec=archiver.kernel.org@lists.infradead.org From: Wandun Chen arm64, loongarch and riscv open-code the same memblock walk in arch_get_system_nr_ranges() and arch_crash_populate_cmem(). Move it into the __weak defaults in kernel/crash_core.c and delete the arch copies. No functional change. Signed-off-by: Wandun Chen Tested-by: Meijing Zhao Acked-by: Baoquan He --- arch/arm64/kernel/machine_kexec_file.c | 29 ---------------------- arch/loongarch/kernel/machine_kexec_file.c | 27 -------------------- arch/riscv/kernel/machine_kexec_file.c | 26 ------------------- kernel/crash_core.c | 25 +++++++++++++++++-- 4 files changed, 23 insertions(+), 84 deletions(-) diff --git a/arch/arm64/kernel/machine_kexec_file.c b/arch/arm64/kernel/machine_kexec_file.c index 854d872dfd0f..34d944d3f22f 100644 --- a/arch/arm64/kernel/machine_kexec_file.c +++ b/arch/arm64/kernel/machine_kexec_file.c @@ -14,7 +14,6 @@ #include #include #include -#include #include #include #include @@ -39,34 +38,6 @@ int arch_kimage_file_post_load_cleanup(struct kimage *image) return kexec_image_post_load_cleanup_default(image); } -#ifdef CONFIG_CRASH_DUMP -unsigned int arch_get_system_nr_ranges(void) -{ - unsigned int nr_ranges = 2 + crashk_cma_cnt; /* for exclusion of crashkernel region */ - phys_addr_t start, end; - u64 i; - - for_each_mem_range(i, &start, &end) - nr_ranges++; - - return nr_ranges; -} - -int arch_crash_populate_cmem(struct crash_mem *cmem) -{ - phys_addr_t start, end; - u64 i; - - for_each_mem_range(i, &start, &end) { - cmem->ranges[cmem->nr_ranges].start = start; - cmem->ranges[cmem->nr_ranges].end = end - 1; - cmem->nr_ranges++; - } - - return 0; -} -#endif - /* * Tries to add the initrd and DTB to the image. If it is not possible to find * valid locations, this function will undo changes to the image and return non diff --git a/arch/loongarch/kernel/machine_kexec_file.c b/arch/loongarch/kernel/machine_kexec_file.c index 5412aa9f3568..481b8f906a56 100644 --- a/arch/loongarch/kernel/machine_kexec_file.c +++ b/arch/loongarch/kernel/machine_kexec_file.c @@ -13,7 +13,6 @@ #include #include #include -#include #include #include #include @@ -56,32 +55,6 @@ static void cmdline_add_initrd(struct kimage *image, unsigned long *cmdline_tmpl } #ifdef CONFIG_CRASH_DUMP -unsigned int arch_get_system_nr_ranges(void) -{ - int nr_ranges = 2; /* for exclusion of crashkernel region */ - phys_addr_t start, end; - uint64_t i; - - for_each_mem_range(i, &start, &end) - nr_ranges++; - - return nr_ranges; -} - -int arch_crash_populate_cmem(struct crash_mem *cmem) -{ - phys_addr_t start, end; - uint64_t i; - - for_each_mem_range(i, &start, &end) { - cmem->ranges[cmem->nr_ranges].start = start; - cmem->ranges[cmem->nr_ranges].end = end - 1; - cmem->nr_ranges++; - } - - return 0; -} - /* * Add the "mem=size@start" command line parameter to command line, indicating the * memory region the new kernel can use to boot into. diff --git a/arch/riscv/kernel/machine_kexec_file.c b/arch/riscv/kernel/machine_kexec_file.c index 808e872f4063..fdc6695e8588 100644 --- a/arch/riscv/kernel/machine_kexec_file.c +++ b/arch/riscv/kernel/machine_kexec_file.c @@ -37,32 +37,6 @@ int arch_kimage_file_post_load_cleanup(struct kimage *image) } #ifdef CONFIG_CRASH_DUMP -unsigned int arch_get_system_nr_ranges(void) -{ - unsigned int nr_ranges = 2 + crashk_cma_cnt; /* For exclusion of crashkernel region */ - u64 i; - phys_addr_t start, end; - - for_each_mem_range(i, &start, &end) - nr_ranges++; - - return nr_ranges; -} - -int arch_crash_populate_cmem(struct crash_mem *cmem) -{ - u64 i; - phys_addr_t start, end; - - for_each_mem_range(i, &start, &end) { - cmem->ranges[cmem->nr_ranges].start = start; - cmem->ranges[cmem->nr_ranges].end = end - 1; - cmem->nr_ranges++; - } - - return 0; -} - static char *setup_kdump_cmdline(struct kimage *image, char *cmdline, unsigned long cmdline_len) { diff --git a/kernel/crash_core.c b/kernel/crash_core.c index d0bd2d0cf899..d201638d11f3 100644 --- a/kernel/crash_core.c +++ b/kernel/crash_core.c @@ -281,8 +281,29 @@ static struct crash_mem *alloc_cmem(unsigned int nr_ranges) return cmem; } -unsigned int __weak arch_get_system_nr_ranges(void) { return 0; } -int __weak arch_crash_populate_cmem(struct crash_mem *cmem) { return -1; } +unsigned int __weak arch_get_system_nr_ranges(void) +{ + unsigned int nr_ranges = 2 + crashk_cma_cnt; /* crashk_res + crashk_low_res, +CMA splits */ + phys_addr_t start, end; + u64 i; + + for_each_mem_range(i, &start, &end) + nr_ranges++; + return nr_ranges; +} + +int __weak arch_crash_populate_cmem(struct crash_mem *cmem) +{ + phys_addr_t start, end; + u64 i; + + for_each_mem_range(i, &start, &end) { + cmem->ranges[cmem->nr_ranges].start = start; + cmem->ranges[cmem->nr_ranges].end = end - 1; + cmem->nr_ranges++; + } + return 0; +} int __weak arch_crash_exclude_ranges(struct crash_mem *cmem) { return 0; } int __weak arch_crash_exclude_mem_range(struct crash_mem **mem, -- 2.43.0