From mboxrd@z Thu Jan 1 00:00:00 1970 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 8EF9318872C for ; Fri, 18 Oct 2024 14:55:01 +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=1729263303; cv=none; b=uxt6r/IJUv0i4oY8YrcXrd+UnAB3RX/vcQtpqRzdu/duj6NLbPnMWVgmCIEU1lrglxZzM9Btt+9A6i1cQI1Bh4w00B5P51PG6hb4kqIfJjh9mYsZYHK947wS3iVKMDjb2fQsAM+IuwYK6wLjXTESKO0KWgUH8E/9vRgQfnHGCAQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729263303; c=relaxed/simple; bh=+RX6psnv04alpH+aiDLmh/VhPgq4HI01CEdcSo1Zxxk=; h=Message-ID:Date:Subject:To:Cc:References:From:In-Reply-To: Content-Type:MIME-Version; b=FZWT98LDOF1aTH2AvZt7H8BUVnA2nXH95OCXYORQ2Zn30Spaea9P3pon1Hjg96zB01zFASTpsOQv+HhO5LWXGVu+5z9zZQygmYBCcraVSECzfXqhnJ8WaOYsfwqZDoiuaIjRANj2dVTdu4NNIiG27soCeeH94KC2k7FDtIxXxB0= 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=jjBr11oB; 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="jjBr11oB" Received: from pps.filterd (m0356516.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 49IA0vxR014451; Fri, 18 Oct 2024 14:54:41 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=pp1; bh=wuAbHx iPkGV2NkdygUsactUToW9jLAcb4zeAhpmaSGA=; b=jjBr11oB+taVHxPvp7t2fH IwtS9I9CcUtrvza5d0lRNY5GR1ZriAFyDSZZy9B8DDrpooehGrHm3Uj20pf8r1au KR4Z88OJuMI2Kv7ngGuDqhkSymEPm+DxfRmwiePnlmZiRZWYXX6SSMnNRGNx9iGJ bgSadKfnndhqJ4whOEBZGoQ3VUBgx/ZBoQtH0u3zYbFk65ol/xgc+WP4SHNZC9LA 73jV/uHtRXiIYvQubPcmwy5hrZFahnAlcftUKoWFj/QK6IvJkkyuMtVhLtkDMdbM 8Q8w/Mp14LxjNI75qFkLhsIyz9xopHAqR6kSDOtZmDIArvSTtu8sDpwSA+q5Jnig == Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 42aqgr9hqm-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 18 Oct 2024 14:54:41 +0000 (GMT) Received: from m0356516.ppops.net (m0356516.ppops.net [127.0.0.1]) by pps.reinject (8.18.0.8/8.18.0.8) with ESMTP id 49IEsebp001706; Fri, 18 Oct 2024 14:54:40 GMT Received: from ppma22.wdc07v.mail.ibm.com (5c.69.3da9.ip4.static.sl-reverse.com [169.61.105.92]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 42aqgr9hqg-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 18 Oct 2024 14:54:40 +0000 (GMT) Received: from pps.filterd (ppma22.wdc07v.mail.ibm.com [127.0.0.1]) by ppma22.wdc07v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 49IEAfaK027499; Fri, 18 Oct 2024 14:54:39 GMT Received: from smtprelay07.dal12v.mail.ibm.com ([172.16.1.9]) by ppma22.wdc07v.mail.ibm.com (PPS) with ESMTPS id 4283ty58w1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 18 Oct 2024 14:54:39 +0000 Received: from smtpav01.dal12v.mail.ibm.com (smtpav01.dal12v.mail.ibm.com [10.241.53.100]) by smtprelay07.dal12v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 49IEsc7f48955862 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 18 Oct 2024 14:54:38 GMT Received: from smtpav01.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 8825858058; Fri, 18 Oct 2024 14:54:38 +0000 (GMT) Received: from smtpav01.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id D64E558057; Fri, 18 Oct 2024 14:54:30 +0000 (GMT) Received: from [9.43.75.71] (unknown [9.43.75.71]) by smtpav01.dal12v.mail.ibm.com (Postfix) with ESMTP; Fri, 18 Oct 2024 14:54:30 +0000 (GMT) Message-ID: Date: Fri, 18 Oct 2024 20:24:28 +0530 User-Agent: Mozilla Thunderbird Subject: Re: [RFC v3 1/3] fadump: Refactor and prepare fadump_cma_init for late init To: "Ritesh Harjani (IBM)" , linuxppc-dev@lists.ozlabs.org Cc: linux-mm@kvack.org, Sourabh Jain , Hari Bathini , Zi Yan , David Hildenbrand , "Kirill A . Shutemov" , Mahesh J Salgaonkar , Michael Ellerman , "Aneesh Kumar K . V" , Donet Tom , LKML , Sachin P Bappalige References: <030b6d46fddac126a6cf7e119bea48055338f0ed.1728658614.git.ritesh.list@gmail.com> <941875f7-0d7f-4ba3-bc7c-7aedc3b20dae@linux.ibm.com> <87bjznyliv.fsf@gmail.com> Content-Language: en-US From: Madhavan Srinivasan In-Reply-To: <87bjznyliv.fsf@gmail.com> Content-Type: text/plain; charset=UTF-8 X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: 4bogdjanN3TYYCy_sgTWtiLvonWB_FNz X-Proofpoint-GUID: 6sJJXsusFzLs8VonsFBslxb73qcPWjO2 Content-Transfer-Encoding: 7bit X-Proofpoint-UnRewURL: 0 URL was un-rewritten Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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 priorityscore=1501 phishscore=0 mlxlogscore=999 malwarescore=0 clxscore=1015 lowpriorityscore=0 adultscore=0 spamscore=0 mlxscore=0 suspectscore=0 impostorscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2409260000 definitions=main-2410180094 On 10/14/24 4:54 PM, Ritesh Harjani (IBM) wrote: > Madhavan Srinivasan writes: > >> On 10/11/24 8:30 PM, Ritesh Harjani (IBM) wrote: >>> We anyway don't use any return values from fadump_cma_init(). Since >>> fadump_reserve_mem() from where fadump_cma_init() gets called today, >>> already has the required checks. >>> This patch makes this function return type as void. Let's also handle >>> extra cases like return if fadump_supported is false or dump_active, so >>> that in later patches we can call fadump_cma_init() separately from >>> setup_arch(). >> >> Usually patches to this file are posted with title format of >> >> powerpc/fadump:<> > > yes. I guess it is good to do it that way (I might have missed it) > Although commit history of oldest few patches to fadump shows.. > > ebaeb5ae2437 fadump: Convert firmware-assisted cpu state dump data into elf notes. > 2df173d9e85d fadump: Initialize elfcore header and add PT_LOAD program headers. > 3ccc00a7e04f fadump: Register for firmware assisted dump. > eb39c8803d0e fadump: Reserve the memory for firmware assisted dump. > >> Patchset looks fine to me. Reviewed-by: Madhavan Srinivasan for the series. >> >>> >>> Acked-by: Hari Bathini >>> Signed-off-by: Ritesh Harjani (IBM) >>> --- >>> v2 -> v3: Separated the series into 2 as discussed in v2. >>> [v2]: https://lore.kernel.org/linuxppc-dev/cover.1728585512.git.ritesh.list@gmail.com/ >>> >>> arch/powerpc/kernel/fadump.c | 23 +++++++++-------------- >>> 1 file changed, 9 insertions(+), 14 deletions(-) >>> >>> diff --git a/arch/powerpc/kernel/fadump.c b/arch/powerpc/kernel/fadump.c >>> index a612e7513a4f..162327d66982 100644 >>> --- a/arch/powerpc/kernel/fadump.c >>> +++ b/arch/powerpc/kernel/fadump.c >>> @@ -78,27 +78,23 @@ static struct cma *fadump_cma; >>> * But for some reason even if it fails we still have the memory reservation >>> * with us and we can still continue doing fadump. >>> */ >>> -static int __init fadump_cma_init(void) >>> +static void __init fadump_cma_init(void) >>> { >>> unsigned long long base, size; >>> int rc; >>> >>> - if (!fw_dump.fadump_enabled) >>> - return 0; >>> - >>> + if (!fw_dump.fadump_supported || !fw_dump.fadump_enabled || >>> + fw_dump.dump_active) >>> + return; >> >> Is these checks even needed here? fadump_reserve_mem() checked for all >> these already, also dont see any other caller for fadump_cma_init(). >> >> > > In the next patch we will move fadump_cma_init() call from within > fadump_reserve_mem() to setup_arch(). Hence we need these extra checks > in fadump_cma_init() as well. I mentioned the same in the commit msg of > this patch too. > >>> /* >>> * Do not use CMA if user has provided fadump=nocma kernel parameter. >>> - * Return 1 to continue with fadump old behaviour. >>> */ >>> - if (fw_dump.nocma) >>> - return 1; >>> + if (fw_dump.nocma || !fw_dump.boot_memory_size) >>> + return; >>> >>> base = fw_dump.reserve_dump_area_start; >>> size = fw_dump.boot_memory_size; >>> >>> - if (!size) >>> - return 0; >> >> So this is the only place where we return 0, which in turn will make the >> "ret" in fadump_reserve_mem() as zero forcing to call reserve_crashkernel() >> in early_init_devtree(). >> >> we are removing it, becos we know "size" here will never be zero? >> >> > > yes. Because we already check if boot_memory_size is less than > bootmem_min in fadump_reserve_mem(). If it is less, then we fail and > disable fadump (fadump_enabled = 0). > > So then there is no need to check for !boot_memory_size in here. > > fadump_reseve_mem( ) { > <...> > if (!fw_dump.dump_active) { > fw_dump.boot_memory_size = > PAGE_ALIGN(fadump_calculate_reserve_size()); > > bootmem_min = fw_dump.ops->fadump_get_bootmem_min(); > if (fw_dump.boot_memory_size < bootmem_min) { > pr_err("Can't enable fadump with boot memory size (0x%lx) less than 0x%llx\n", > fw_dump.boot_memory_size, bootmem_min); > goto error_out; > } > <...> > } > <...> > error_out: > fw_dump.fadump_enabled = 0; > fw_dump.reserve_dump_area_size = 0; > return 0; > } > > > Thanks for the review! > -ritesh