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 20025CCA463 for ; Fri, 16 Oct 2026 03:10:03 +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=4koY4BOyWDff98SibzubYxzBLIkRmqVVsOccvbFql8c=; b=zL5ec/OaO5+NqNm4uQomnxrpgy Rk2WIS7K7y7smjM3JpVdI3pPEXC8ngqqfEHcBZLRnYLPcFuMV+/PIJPfSVWFUwtsSri6IDeCveN+z wfDyljpJvy+tZi1YN4MBClDJGc4MeguepV7gMnJNHcyLklanLEdVGEYG4fwh3C6IAhXEkmTOuyVfd 9UvHwLrh5lDT4r6VgPZWshPAQVVFtyLacNJjNQS8Uwnoik2MNSiy+cRu5I49zINe8XNjrRW41cF+5 LzpHby9hMWsfRABYJn8pvw8q34QylFR5hvdGgf5OOQspltFc54nAjY5KofkBD6Kbmk4b6L+AhAmYn bhr3nZAg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1xHYKS-00000001nb7-4B0p; Fri, 16 Oct 2026 03:09:57 +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 1xHYKR-00000001nZm-1qAp for linux-arm-kernel@bombadil.infradead.org; Fri, 16 Oct 2026 03:09:55 +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=4koY4BOyWDff98SibzubYxzBLIkRmqVVsOccvbFql8c=; b=ERKQTNlGkAcZVXerQrnga53UTs FCvK3cqZrUkcujdszV1jQyyn4p0SiZIjelO1lIIygnEhcBBS0MCNvlpMwW8kmUdQ2ALmdx55vESRS YwNsyEn+vAZ/O+Gb+N+gsMpqan83ZkkFkwsSW+pgt0ZU9tByDC5qpJN+ojw8A02AWARbpza3GY9D6 AHilOSkYe0hyPgiU81MvRdEPnZEUQ7HnzdFykuXUgUfywiGjjYc2agZADBHAPB1biTsyxM1UqlafD DV16tvo609IHf80Dhwg/JZlFHwSxQgzJHD7Chamhk9/hV7b3C7D0+1pa5z+2LZKr0re5+n7aKOlBn KmUKmTVQ==; Received: from mail-pj2-x01.google.com ([2607:f8b0:4864:39::1]) by desiato.infradead.org with esmtps (Exim 4.99.5 #2 (Red Hat Linux)) id 1xHYKN-000000011wo-3hui for linux-arm-kernel@lists.infradead.org; Fri, 16 Oct 2026 03:09:54 +0000 Received: by mail-pj2-x01.google.com with SMTP id 98e67ed59e1d1-3a51696a650so3488969a91.1 for ; Thu, 15 Oct 2026 20:09:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1792120190; x=1792724990; 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=4koY4BOyWDff98SibzubYxzBLIkRmqVVsOccvbFql8c=; b=HZP4TFfIhleXd29EtYPA1FAVZaQP2+Qe0OGOYNOodWuK4jWShIQf8Rh447h81LkDgE iR2sRMIcHd+O+XHquD5wegxEFrlPBOEuzBVcoIYIPEiMlCxGGJD9OzhkCL2txOISrRyN R4g8rZHenYARiGfz4+2s09gz8ZkZtCRANpliaj0qbmMbv0+y6nQkQa2oI9KgXc7sH+Qp Z2QqgcEVp+uTowIdjh1eCyUWTXvk5GoXfLU0ricNBqR7fqHzuQQ4UgY8EYtI+TokjIKR 8SGYmoiXSu4GFKJORPJFb/OjYV44yqqrVlqVpyx/WJD/yXW90FbQr73a7GoZ60v6fOJ+ 5I8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1792120190; x=1792724990; 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=4koY4BOyWDff98SibzubYxzBLIkRmqVVsOccvbFql8c=; b=IDNBRVMQwjTTmb5oGApEQFCMaarD9WUVyW/Kgmm4AEpr4ILZEmOs8cOzy4kXe2kHAx /bH+5BP0ZPfAR4ar6h831+UGvp+HpGMtfBbGfJsPa7cmcOZQKD7MbZKFPav2JLFmf6l3 f1Ri7T+d1+foVJ/d8xSjD4RDzeah2jF4RvBtfMwiDb0uzSD/5ExEAA0U9PFtY8/8/vsv 1aimUJS6WBqmVfrFbu796YCRhUIEqLrKEWY1OPuVmBvfJ7PFjRdUSJr6WFfarv7A+B8i 76y4tJEjPCIfZTbY+8wcLnEM1qjcjIw++oQF/wKdQEc/YrbHHPi7XGeUDHR6j15np+cK Uxnw== X-Forwarded-Encrypted: i=1; AKwUvBwLhLTOoOrzyG3bODlljgAZsxDA7y8UEOTKEVCZ7nvOHr12DrTHmOdJLmQXyCSVdHyFV9ba/pRyrNa5GS3b/Oyc@lists.infradead.org X-Gm-Message-State: AFq9FYJcoIKD3GOBUZGaIOxrI+K0q0nuHIFkV6IwjJ/WMLERvWmYikNB v4l3UgXilt3WBYK5SiAOvjJ3mt+6RO8x3IZaPAO5OikjU7VlM++o23eG X-Gm-Gg: AYBFou1hi6mVpFHk4UCWHaA4OUF43K0W7xDtqjJuMX8pKHyRM1ohh2NUw/sRGZJWNmq 03UZ+wOWv8WajNXfj3n29MOhATSK4EX0FBa9YkiWgTC/SgYPC0uTC1HILMfzVqL2wLk89k9gTCU 48pGgOyCrl1ek5L1U1G1XsEzH040pwl+YhXfO+lsU4MsuK8Lm0SdBTU+qPEIX2NXKywTUyiKDPp dD8S91/FOfj6pbK5wrTRNl7uUndDxn0ZN6k4f8fBtGjHaZu/XEvK2Ko3EjYbOxfx/oVyCJvQupu mum/jE6HsD5z4RVHX+Fe4ExtifJDhZmmjqSgZASe59iBFQeq0hO7Tc/0Gbd+YSzTV89c9h5OK/p nT9qqoyY7wh6t+9jkKN04JEmWl2Hd9z7RLjcNDnLJIHUrNNOv7IFC1ygepr23ttE87v87tFEI5g jZV1YJd2dPFbwunL0wo5dkjPfqs6kn+L/3Q12WX8Qh5CDnKA1PkRNjilAqPkrp7vTyhGU5QmANX 2WzZFcXO7I= X-Received: by 2002:a17:90b:35cc:b0:3a5:147a:3b63 with SMTP id 98e67ed59e1d1-3ab3a33db36mr18094196a91.8.1792120190079; Thu, 15 Oct 2026 20:09:50 -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.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Oct 2026 20:09:49 -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 3/8] crash_core: serialize crash header preparation against hotplug Date: Fri, 16 Oct 2026 11:08:50 +0800 Message-ID: <20261016030855.4062882-4-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_040952_379347_B2A1A41E X-CRM114-Status: GOOD ( 17.42 ) 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 crash_prepare_headers() counts memory ranges before populating the allocated crash_mem array. The weak implementation used by ARM64, RISC-V and LoongArch walks memblock.memory, while x86 performs the same two-pass operation over system RAM resources. Concurrent memory hotplug can change range source between the two walks and make the populate pass overflow cmem->ranges. Take device_hotplug_lock when preparing crash headers during kexec_file_load(). The x86/riscv memory hotplug path already takes device_hotplug_lock, so call __crash_prepare_headers() directly to avoid recursive locking. Sashiko reported this issue in [1]. Fixes: 3751e728cef2 ("arm64: kexec_file: add crash dump support") Fixes: 1bcca8620a91 ("LoongArch: Add crash dump support for kexec_file") Fixes: 8acea455fafa ("RISC-V: Support for kexec_file on panic") Fixes: dd5f726076cc ("kexec: support for kexec on panic using new system call") Signed-off-by: Wandun Chen Link: https://sashiko.dev/#/message/20260806101002.1F84E1F000E9@smtp.kernel.org [1] Acked-by: Baoquan He --- arch/riscv/kernel/crash.c | 2 +- arch/x86/kernel/crash.c | 2 +- include/linux/crash_core.h | 2 ++ kernel/crash_core.c | 17 +++++++++++++++-- 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/arch/riscv/kernel/crash.c b/arch/riscv/kernel/crash.c index fe5a4b306aae..ac8df2edf2a7 100644 --- a/arch/riscv/kernel/crash.c +++ b/arch/riscv/kernel/crash.c @@ -70,7 +70,7 @@ void arch_crash_handle_hotplug_event(struct kimage *image, void *arg) * Create the new elfcorehdr reflecting the changes to CPU and/or * memory resources. */ - if (crash_prepare_headers(true, &elfbuf, &elfsz, NULL)) { + if (__crash_prepare_headers(true, &elfbuf, &elfsz, NULL)) { pr_err("unable to create new elfcorehdr"); goto out; } diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c index e6f23933a6df..bef008a0cb22 100644 --- a/arch/x86/kernel/crash.c +++ b/arch/x86/kernel/crash.c @@ -465,7 +465,7 @@ void arch_crash_handle_hotplug_event(struct kimage *image, void *arg) * Create the new elfcorehdr reflecting the changes to CPU and/or * memory resources. */ - if (crash_prepare_headers(IS_ENABLED(CONFIG_X86_64), &elfbuf, &elfsz, NULL)) { + if (__crash_prepare_headers(IS_ENABLED(CONFIG_X86_64), &elfbuf, &elfsz, NULL)) { pr_err("unable to create new elfcorehdr"); goto out; } diff --git a/include/linux/crash_core.h b/include/linux/crash_core.h index bc087124cd78..28e7a81cf263 100644 --- a/include/linux/crash_core.h +++ b/include/linux/crash_core.h @@ -61,6 +61,8 @@ extern int crash_prepare_elf64_headers(struct crash_mem *mem, int need_kernel_ma void **addr, unsigned long *sz); extern int crash_prepare_headers(int need_kernel_map, void **addr, unsigned long *sz, unsigned long *nr_mem_ranges); +int __crash_prepare_headers(int need_kernel_map, void **addr, unsigned long *sz, + unsigned long *nr_mem_ranges); extern int crash_exclude_core_ranges(struct crash_mem **cmem); struct kimage; diff --git a/kernel/crash_core.c b/kernel/crash_core.c index faa0f22dbb41..8a861a946e26 100644 --- a/kernel/crash_core.c +++ b/kernel/crash_core.c @@ -16,6 +16,7 @@ #include #include #include +#include #include #include #include @@ -344,8 +345,8 @@ int crash_exclude_core_ranges(struct crash_mem **cmem) return 0; } -int crash_prepare_headers(int need_kernel_map, void **addr, unsigned long *sz, - unsigned long *nr_mem_ranges) +int __crash_prepare_headers(int need_kernel_map, void **addr, unsigned long *sz, + unsigned long *nr_mem_ranges) { unsigned int max_nr_ranges; struct crash_mem *cmem; @@ -382,6 +383,18 @@ int crash_prepare_headers(int need_kernel_map, void **addr, unsigned long *sz, return ret; } +int crash_prepare_headers(int need_kernel_map, void **addr, unsigned long *sz, + unsigned long *nr_mem_ranges) +{ + int ret; + + lock_device_hotplug(); + ret = __crash_prepare_headers(need_kernel_map, addr, sz, nr_mem_ranges); + unlock_device_hotplug(); + + return ret; +} + /** * crash_exclude_mem_range - exclude a mem range for existing ranges * @mem: mem->range contains an array of ranges sorted in ascending order -- 2.43.0