From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pz2-f1.google.com (mail-pz2-f1.google.com [74.125.228.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1C7DE43F4B5 for ; Thu, 6 Aug 2026 09:36:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.228.1 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786009012; cv=none; b=TR5Z3Mqxxq8sduzUgrHc5sZsJVQ1D1Lmc9QhziHNhNNqK816S2i+3oYJr/8+Mq46ULBNBrPmNnn0+2dqKfrzGc6i5KR8fUULsvFgbINBlrHIKZCgM5jKRuYNKvY61MIicJ9MNjVCCXIEUT6nIOht8TR477OxQ30Gt2X0AL7stHQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786009012; c=relaxed/simple; bh=3+eeaa1ZvEiSWwM8HzdyswyClU6vwmIcEhsy7E60oGg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XrH91P8zgRwgS3TkObydcNBB1ZRC/cV8BUHpWDxH1nI6vqr2HPcZ8LIaGWJsyx6HDQm2NgVnB6C73B9w5c1IRi7DLJ8KBYEJd8pBggCCm4ArIABr+PgW8egfDIS9I9qzUCIYubQgVLXjcjBaJ+mg9UbGrfKum/xC6OMVy+TD7Mc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=VOC0V6ef; arc=none smtp.client-ip=74.125.228.1 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="VOC0V6ef" Received: by mail-pz2-f1.google.com with SMTP id 41be03b00d2f7-cab1b0bb489so1690807a12.0 for ; Thu, 06 Aug 2026 02:36:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1786009007; x=1786613807; darn=vger.kernel.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=wVDvUsuVz4fOLoguLRCQrGgJgNWPqJ2TDc/OI8CtAH0=; b=VOC0V6efCw9nhlZgkY7z1+35AcjsEv2+gAqjD2l34+TdptK73c2kMNCC+xv4TurvEi F2DOW9cKmvKTlRcCmRx+ezIPu65GB3OyXd1X3qzp0KEb+NVXLtVMyIpChHIZYL5Owlwz w58if2PLPgdgIiXdpZeuVtsT8Z8j6pZc2NUxFzLsJFDd8tg9dGLBVrkUfR+yvzBm3dpf B6AEZ2xdv9iIQ5vx24D8/PMpsa0UbNu4ZvMBizkL46LJOXPx7iQyiedmPSAfOU04uZvq UDoX/U/0lUAiYEv22HOI9IMqXrwHyITXv8N6DP+Bl9Wnfi+oA8g7jhwZ5qQhVaoVfPbI bYSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786009007; x=1786613807; 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=wVDvUsuVz4fOLoguLRCQrGgJgNWPqJ2TDc/OI8CtAH0=; b=fNvMfKOA+14IAzlafgSQc0Fc3WbMOqiwiJSytIIPOVeZoMPPhxcYJ4bj11ZrYhFPjg ARQzfWb+NO9ZKelZEVG3O8D8lSTWPxExqgguWeadhY/o6vRM3wsELKNt2tWkU+LiP3FD uWNLZp9KEQfjL266XoPDIn2vGzrlMrzNnMFZS5gEoXqXfJJ4eVoYGTI2abw83ofu3Wv+ nFz3QxMvUO7YFjCbXxlMurKZ96U//w6xikIuyZDWinNDNylgdAtQeInUaK9Kh3z37iRJ 9kUd6YVWcsJ6AX+5pPFmImiY7WCGTiPLVGj3Inoad7CnmnrNTIwt9nN9X9rZPv44maJa AfBg== X-Forwarded-Encrypted: i=1; AHgh+Ro/wtL6OQaMAizg50ClGYdN+9drtWeIGMH5rZr/EnZ8sSLEscU8/aiRrZpqLntFk/sMH7j9FkQv7rkw@vger.kernel.org X-Gm-Message-State: AOJu0YwCTdRcuE5Xcr3e/WWajqZxtSrc/LAUyhp+hPMuMBXZ34UETip+ +/aWw2b2A6UNOIPkXZtOLTqhgpO/sb7UVFYpsHb5kO6uV1Si4+fUlCSp X-Gm-Gg: AR+sD12gpoq98ICJQB31aLotGDCgr2sYCjmOcmkOoYjAgE+m9x6eswH0uDTD25XV4At kKWQ3Pm6l0BG87xyTYozc4KQyS/gHaP3WRxIuIogefLR6S+fxwCgDUxS3ek0UnaMsu9lDE1vr2H hVmPybEdKj6bQVNJZ9/Ur+I5tB8XrhlJqlk3aNekncgUMJ2BDkUkuIdYPIxn0H50JnFXsW2CR6j jtECVTYAoS2Wu77ExefD8kHtQupaDJ2HUnF37mojrb8tGSiyk7Sfwt923t6/HhtwedmyRG43Joc UniUowxEMRDItjbeVLXwkwuqPQOU2LYhXVAMhXP7Sxa7cgaSXn512bjBqjqz4CMXwA8gpJ6G7pW SYVc0q9RTkCClq7hBLD+C0hoTUnHgdFz85VnrsIu4MLPL8Y4UEvXzS+GX6m5edjORG+4vdMjlkD xgvFMbJZbzJF6tGDoXqZ0LCFuht8JLblqJas9z6wofPWaDbV+MGiSVzNOghm3+sp356g8fkQQcE cYbqeYm9gdE X-Received: by 2002:a05:6a00:3687:b0:848:467d:293b with SMTP id d2e1a72fcca58-84f2dfb4e5bmr16809060b3a.11.1786009006714; Thu, 06 Aug 2026 02:36:46 -0700 (PDT) Received: from intel.company.local ([210.184.73.204]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-84f453b0aeasm1043878b3a.13.2026.08.06.02.36.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Aug 2026 02:36:46 -0700 (PDT) From: Wandun Chen To: catalin.marinas@arm.com, will@kernel.org, chenhuacai@kernel.org, pjw@kernel.org, palmer@dabbelt.com, aou@eecs.berkeley.edu, robh@kernel.org, saravanak@kernel.org, rppt@kernel.org, baoquan.he@linux.dev, pasha.tatashin@soleen.com, pratyush@kernel.org, m.szyprowski@samsung.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, linux-mm@kvack.org, kexec@lists.infradead.org, iommu@lists.linux.dev Cc: kernel@xen0n.name, alex@ghiti.fr, akpm@linux-foundation.org, ruirui.yang@linux.dev, robin.murphy@arm.com Subject: [PATCH v5 6/8] crash_core: fold duplicated memblock arch hooks into the weak default Date: Thu, 6 Aug 2026 17:35:17 +0800 Message-ID: <20260806093519.2907771-7-chenwandun1@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260806093519.2907771-1-chenwandun1@gmail.com> References: <20260806093519.2907771-1-chenwandun1@gmail.com> Precedence: bulk X-Mailing-List: devicetree@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Wandun Chen The weak defaults are only consumed by crash_prepare_headers(), which is called only by arm64, riscv, loongarch (via the weak default) and x86 (via its own non-weak override). 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 --- 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 2b36aa9fade0..77285ae3ce60 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