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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 35D3BE7716C for ; Thu, 5 Dec 2024 15:23:59 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A6BB16B00BB; Thu, 5 Dec 2024 10:19:22 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 96D5A6B0107; Thu, 5 Dec 2024 10:19:17 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8146E6B00E9; Thu, 5 Dec 2024 10:19:10 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 15BE86B0085 for ; Tue, 15 Oct 2024 10:06:35 -0400 (EDT) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id E258B161666 for ; Tue, 15 Oct 2024 14:06:24 +0000 (UTC) X-FDA: 82676011656.06.A9D8899 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by imf13.hostedemail.com (Postfix) with ESMTP id 4B9382002B for ; Tue, 15 Oct 2024 14:06:24 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=rNLHZLOv; spf=pass (imf13.hostedemail.com: domain of maddy@linux.ibm.com designates 148.163.156.1 as permitted sender) smtp.mailfrom=maddy@linux.ibm.com; dmarc=pass (policy=none) header.from=ibm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1729001119; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=gAMkFuurSKWsXKkavscpUQu+wnifZHhrSt0CodqSyYs=; b=mbSHSH5s4ljJnRe6mgl8TdbOxtYM6CTTfY7w7z3idNHh8jJ508Z6ZfZIJeeWE0IgZJ4TN8 kujqLhKVc0X2TAx/IR/JPJrlT8RHHLFatygWIrt5cVAooHDgomRMHcDDbZA7nkVlFzPZ35 bbBwdX/syM7U5SBZvY9uto1Vtq5DfEs= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=rNLHZLOv; spf=pass (imf13.hostedemail.com: domain of maddy@linux.ibm.com designates 148.163.156.1 as permitted sender) smtp.mailfrom=maddy@linux.ibm.com; dmarc=pass (policy=none) header.from=ibm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1729001119; a=rsa-sha256; cv=none; b=iC9PSLrbuCsEe44DBy+qpsLaAMb2Ah+zBQx+QVRuqgegEJe7bp3OEBrpSDsp00ldeCRa25 bkkaoik/VI73bVWh3UNVqkr4jJPeab4svSL283atIwdYNU4E+Y9FBJ7zyeoFC+hdeydhYy TZuqYZxjPkwN6QH3FNAd/jpNCPzZWIs= Received: from pps.filterd (m0353729.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 49FCOVKb011338; Tue, 15 Oct 2024 14:06:25 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=gAMkFu urSKWsXKkavscpUQu+wnifZHhrSt0CodqSyYs=; b=rNLHZLOvukuSpUg1Ekt2fL nRFDj/FaYoew1FNr1Vq1VOwz2ihwX4dG+Be8Xhrd5c+rLJQ38kbSdFVyYX09g8bO 15WqJL1CRzwgCeMKYy/3lCLrLuBRD2NptjwV3LJMIUXammT3VMeV/+C93Il7/GQ1 6gR1pHl6Z5TJDoYXl8lxc2Oy1cqxAgr78Sncntxj8dlqUp3PI9QKbn0rDCtSqASP C7aWR/nwgan5G+Ba+yTIDShhDtKyh/1y01wAAR7tBtfNOHHhm2FYLMXJhP2N6r4Q oD9HpHLlXkCSjwsXVDAdHHAuRGiIq5qupwpO1NBiADFe0IFwYv8ouNFqibj1FUtA == Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 429rcerhuf-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 15 Oct 2024 14:06:25 +0000 (GMT) Received: from m0353729.ppops.net (m0353729.ppops.net [127.0.0.1]) by pps.reinject (8.18.0.8/8.18.0.8) with ESMTP id 49FE6OFp002259; Tue, 15 Oct 2024 14:06:24 GMT Received: from ppma13.dal12v.mail.ibm.com (dd.9e.1632.ip4.static.sl-reverse.com [50.22.158.221]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 429rcerhu8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 15 Oct 2024 14:06:24 +0000 (GMT) Received: from pps.filterd (ppma13.dal12v.mail.ibm.com [127.0.0.1]) by ppma13.dal12v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 49FCFxle004988; Tue, 15 Oct 2024 14:06:23 GMT Received: from smtprelay03.dal12v.mail.ibm.com ([172.16.1.5]) by ppma13.dal12v.mail.ibm.com (PPS) with ESMTPS id 4285nj3xsx-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 15 Oct 2024 14:06:23 +0000 Received: from smtpav02.dal12v.mail.ibm.com (smtpav02.dal12v.mail.ibm.com [10.241.53.101]) by smtprelay03.dal12v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 49FE6Mwn44368244 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 15 Oct 2024 14:06:22 GMT Received: from smtpav02.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id C870958060; Tue, 15 Oct 2024 14:06:22 +0000 (GMT) Received: from smtpav02.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 0B02258051; Tue, 15 Oct 2024 14:06:15 +0000 (GMT) Received: from [9.43.42.92] (unknown [9.43.42.92]) by smtpav02.dal12v.mail.ibm.com (Postfix) with ESMTP; Tue, 15 Oct 2024 14:06:14 +0000 (GMT) Message-ID: <7ae152f0-1887-4862-9173-fe2e9914dbe6@linux.ibm.com> Date: Tue, 15 Oct 2024 19:36:12 +0530 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [RFC v3 3/3] fadump: Move fadump_cma_init to setup_arch() after initmem_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> <759d0fc37d9fedca6cfe78ea7061447ecbf1bc77.1728658614.git.ritesh.list@gmail.com> Content-Language: en-US From: Madhavan Srinivasan In-Reply-To: <759d0fc37d9fedca6cfe78ea7061447ecbf1bc77.1728658614.git.ritesh.list@gmail.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-TM-AS-GCONF: 00 X-Proofpoint-GUID: OrYDgTtVNxs83JroPRt-Qzl2IJZxzi09 X-Proofpoint-ORIG-GUID: yqy2g7rGIy8HZ1kHEvg7rlWCG3Zm2J3P 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 bulkscore=0 malwarescore=0 suspectscore=0 spamscore=0 lowpriorityscore=0 impostorscore=0 mlxlogscore=999 clxscore=1015 phishscore=0 mlxscore=0 priorityscore=1501 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2409260000 definitions=main-2410150094 X-Rspamd-Server: rspam03 X-Rspam-User: X-Rspamd-Queue-Id: 4B9382002B X-Stat-Signature: rd4qnpsa4nz9c3f69qdbiwwtrpj67p3x X-HE-Tag: 1729001184-939525 X-HE-Meta: U2FsdGVkX1+rDpJl5cSbfXKwjPW+UP3AsxBuHJcHk2vkXYUzQhyXQuuYYdaFJFwgrtH2bCI5YdkdZJipunCZ9wmCiKE2tpfBFoJCeM7EqfG0rY44f3RXLGUP6Bh8Yt60dAiSjXsGB3Z/jYKgMbs5u2KD7SV5wS6XVBmKp8gM+YbSZA3fAEdRc0AGihiR9+FwJ3/fLSY49STq2HAKYfUx+71pVOmJythzT/U++7BNDVYh/LR+Ef8lsZ1bigwHlyZUbTh8qm4NGVUAlkM6mdqhmoL+1AEtOIZlGR38N2U2fsw6we2p4ZlnVtO1FLHMxJqfMiqSNv8QAoqLsKf/+4AVLg+zL2pfzoF4fJIDIWcmVXDNxWcBYfrv8aDp8af8iiHax+uXF3j9t3jj8aq30be6QjTx4Sq2lLQQhTpzdnlU7nPF7lR/3iMqqXXswio7TFqWRBxxPZYFSlo3JRknm69YdV7hX+jSanwvipUPTUhyOxCEzYEwKZ/8s4UHIYlNibC3/ARc9aqjPfhCmmew740svmCDIqx9PSzG6D6fH3xKlDgPpjXlEoeUI+WNhYW6PN3RRxJ9a3pOHdUHS7LV+EOLBgH1Pquy/Fb2D08lMMHyrCv6svp5l70QwuUvRYoEmJZRnWSqvOS/B5FuCCj3OiiUfnEhcBnxibyEJsTMeprubdNIrsWELd03zYy9uabg7dFcQqgSglU5m2Y7SR/URB7gik5CVAEeq0yZLt+rEGhUzR7cDmFKEcpN4SAb8SI/thbLErBQM5xenGvhC6y0jSvC1KeR/jbiJUM7fGXsClvJuY5g9W6rVXSPE9BaqqkcTQuIixgzZAEg95AW2EAPCLzOlR9rUkXrh4zH9znY7eoRo8l0L9ykglLeS1YO7HfCFuINeTyXq7VhfgadofBl+wmbaRGFKA+M8tdSbocKjeHrfNK4D2y/Ag5fRkVcdoK7tD8+7/qTnY9jBvQ8hpwa82z q8rH5f9k 7gRq/KWYjqXvuT2B2AjgvYnQOjb3oWZAka090XrrXTPGXuS72YikMxzk9XmPSmeWqFFbGIGkitcNmPSelGw/36ciJubTtebt9JUPAn78ZEo6YAUdgfqcGVzTz8UN+s8deZk3abz9/BvomrJYY66yFJm+EfXILXjyjWcnvvu62UxymQY8dXH+KWMyKmlQvhrvtuF9F/WwJlqv3UyXKWPxgr7Zk3PYWV0w9JMSWN7XnAuaC4zFB/9Ph2yR3nXMHhF5/n+PH2JJLTjzMq+BFosjtbR/wbI/r6vFWS+EVEJ7UtzKkdyZfcHUKA2SkwFQ11V2rCZq1ZofxD5Wrr/9dGYNo5aar8g57O1seOIKyp9H4HyeBEZHx5Gv4NobsWOUyboONszh5/Tm/JDWLWVsquI8T6M/WSx3T2zmatXMo2+xXtaca2qEIK/RvtF4B2dRAFiqjTNUVcoKVGhgnuWNf9811tQu+yEYyPFe4nkiVhTqXI6rH4o+Lfaf7aRpmly1v69iKKWN5fCKhpCMnAhnTuSN/FE8mSvxVpg8qCeIP X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: On 10/11/24 8:30 PM, Ritesh Harjani (IBM) wrote: > During early init CMA_MIN_ALIGNMENT_BYTES can be PAGE_SIZE, > since pageblock_order is still zero and it gets initialized > later during initmem_init() e.g. > setup_arch() -> initmem_init() -> sparse_init() -> set_pageblock_order() > > One such use case where this causes issues is - > early_setup() -> early_init_devtree() -> fadump_reserve_mem() -> fadump_cma_init() > > This causes CMA memory alignment check to be bypassed in > cma_init_reserved_mem(). Then later cma_activate_area() can hit > a VM_BUG_ON_PAGE(pfn & ((1 << order) - 1)) if the reserved memory > area was not pageblock_order aligned. > > Fix it by moving the fadump_cma_init() after initmem_init(), > where other such cma reservations also gets called. > > > ============== > page: refcount:0 mapcount:0 mapping:0000000000000000 index:0x0 pfn:0x10010 > flags: 0x13ffff800000000(node=1|zone=0|lastcpupid=0x7ffff) CMA > raw: 013ffff800000000 5deadbeef0000100 5deadbeef0000122 0000000000000000 > raw: 0000000000000000 0000000000000000 00000000ffffffff 0000000000000000 > page dumped because: VM_BUG_ON_PAGE(pfn & ((1 << order) - 1)) > ------------[ cut here ]------------ > kernel BUG at mm/page_alloc.c:778! > > Call Trace: > __free_one_page+0x57c/0x7b0 (unreliable) > free_pcppages_bulk+0x1a8/0x2c8 > free_unref_page_commit+0x3d4/0x4e4 > free_unref_page+0x458/0x6d0 > init_cma_reserved_pageblock+0x114/0x198 > cma_init_reserved_areas+0x270/0x3e0 > do_one_initcall+0x80/0x2f8 > kernel_init_freeable+0x33c/0x530 > kernel_init+0x34/0x26c > ret_from_kernel_user_thread+0x14/0x1c > Changes looks fine to me. Reviewed-by: Madhavan Srinivasan > Fixes: 11ac3e87ce09 ("mm: cma: use pageblock_order as the single alignment") > Suggested-by: David Hildenbrand > Reported-by: Sachin P Bappalige > Acked-by: Hari Bathini > Signed-off-by: Ritesh Harjani (IBM) > --- > arch/powerpc/include/asm/fadump.h | 7 +++++++ > arch/powerpc/kernel/fadump.c | 6 +----- > arch/powerpc/kernel/setup-common.c | 6 ++++-- > 3 files changed, 12 insertions(+), 7 deletions(-) > > diff --git a/arch/powerpc/include/asm/fadump.h b/arch/powerpc/include/asm/fadump.h > index ef40c9b6972a..3638f04447f5 100644 > --- a/arch/powerpc/include/asm/fadump.h > +++ b/arch/powerpc/include/asm/fadump.h > @@ -34,4 +34,11 @@ extern int early_init_dt_scan_fw_dump(unsigned long node, const char *uname, > int depth, void *data); > extern int fadump_reserve_mem(void); > #endif > + > +#if defined(CONFIG_FA_DUMP) && defined(CONFIG_CMA) > +void fadump_cma_init(void); > +#else > +static inline void fadump_cma_init(void) { } > +#endif > + > #endif /* _ASM_POWERPC_FADUMP_H */ > diff --git a/arch/powerpc/kernel/fadump.c b/arch/powerpc/kernel/fadump.c > index ffaec625b7a8..c42f89862893 100644 > --- a/arch/powerpc/kernel/fadump.c > +++ b/arch/powerpc/kernel/fadump.c > @@ -78,7 +78,7 @@ 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 void __init fadump_cma_init(void) > +void __init fadump_cma_init(void) > { > unsigned long long base, size, end; > int rc; > @@ -139,8 +139,6 @@ static void __init fadump_cma_init(void) > fw_dump.boot_memory_size >> 20); > return; > } > -#else > -static void __init fadump_cma_init(void) { } > #endif /* CONFIG_CMA */ > > /* > @@ -642,8 +640,6 @@ int __init fadump_reserve_mem(void) > > pr_info("Reserved %lldMB of memory at %#016llx (System RAM: %lldMB)\n", > (size >> 20), base, (memblock_phys_mem_size() >> 20)); > - > - fadump_cma_init(); > } > > return ret; > diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c > index 4bd2f87616ba..9f1e6f2e299e 100644 > --- a/arch/powerpc/kernel/setup-common.c > +++ b/arch/powerpc/kernel/setup-common.c > @@ -996,9 +996,11 @@ void __init setup_arch(char **cmdline_p) > initmem_init(); > > /* > - * Reserve large chunks of memory for use by CMA for KVM and hugetlb. These must > - * be called after initmem_init(), so that pageblock_order is initialised. > + * Reserve large chunks of memory for use by CMA for fadump, KVM and > + * hugetlb. These must be called after initmem_init(), so that > + * pageblock_order is initialised. > */ > + fadump_cma_init(); > kvm_cma_reserve(); > gigantic_hugetlb_cma_reserve(); >