From nobody Thu Dec 18 00:06:33 2025 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A50801C3C00 for ; Fri, 31 Jan 2025 11:39:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.158.5 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738323581; cv=none; b=ZegjV1NyfAqZNDnpyk8nC8QgacKcFrCUHAc4CqPA+F3zUIt1enUS2IMmduvaYZ0wzWuN5Baiv1iL5A2UwlcM+91kblnH/1DFBxjjbqnhkAMYyTDVTyoE3RbUyMVLsB8S/cxuIQn5hMZMZMAkUIkI8HB3a9tuedH005QJezVMJDw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738323581; c=relaxed/simple; bh=d3eFOx16SlpH/l6n4+KIX/FRED4IO+Xdao54Ahi0hxs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JT/6Dob528YoYWSfcmPtSGUhzOxzpuJuxuir13QJ2YiTuc0RBCDniych5Z9UWL6MX0aqzTF9sSlk/KgZ3YmPWukRwBP5DL/f9jE47JGDExsgmFXs9gxfOfrpuCW7xUFNazRWlZxy/EE5Px+g4w9+0tUYrC2R8cJbOT+Z3n0aE9U= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com; spf=pass smtp.mailfrom=linux.ibm.com; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b=L8Au1jck; arc=none smtp.client-ip=148.163.158.5 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="L8Au1jck" Received: from pps.filterd (m0360072.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 50V7X0Z4010223; Fri, 31 Jan 2025 11:39:26 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=Q6o7hm4tazkAevlLI JdA8dGP4799PA+gFrOSDsV1Fvs=; b=L8Au1jck/WJo3xJH+W/Jp6PY8QOEqx1GY L2jm2BL+H7Vr6uOd7WcEWa1VpDPCQuDrhfYcjJdE1R/PDyvlH6MEvlFxmZzEpBzf O9bm6v3LJwTtGHA5PVBcB4K4BXVAjLJgN/UACUVz7//0uVUy80iPFbeX7MBjdes4 4PWXyZK6fpQvYiya17kRxEbHs2Rr8YyF53EQMz7P55ylj44CTLorv1LBQkD6kErS CC/DQZtsid+JvMOmSrnMQspuJwxBI2ir9LwvRVIMrzRtx4UrcluLA9AVa5DpEnCL +t7t7XYIeqWz+GMSDmleEadNEkKgHZ5lTdtwQ0tD5oHluaawMl/dA== Received: from ppma23.wdc07v.mail.ibm.com (5d.69.3da9.ip4.static.sl-reverse.com [169.61.105.93]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 44gt7n8wqc-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 31 Jan 2025 11:39:25 +0000 (GMT) Received: from pps.filterd (ppma23.wdc07v.mail.ibm.com [127.0.0.1]) by ppma23.wdc07v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 50V8TLdk010192; Fri, 31 Jan 2025 11:39:25 GMT Received: from smtprelay01.fra02v.mail.ibm.com ([9.218.2.227]) by ppma23.wdc07v.mail.ibm.com (PPS) with ESMTPS id 44gfa0kaqe-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 31 Jan 2025 11:39:24 +0000 Received: from smtpav07.fra02v.mail.ibm.com (smtpav07.fra02v.mail.ibm.com [10.20.54.106]) by smtprelay01.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 50VBdLrw53870884 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 31 Jan 2025 11:39:21 GMT Received: from smtpav07.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 336652010A; Fri, 31 Jan 2025 11:39:21 +0000 (GMT) Received: from smtpav07.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 4C15D20107; Fri, 31 Jan 2025 11:39:09 +0000 (GMT) Received: from li-4f5ba44c-27d4-11b2-a85c-a08f5b49eada.ibm.com.com (unknown [9.43.16.21]) by smtpav07.fra02v.mail.ibm.com (Postfix) with ESMTP; Fri, 31 Jan 2025 11:39:09 +0000 (GMT) From: Sourabh Jain To: linuxppc-dev@lists.ozlabs.org Cc: Sourabh Jain , Andrew Morton , Baoquan he , Madhavan Srinivasan , Michael Ellerman , kexec@lists.infradead.org, linux-kernel@vger.kernel.org, Hari Bathini , Mahesh Salgaonkar Subject: [PATCH v3 7/7] powerpc/crash: use generic crashkernel reservation Date: Fri, 31 Jan 2025 17:08:30 +0530 Message-ID: <20250131113830.925179-8-sourabhjain@linux.ibm.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250131113830.925179-1-sourabhjain@linux.ibm.com> References: <20250131113830.925179-1-sourabhjain@linux.ibm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-GUID: UaJ80Wj8DNVdWXD-OVV2demaxREEkBlt X-Proofpoint-ORIG-GUID: UaJ80Wj8DNVdWXD-OVV2demaxREEkBlt X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1057,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-01-31_04,2025-01-31_02,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 malwarescore=0 lowpriorityscore=0 priorityscore=1501 suspectscore=0 clxscore=1015 mlxscore=0 spamscore=0 bulkscore=0 mlxlogscore=999 phishscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2501170000 definitions=main-2501310087 Content-Type: text/plain; charset="utf-8" Commit 0ab97169aa05 ("crash_core: add generic function to do reservation") added a generic function to reserve crashkernel memory. So let's use the same function on powerpc and remove the architecture-specific code that essentially does the same thing. The generic crashkernel reservation also provides a way to split the crashkernel reservation into high and low memory reservations, which can be enabled for powerpc in the future. Along with moving to the generic crashkernel reservation, the code related to finding the base address for the crashkernel has been separated into its own function name get_crash_base() for better readability and maintainability. Cc: Andrew Morton Cc: Baoquan he CC: Madhavan Srinivasan Cc: Michael Ellerman Cc: kexec@lists.infradead.org Cc: linux-kernel@vger.kernel.org Acked-by: Hari Bathini Reviewed-by: Mahesh Salgaonkar Signed-off-by: Sourabh Jain --- arch/powerpc/Kconfig | 3 + arch/powerpc/include/asm/crash_reserve.h | 8 +++ arch/powerpc/include/asm/kexec.h | 4 +- arch/powerpc/kernel/prom.c | 2 +- arch/powerpc/kexec/core.c | 90 ++++++++++-------------- 5 files changed, 53 insertions(+), 54 deletions(-) create mode 100644 arch/powerpc/include/asm/crash_reserve.h diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index db9f7b2d07bf..880d35fadf40 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -718,6 +718,9 @@ config ARCH_SUPPORTS_CRASH_HOTPLUG def_bool y depends on PPC64 =20 +config ARCH_HAS_GENERIC_CRASHKERNEL_RESERVATION + def_bool CRASH_RESERVE + config FA_DUMP bool "Firmware-assisted dump" depends on CRASH_DUMP && PPC64 && (PPC_RTAS || PPC_POWERNV) diff --git a/arch/powerpc/include/asm/crash_reserve.h b/arch/powerpc/includ= e/asm/crash_reserve.h new file mode 100644 index 000000000000..6467ce29b1fa --- /dev/null +++ b/arch/powerpc/include/asm/crash_reserve.h @@ -0,0 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _ASM_POWERPC_CRASH_RESERVE_H +#define _ASM_POWERPC_CRASH_RESERVE_H + +/* crash kernel regions are Page size agliged */ +#define CRASH_ALIGN PAGE_SIZE + +#endif /* _ASM_POWERPC_CRASH_RESERVE_H */ diff --git a/arch/powerpc/include/asm/kexec.h b/arch/powerpc/include/asm/ke= xec.h index 8d9d20e0b02b..5e4680f9ff35 100644 --- a/arch/powerpc/include/asm/kexec.h +++ b/arch/powerpc/include/asm/kexec.h @@ -115,9 +115,9 @@ int setup_new_fdt_ppc64(const struct kimage *image, voi= d *fdt, struct crash_mem =20 #ifdef CONFIG_CRASH_RESERVE int __init overlaps_crashkernel(unsigned long start, unsigned long size); -extern void reserve_crashkernel(void); +extern void arch_reserve_crashkernel(void); #else -static inline void reserve_crashkernel(void) {} +static inline void arch_reserve_crashkernel(void) {} static inline int overlaps_crashkernel(unsigned long start, unsigned long = size) { return 0; } #endif =20 diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c index e0059842a1c6..9ed9dde7d231 100644 --- a/arch/powerpc/kernel/prom.c +++ b/arch/powerpc/kernel/prom.c @@ -860,7 +860,7 @@ void __init early_init_devtree(void *params) */ if (fadump_reserve_mem() =3D=3D 0) #endif - reserve_crashkernel(); + arch_reserve_crashkernel(); early_reserve_mem(); =20 if (memory_limit > memblock_phys_mem_size()) diff --git a/arch/powerpc/kexec/core.c b/arch/powerpc/kexec/core.c index 4945b33322ae..b21cfa814492 100644 --- a/arch/powerpc/kexec/core.c +++ b/arch/powerpc/kexec/core.c @@ -80,38 +80,20 @@ void machine_kexec(struct kimage *image) } =20 #ifdef CONFIG_CRASH_RESERVE -void __init reserve_crashkernel(void) -{ - unsigned long long crash_size, crash_base, total_mem_sz; - int ret; =20 - total_mem_sz =3D memory_limit ? memory_limit : memblock_phys_mem_size(); - /* use common parsing */ - ret =3D parse_crashkernel(boot_command_line, total_mem_sz, - &crash_size, &crash_base, NULL, NULL); - if (ret =3D=3D 0 && crash_size > 0) { - crashk_res.start =3D crash_base; - crashk_res.end =3D crash_base + crash_size - 1; - } - - if (crashk_res.end =3D=3D crashk_res.start) { - crashk_res.start =3D crashk_res.end =3D 0; - return; - } - - /* We might have got these values via the command line or the - * device tree, either way sanitise them now. */ - - crash_size =3D resource_size(&crashk_res); +static unsigned long long __init get_crash_base(unsigned long long crash_b= ase) +{ =20 #ifndef CONFIG_NONSTATIC_KERNEL - if (crashk_res.start !=3D KDUMP_KERNELBASE) + if (crash_base !=3D KDUMP_KERNELBASE) printk("Crash kernel location must be 0x%x\n", KDUMP_KERNELBASE); =20 - crashk_res.start =3D KDUMP_KERNELBASE; + return KDUMP_KERNELBASE; #else - if (!crashk_res.start) { + unsigned long long crash_base_align; + + if (!crash_base) { #ifdef CONFIG_PPC64 /* * On the LPAR platform place the crash kernel to mid of @@ -123,45 +105,51 @@ void __init reserve_crashkernel(void) * kernel starts at 128MB offset on other platforms. */ if (firmware_has_feature(FW_FEATURE_LPAR)) - crashk_res.start =3D min_t(u64, ppc64_rma_size / 2, SZ_512M); + crash_base =3D min_t(u64, ppc64_rma_size / 2, SZ_512M); else - crashk_res.start =3D min_t(u64, ppc64_rma_size / 2, SZ_128M); + crash_base =3D min_t(u64, ppc64_rma_size / 2, SZ_128M); #else - crashk_res.start =3D KDUMP_KERNELBASE; + crash_base =3D KDUMP_KERNELBASE; #endif } =20 - crash_base =3D PAGE_ALIGN(crashk_res.start); - if (crash_base !=3D crashk_res.start) { - printk("Crash kernel base must be aligned to 0x%lx\n", - PAGE_SIZE); - crashk_res.start =3D crash_base; - } + crash_base_align =3D PAGE_ALIGN(crash_base); + if (crash_base !=3D crash_base_align) + pr_warn("Crash kernel base must be aligned to 0x%lx\n", PAGE_SIZE); =20 + return crash_base_align; #endif - crash_size =3D PAGE_ALIGN(crash_size); - crashk_res.end =3D crashk_res.start + crash_size - 1; +} =20 - /* The crash region must not overlap the current kernel */ - if (overlaps_crashkernel(__pa(_stext), _end - _stext)) { - printk(KERN_WARNING - "Crash kernel can not overlap current kernel\n"); - crashk_res.start =3D crashk_res.end =3D 0; +void __init arch_reserve_crashkernel(void) +{ + unsigned long long crash_size, crash_base, crash_end; + unsigned long long kernel_start, kernel_size; + unsigned long long total_mem_sz; + int ret; + + total_mem_sz =3D memory_limit ? memory_limit : memblock_phys_mem_size(); + + /* use common parsing */ + ret =3D parse_crashkernel(boot_command_line, total_mem_sz, &crash_size, + &crash_base, NULL, NULL); + + if (ret) return; - } =20 - printk(KERN_INFO "Reserving %ldMB of memory at %ldMB " - "for crashkernel (System RAM: %ldMB)\n", - (unsigned long)(crash_size >> 20), - (unsigned long)(crashk_res.start >> 20), - (unsigned long)(total_mem_sz >> 20)); + crash_base =3D get_crash_base(crash_base); + crash_end =3D crash_base + crash_size - 1; =20 - if (!memblock_is_region_memory(crashk_res.start, crash_size) || - memblock_reserve(crashk_res.start, crash_size)) { - pr_err("Failed to reserve memory for crashkernel!\n"); - crashk_res.start =3D crashk_res.end =3D 0; + kernel_start =3D __pa(_stext); + kernel_size =3D _end - _stext; + + /* The crash region must not overlap the current kernel */ + if ((kernel_start + kernel_size > crash_base) && (kernel_start <=3D crash= _end)) { + pr_warn("Crash kernel can not overlap current kernel\n"); return; } + + reserve_crashkernel_generic(crash_size, crash_base, 0, false); } =20 int __init overlaps_crashkernel(unsigned long start, unsigned long size) --=20 2.48.1