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 96E5DCCA462 for ; Fri, 16 Oct 2026 03:09:51 +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=ChIsG9Vgmjf7e0EG0U79egn378mU9W7gdCp3fG4lF2s=; b=VJwjGUfbUn8dbMXi9xUWxJHS2b X6TidmUoSboT5HOcbQxk6tkorRdG5uQbzkLDa26r0J1+xpgAh6k7WH9NwjfZ7Iw3R7TcT9g7UUsSD 6IX82fCGhVMdUBxfyAaziipSbbbbCO65rR+UKxrcvoBn2sHqEHDXCcn72MEgWSiB1BYzTcnx1bI0f pV57KkK+7iUg14LFP6bJstojcTYgCvXsuUK6HcUNlzdPJmG0q87EaW2SELQ0vz+6lC++K3v9gJ5ZA FVlXnGFCx/TUySRyUY/ZDeYPj1Tuncj9NBxYDlIHagwjd7v34VHof5iw4iYJaT0GzRXQaptSmdE8y PFk0YmoA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1xHYKH-00000001nQl-2Phb; Fri, 16 Oct 2026 03:09:45 +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 1xHYKG-00000001nP3-1suO for linux-arm-kernel@bombadil.infradead.org; Fri, 16 Oct 2026 03:09:44 +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=ChIsG9Vgmjf7e0EG0U79egn378mU9W7gdCp3fG4lF2s=; b=B6swhyaCAMUqc/8HW2PMlHjHgx D+av/7eF29nrAcF5BY/JgbSwlHZO9kd79NT2bUr5kVWR+x1Ik6ASqwyx/qnvWUfpiEjAZXC+wL3As gjpPvr8MrWPF8nduBsP3o/TWnr6JvvrCJ4UqnJwlxvCaXzeXgGQv2hSHeaK0L3ykwqjGSzRkrThYT rhm/PRc1IYdiLi2BrAnQtYinJovqh/9prIpMFOJtX3PFvelL3LB2YIE5XslQLMdb6wRdtM1f9amAe 2a7OJQOoO1ioUOnaX2Yca2EygjqFNSO6V0pc5Gz6xifHi4x5dZlBUoTCjeTkrY6JBN47UvE40lQ7i VhMw7u9w==; Received: from mail-pj2-x00.google.com ([2607:f8b0:4864:39::]) by desiato.infradead.org with esmtps (Exim 4.99.5 #2 (Red Hat Linux)) id 1xHYKB-000000011uJ-1vVh for linux-arm-kernel@lists.infradead.org; Fri, 16 Oct 2026 03:09:42 +0000 Received: by mail-pj2-x00.google.com with SMTP id 98e67ed59e1d1-3abe4fb64d2so2657612a91.1 for ; Thu, 15 Oct 2026 20:09:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1792120177; x=1792724977; 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=ChIsG9Vgmjf7e0EG0U79egn378mU9W7gdCp3fG4lF2s=; b=Y2qMKwn4H9NnZBUTjvIjC32WX5HNmDm6S0XW/bn2s0Lf6+wTTbVu6BNpbKQ8WhEkkB exVO4m9hohrYmg1Gywh68eD1TfynOguvnnbYORb5o61nf1jzo8f5RQQd0NO+vY0gW+OD 8nxi8FaWoV0N2cTQ2Ss7fKFlADgqIMBft5h0G9GB4eOSq5He1G8z8CGkr2xI+H/6AGpU 6d39Qbhky8XpCN/BQ+9TDpr+u67E7T+HawSBaD0BeSPKmZIiBs9ImA2cnmvlhQabPcMV CYGRrTVMqBqty0xFSws0mi39aohDbOBOYqkgRib6m2fh5cZV5PFxz42Wh0ZjDzIGDZzx bzkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1792120177; x=1792724977; 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=ChIsG9Vgmjf7e0EG0U79egn378mU9W7gdCp3fG4lF2s=; b=2s/W0bb7c0e3nXj+Dl2wqM7nAMf94nr0tRgSVKjNjmqP74hayiw2qfFqjGn8QRq8vc PXoRue7Uruqyb3FT/PFNuM9PGcbVqyC0jQF+TLuhRqWnMScbY+l5ovUymyG9DaCLoif1 pEtV06vogtU+bMfqBKdgFBILChWVC5BEVOhfcX0b90YmYdRtaldggRLssHyK9+OXP2jg UdAZ7TubfgqIWjx/HGmhZJrIdKrFvrEgj19TI5exCs/pcc2JMuc8jhjlkkRTBSiQ8ENw NMKRMHC9VR1AkuZqhPo4FqaBX12kvc+FgES252ycN2ulQiVTSiu0AHI9ANATOJGruvYU D2LQ== X-Forwarded-Encrypted: i=1; AKwUvByvj6UsYf+xaQa1V2VP8R+0QWqUQV59haIqTHQoQrfrJyJ0ojT+LxoRK9yBgF9AJ1tmmi5HNyX+8TFjnM5Stl8f@lists.infradead.org X-Gm-Message-State: AFq9FYLb6bEip3evzNkXRSkq0DUHpsep/SuHHPVWHbBsQIuLLhaa0LcO ZAdFaWPaYKASWvtDnLhpwcbDBfRhhJhuGKNlmESTcZh8gBnbZZl1bJhD X-Gm-Gg: AYBFou3M8AtzfZ9T6NvS6Fm2LN1GZBNySC1mCVIDtDE327rakCxmQn9mAxDUTXOCmdP i+vKd70GupN0xHRX9LvScSeFIJ0N+4oTWVPENyHA+KWuGJNyKYrngh3HN8kdW8JuOBiwoINS4UA FX9xURA7weuFi5o9SsNkjWg6gaocqG4rJwqxvioS3jDIdq0JykfA+AlDa8pr7yUWrIXR7RpIxdm fk3cK+qVYRPkJ+Sm6ZGK6RSH3+65Lw79BcUy6iB08XX7r2+3dIvadOJ94KvEp091tPz7V4MLWMb RFiYnYwkHx/e9f87I94PNP2Nc63Wawup8EPkw2qAtke/CRdmhZhrCZPSWwPuoXW4lOJb20BOsLo MpEZo7FNaXAAfe/GEbZi7Qb1XeKuYtfekuJQbhIYcTE/9+NRKhrMKfzGb9+2caBQnOsENKMYhoj xMMKODpLtowCNBl46ztpdTkBLBpCUzqOZ+dydrIX4jSDoksyd+NezbDQPuGYZcGGYoK1gTTQ1h+ sS57glDOjk= X-Received: by 2002:a17:90b:3c0d:b0:3ab:b39f:41da with SMTP id 98e67ed59e1d1-3abb39f450amr14169913a91.11.1792120177160; Thu, 15 Oct 2026 20:09:37 -0700 (PDT) Received: from intel.company.local ([122.11.210.25]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3acd3cc73c7sm370085a91.4.2026.10.15.20.09.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Oct 2026 20:09:36 -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 v8 2/8] crash_core: fold duplicated memblock arch hooks into the weak default Date: Fri, 16 Oct 2026 11:08:49 +0800 Message-ID: <20261016030855.4062882-3-chenwandun1@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20261016030855.4062882-1-chenwandun1@gmail.com> References: <20261016030855.4062882-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-20261016_040939_997033_3250C688 X-CRM114-Status: GOOD ( 18.03 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=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 | 27 ++++++++++++++++++++ 4 files changed, 27 insertions(+), 82 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..faa0f22dbb41 100644 --- a/kernel/crash_core.c +++ b/kernel/crash_core.c @@ -281,8 +281,35 @@ static struct crash_mem *alloc_cmem(unsigned int nr_ranges) return cmem; } +#ifdef CONFIG_ARCH_KEEP_MEMBLOCK +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; +} +#else unsigned int __weak arch_get_system_nr_ranges(void) { return 0; } int __weak arch_crash_populate_cmem(struct crash_mem *cmem) { return -1; } +#endif + 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