From nobody Thu Dec 18 15:40:40 2025 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (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 49FF01DFD9D for ; Tue, 17 Dec 2024 06:47:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.156.1 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734418039; cv=none; b=k67fzA0wZTKJ5l4q9Mh9l2LhEs+eb782dZg8gfvLcz0cwV3OrvUi+zNSqM3RTxupLi7RZmHSpTrRApSmrhFQwIPQEpMs2y1hCeJQuVBeQloqbPIOppfPWnLhWTmmAhcQrBjIsB5vdWANQ3ywNSre8jruY45ZYBCgCbSO4/q3o1I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734418039; c=relaxed/simple; bh=ybZGEQk8lAhvbxhk9+0mzDUbeMGDaW25NuvLWxXrKm8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=E8OnNbMI9fmu40O3LHWsuJnP9jLWfB/tmnq77/Ur4aHO8yKW2vbarBEeJc2RkmynNzStPF/cxOvfRMiNRmktBnUE38Fvb/4LJ1p5SUU67oVPzBWG9nUfNncf6NLjbtXfisUv+sIAQItm1v7XiPN6+00YX559RrEhEtC02sP0eSw= 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=mWS5fWPg; arc=none smtp.client-ip=148.163.156.1 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="mWS5fWPg" Received: from pps.filterd (m0356517.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 4BH3rLpb026223; Tue, 17 Dec 2024 06:47:04 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=l5YP8r2VmvweWZw4/ 9zj/3mPN9vQQRZUcaCX+Kau0iM=; b=mWS5fWPgsmib67mAPQl6YlaoMKMz21sU7 8EkJXJC3m4AjOiXW4+XtxX6slGCA7Ttplx7KuaPtA+VEhLDMOtRnyIdNgWGgY2mk FUyzcmXxDD6XdN3eTPtcc3Bq4jpl39L8wXeCNonkVeYQLUIeQ2QuJCaP/6HH1aZp MtkWfs89CD7CVh4G6HYebrrqFLwr2LRTJMsqEg2FSX+edVwUz24/zy0ory6Wcn/a L6VnKw+mN/uTscRaBf9tiReozVeiie+9cd6ArVnnsPJ6PjB/SyMkixAF7wQYWnQD D3xbxlJwws5meVziZxS9Eo5+P16tIt29BCZSmffCSXDVE90A6L0sA== Received: from ppma11.dal12v.mail.ibm.com (db.9e.1632.ip4.static.sl-reverse.com [50.22.158.219]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 43k1sh0ja8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 17 Dec 2024 06:47:04 +0000 (GMT) Received: from pps.filterd (ppma11.dal12v.mail.ibm.com [127.0.0.1]) by ppma11.dal12v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 4BH4OVdd014438; Tue, 17 Dec 2024 06:47:03 GMT Received: from smtprelay03.fra02v.mail.ibm.com ([9.218.2.224]) by ppma11.dal12v.mail.ibm.com (PPS) with ESMTPS id 43hq21h7y9-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 17 Dec 2024 06:47:03 +0000 Received: from smtpav04.fra02v.mail.ibm.com (smtpav04.fra02v.mail.ibm.com [10.20.54.103]) by smtprelay03.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 4BH6kxFZ57606438 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 17 Dec 2024 06:46:59 GMT Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 35B7D2004B; Tue, 17 Dec 2024 06:46:59 +0000 (GMT) Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 3619220040; Tue, 17 Dec 2024 06:46:55 +0000 (GMT) Received: from li-4f5ba44c-27d4-11b2-a85c-a08f5b49eada.ibm.com.com (unknown [9.43.29.128]) by smtpav04.fra02v.mail.ibm.com (Postfix) with ESMTP; Tue, 17 Dec 2024 06:46:54 +0000 (GMT) From: Sourabh Jain To: linuxppc-dev@lists.ozlabs.org Cc: Sourabh Jain , Andrew Morton , Baoquan he , Hari Bathini , Madhavan Srinivasan , Michael Ellerman , kexec@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 4/5] powerpc/crash: use generic crashkernel reservation Date: Tue, 17 Dec 2024 12:16:12 +0530 Message-ID: <20241217064613.1042866-5-sourabhjain@linux.ibm.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241217064613.1042866-1-sourabhjain@linux.ibm.com> References: <20241217064613.1042866-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-ORIG-GUID: b3XEQY0YK5ypgppnZpA558HyquExlsio X-Proofpoint-GUID: b3XEQY0YK5ypgppnZpA558HyquExlsio X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1051,Hydra:6.0.680,FMLib:17.12.62.30 definitions=2024-10-15_01,2024-10-11_01,2024-09-30_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxlogscore=999 phishscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 malwarescore=0 priorityscore=1501 bulkscore=0 impostorscore=0 suspectscore=0 adultscore=0 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2411120000 definitions=main-2412170052 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. To prevent crashkernel memory from being added to iomem_resource, the function arch_add_crash_res_to_iomem() has been introduced. For further details on why this should not be done for the PowerPC architecture, please refer to the previous commit titled "crash: let arch decide crash memory export to iomem_resource. Cc: Andrew Morton Cc: Baoquan he Cc: Hari Bathini CC: Madhavan Srinivasan Cc: Michael Ellerman Cc: kexec@lists.infradead.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Sourabh Jain --- arch/powerpc/Kconfig | 3 + arch/powerpc/include/asm/crash_reserve.h | 18 +++++ arch/powerpc/include/asm/kexec.h | 4 +- arch/powerpc/kernel/prom.c | 2 +- arch/powerpc/kexec/core.c | 90 ++++++++++-------------- 5 files changed, 63 insertions(+), 54 deletions(-) create mode 100644 arch/powerpc/include/asm/crash_reserve.h diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index a0ce777f9706..8df8871215f8 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -717,6 +717,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..f5e60721de41 --- /dev/null +++ b/arch/powerpc/include/asm/crash_reserve.h @@ -0,0 +1,18 @@ +/* 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 + +#ifdef CONFIG_ARCH_HAS_GENERIC_CRASHKERNEL_RESERVATION + +static inline bool arch_add_crash_res_to_iomem(void) +{ + return false; +} +#define arch_add_crash_res_to_iomem arch_add_crash_res_to_iomem +#endif + +#endif /* _ASM_POWERPC_CRASH_RESERVE_H */ + diff --git a/arch/powerpc/include/asm/kexec.h b/arch/powerpc/include/asm/ke= xec.h index 270ee93a0f7d..64741558071f 100644 --- a/arch/powerpc/include/asm/kexec.h +++ b/arch/powerpc/include/asm/kexec.h @@ -113,9 +113,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.47.1