From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pz2-f8.google.com (mail-pz2-f8.google.com [74.125.228.8]) (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 236A53B0AD0 for ; Fri, 16 Oct 2026 06:16:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.228.8 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1792131406; cv=none; b=VojPQTR+/ZXN2QILJAd05mcefiBn7i4tGfV9lXNpbjNzpsucWgNR5I3NPiV7x758PF49RvN0+yi+HHPqKCH/NHrQJ4zMrlY6rE/89GSupue48MKzwNiqUF321+3+CjD7XiSaGNTR8m/ZH0QzixP3K4WHfdbMflDFveuUfoBZoh4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1792131406; c=relaxed/simple; bh=zTdr4+6jkFuMQZOXbyFEnwK8Laq/5ftS584CszA5hkE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=AtX11WshCaA/0Q5pMzt59aSG9g8KXcFbiUSMC4fPXvgu2Q5dpb8ADkCV5sIMABZT8oCKt2cE454sllVokjjFR3vcDIj+q2AOUZJH0w3/QUq3nOjhvVgL0h2VtCYwgaspEo/EK+vf5Jr6HwA3T9Lh0M8fJh/VE2pgBuad9KG3nQ0= 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=JJMXsrdL; arc=none smtp.client-ip=74.125.228.8 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="JJMXsrdL" Received: by mail-pz2-f8.google.com with SMTP id 41be03b00d2f7-ccb794ce92fso507501a12.1 for ; Thu, 15 Oct 2026 23:16:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1792131403; x=1792736203; 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=4koY4BOyWDff98SibzubYxzBLIkRmqVVsOccvbFql8c=; b=JJMXsrdLto5mE0dbf9vxWQRtWCrqEopCJLZnmsjBKZuvGbciaTGbwIH0qDB0fgxc2Q +G8+NFQe4PFYN3iGg8NjBwmz5O26a9Srbu5Ymek8lnONO9mSYAPozwa67b53/N4LeNsW lddiFF6m1ChEhonujoHYzNKz9TMpwB+zQtP/+AzgY3wsPHfRZNHtxbxmBFwZ2Y/rXnXY HjQ3YvnpdtAnR8oCe4P1z5wfbB9MLWFm3BXTwDub0ZkxbVxNxkOUww8LzF21pwHLzVn/ FHEZ1gjuEwvAWeiVH8YSas58nMXMwXP4J9uYhKDcE0BsNpXRJFla40APoJJUTfuwD4by 1Ltg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1792131403; x=1792736203; 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=YLK1DIwtG3bfoukRT5jFOx3d6rtQ+KdnBFjNmlDU5jGRkzME5G5vdCbnvkPEjF113U gCcR0VThOfPNlQvF2kIzchEV3voHAAKc8Yvm4yesK5PZLwhU7vtJZrQZHBOh47rHLbYk m0um/iFdBfP+nXEUwnL1IYDf3mqTwy7Di6KnfNFtuBuU+SwKHy/mrkhdWnf3O5DExtu4 j3OEw42yzySWDkKgWOGVe0s4H921Caow+ZMfgg3+IeARyaoDQqk/osPRSBjz7tdBYDUL ymPdiuOSfiu7+BpANa41mDplc3/es+kGIDZBUj3euJL7f7oVf2AKB9P3ZVKNQswSWuI8 mouQ== X-Forwarded-Encrypted: i=1; AKwUvBzSsL+KxcUrWLB7K9h5tHdmCXNLVUsR7oehXJUZlVgiW1AVHIJ2saAABKxi5JM1PUHGGQCX7GtXiJyR@vger.kernel.org X-Gm-Message-State: AFq9FYLuP6jw1gUTxeDmz5Z4uUeCeueVR3tvTX1jX8ntsJF6k7VNa4f0 f8/drmMUaTkPSLKV6cB5r+1V1BG89QccjCOZZQfvOsz/ik9J7wcjj887 X-Gm-Gg: AYBFou1mGrDg5CfmZeRXXugqXuriV/afRU8+EtocuysR5LGIp2YpcSm9PE7E106Rbff U9AIGMWM203dF7bzQCyC49H6UTFTvymhfXgQqNvKHrWBbendaAY9LtPMwxJc409r3piQ/j6iVJq Bvgc3ivU51Os3ROXL5dH7of1w4wyyT8/UUFemz7A7s2+TYENquTs/Uj6mrmZdmlGuozHwssyait vlmY/fCeQDqEPewUFS4n9+7LvsVs6a36l/u0OEoZRmd4oIFA0IBhWJUMvCJ400C50Id6KdDF/rH yLkntjaDaUUilK3Nfr9rEdli/ByFuPGo3t5vdH5UkOoBgtBrjD+zjNwqSe3M3NplJ0FPyYCPuNB ZVcDgyQWMSIVvdhmcuWzpsMbjSh1SFF8ToME1pKXEcb/lRCEEz7E5YfyzWON2FPnUHtdF1eObGL llCqgIHWCm3re1JM1JntSowGM51LbtdVJM3zP20GFGkDPRKFH4avO0wfXDXcEPRMlAG6wXqqLEv GEacvBMOkM= X-Received: by 2002:a05:6a00:2e87:b0:881:c881:96e8 with SMTP id d2e1a72fcca58-897c6a340eamr18515355b3a.23.1792131403430; Thu, 15 Oct 2026 23:16:43 -0700 (PDT) Received: from intel.company.local ([122.11.210.25]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-89f57b334e6sm586375b3a.42.2026.10.15.23.16.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Oct 2026 23:16:42 -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: [RESEND PATCH v8 3/8] crash_core: serialize crash header preparation against hotplug Date: Fri, 16 Oct 2026 14:15:44 +0800 Message-ID: <20261016061549.4181390-4-chenwandun1@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20261016061549.4181390-1-chenwandun1@gmail.com> References: <20261016061549.4181390-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 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