From patchwork Fri Jun 16 11:08:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Aneesh Kumar K.V" X-Patchwork-Id: 13282623 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 81FB4EB64D8 for ; Fri, 16 Jun 2023 11:09:13 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1BDC36B0078; Fri, 16 Jun 2023 07:09:13 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 16DE86B007B; Fri, 16 Jun 2023 07:09:13 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 00E9F8E0001; Fri, 16 Jun 2023 07:09:12 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id E64C16B0078 for ; Fri, 16 Jun 2023 07:09:12 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 94E5F140C1C for ; Fri, 16 Jun 2023 11:09:12 +0000 (UTC) X-FDA: 80908339344.20.410425E Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by imf10.hostedemail.com (Postfix) with ESMTP id 2AC0FC002C for ; Fri, 16 Jun 2023 11:09:09 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=s1WUfHz6; dmarc=pass (policy=none) header.from=ibm.com; spf=pass (imf10.hostedemail.com: domain of aneesh.kumar@linux.ibm.com designates 148.163.156.1 as permitted sender) smtp.mailfrom=aneesh.kumar@linux.ibm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1686913750; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=LnAST0ri6tuMUS6B67naBvkx2n1hStwtP2VkWo2LbwI=; b=YJzgjX/wJl7R7R+o/X9JX4xs38lMbk/7eBhZVKZPBZZm5BKQNY695Cx7EaHTxOyGlJHlJU gwgerA3YpzAatf7CC8dK0zSXyZ6GN1i9LvikVjdg3nRTvHUASjgFjsEKSCOmnUU3utJtHk RWfuiSHNi27Uf30nxvYtc9kbs3USHg8= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=s1WUfHz6; dmarc=pass (policy=none) header.from=ibm.com; spf=pass (imf10.hostedemail.com: domain of aneesh.kumar@linux.ibm.com designates 148.163.156.1 as permitted sender) smtp.mailfrom=aneesh.kumar@linux.ibm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1686913750; a=rsa-sha256; cv=none; b=a6TjstlY8pn7/tyFQxIVgZO7zzysXPpiFKdb9tZfJLtYaNmR3Wl3GjGDMV0AHULeylKefc 8SXdd6AC64B4YWDNvfhn0SX9cjV1bseTduDEoasnjNDe8E96QEyj1TT1c3MbFcSEgs5CeB Sb38ERQF+YBvI8OqchJOINYcYhMxZdE= Received: from pps.filterd (m0353727.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 35GAl6dQ026270; Fri, 16 Jun 2023 11:09:00 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pp1; bh=LnAST0ri6tuMUS6B67naBvkx2n1hStwtP2VkWo2LbwI=; b=s1WUfHz6hDx/YEMeoLQeVT8EWgcv+9p7uOrDBjPdnfqvJ07eb4MT9YLzfqupvekE847x RLmdjpNlEW5K/AU1uJFFhOZbdWjYovGUMrgoP4Um566KKtmOsMm8EwsMAQfHsk2Cv2Pz 1PIAgmlFR0PC932QL9kh7C+OAdFf0KHQ2XBM9S2pwbfthy0mTivrKtdNKLWyL0pmM1N5 6YV4AoDqkix7utmRktKV7vomyY/NMsN6KksJjg9kHpYXeFqIvSPK1sxoWItt9dx3WsNA peouFPESwiUuZGHS3JJT8hHEIZc3wbtmy/MXK+qWaw61U2sRdytR8nNQDkMtccWhCQFa Gw== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3r8p9ngg42-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 16 Jun 2023 11:08:59 +0000 Received: from m0353727.ppops.net (m0353727.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 35GAnGCC031056; Fri, 16 Jun 2023 11:08:58 GMT Received: from ppma05wdc.us.ibm.com (1b.90.2fa9.ip4.static.sl-reverse.com [169.47.144.27]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3r8p9ngg3d-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 16 Jun 2023 11:08:58 +0000 Received: from pps.filterd (ppma05wdc.us.ibm.com [127.0.0.1]) by ppma05wdc.us.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 35GAklnT014069; Fri, 16 Jun 2023 11:08:57 GMT Received: from smtprelay03.dal12v.mail.ibm.com ([9.208.130.98]) by ppma05wdc.us.ibm.com (PPS) with ESMTPS id 3r4gt5yfhy-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 16 Jun 2023 11:08:57 +0000 Received: from smtpav02.wdc07v.mail.ibm.com (smtpav02.wdc07v.mail.ibm.com [10.39.53.229]) by smtprelay03.dal12v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 35GB8uf248038162 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 16 Jun 2023 11:08:56 GMT Received: from smtpav02.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 5D4585805B; Fri, 16 Jun 2023 11:08:56 +0000 (GMT) Received: from smtpav02.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 2EF4058058; Fri, 16 Jun 2023 11:08:50 +0000 (GMT) Received: from skywalker.ibmuc.com (unknown [9.43.52.24]) by smtpav02.wdc07v.mail.ibm.com (Postfix) with ESMTP; Fri, 16 Jun 2023 11:08:49 +0000 (GMT) From: "Aneesh Kumar K.V" To: linux-mm@kvack.org, akpm@linux-foundation.org, mpe@ellerman.id.au, linuxppc-dev@lists.ozlabs.org, npiggin@gmail.com, christophe.leroy@csgroup.eu Cc: Oscar Salvador , Mike Kravetz , Dan Williams , Joao Martins , Catalin Marinas , Muchun Song , Will Deacon , "Aneesh Kumar K.V" Subject: [PATCH v2 02/16] powerpc/book3s64/mm: mmu_vmemmap_psize is used by radix Date: Fri, 16 Jun 2023 16:38:12 +0530 Message-Id: <20230616110826.344417-3-aneesh.kumar@linux.ibm.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230616110826.344417-1-aneesh.kumar@linux.ibm.com> References: <20230616110826.344417-1-aneesh.kumar@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-GUID: aERBqponElN9irMQ6o7ahQLLC8ve-T24 X-Proofpoint-ORIG-GUID: cK2HMq7nYsEUtthtJd8SSOXaZ4n71xE1 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26 definitions=2023-06-16_07,2023-06-16_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 clxscore=1015 bulkscore=0 mlxlogscore=987 priorityscore=1501 phishscore=0 suspectscore=0 adultscore=0 malwarescore=0 lowpriorityscore=0 spamscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2305260000 definitions=main-2306160099 X-Rspamd-Queue-Id: 2AC0FC002C X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: x9ur4t3ynzxtob5y9xqbq11x9y66m3kt X-HE-Tag: 1686913749-610785 X-HE-Meta: U2FsdGVkX1+QVDz0oArt6/7AjDRzduhXixxFMXaZFmtR1TiV1Yiv8VMCLY5n4b9f+maPwS2TzIhfqTPRgnJpE7h3EJiwV50CRPnLN5X87yhmHysAPm4c9WoLhd3oebOajIDPPO7xorN+F9VqnVYKabXYKrBMzvcus51Tlx0OTxNqjF2hhRpSRudQxoMLljai2ZxqRcHwSWE+ccbPEtg96f+cl8VfRVJo2oh429cxke2X3hk0wdExfMokXyXLrj42rKgPyL8gOMIlrUPaBYx4+BC88rLOFAdcwi9SJRsWGOpPIhrM4U7gIpgp6vJSJ1XIlAqism3016nDRPPKpYgSSQGHsOxazec9XmdxsCAuNegRaz2tgEqr/HiLsBwqOoXJ6aRJX0lj/58fVJwy/+M+V/XL84mDMKgCJbz3tBJoo32tXaUUq++jEpR9FJK8KfFMEtgCZKZ3mOWdBqLtm0cNYqQF3N3YXawzoAPo7PqGrfe8w/dCgVt/tbDYtqjwlH6ywfc/pj/USsB/wxUCbTEJRYahcUEfPZrI0g2tbJo/CaIWunuroHvCVC7AkKcnXHWWXjMOXcM9cwBUmwhHso52fMRaTYrlW79dKvelYQZ554jhYzawk3S55UW0et69+tGyItDKSdExS07Vs+GwvNd1zI3dE8dD5+s3BOZlfVebrZJRc5dM5sRFMpYnzsZokil67LlqoQJiXyTIxKRti1KjqWJmr49y6HBslnmQA9HQuF//Lv6bZpCY1xGctQ40tjj17iiiWqZ/cmM0Ol85QTd0GELGZ7/eOvqWqajhVUXvfY6iYn20yjdDhPQmCNzLrWU7uDj65hxydZMY5XFuQMVEjhB5MynlOPoCrP2WO/Gd1qH+IRP6OOouHVh9whUpFWjeUoqXypbD2uGyLuEu6sK3Rt2OyFGXvDr+qkWVcE3TAYpgtFFR9CwF8PnSQuKL0BZQmx2KO+nOlGj3eeUapcP Jdt/3Vzc qjSep1LFEnE2qLLo0SqCFQfw+AD4BuMbQ5Hb9eiFT8XGoEWr+Sg2Vv+QO5vq7c50YgDvRHx6DbTTKRbEXYnQ9glvPF/CpqSR8SZPoF/avyCUYSVkhf3guofIym92amm2MTph9dXWExj9dVyMLh80q6Ya1UgwzEV4jBGSVGWR9wv4nI5wXgnWriN65ISSUpjc+9Zec 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: This should not be within CONFIG_PPC_64S_HASHS_MMU. We use mmu_vmemmap_psize on radix while mapping the vmemmap area. Signed-off-by: Aneesh Kumar K.V --- arch/powerpc/mm/book3s64/radix_pgtable.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/arch/powerpc/mm/book3s64/radix_pgtable.c b/arch/powerpc/mm/book3s64/radix_pgtable.c index 5f8c6fbe8a69..570add33c02d 100644 --- a/arch/powerpc/mm/book3s64/radix_pgtable.c +++ b/arch/powerpc/mm/book3s64/radix_pgtable.c @@ -594,7 +594,6 @@ void __init radix__early_init_mmu(void) { unsigned long lpcr; -#ifdef CONFIG_PPC_64S_HASH_MMU #ifdef CONFIG_PPC_64K_PAGES /* PAGE_SIZE mappings */ mmu_virtual_psize = MMU_PAGE_64K; @@ -611,7 +610,6 @@ void __init radix__early_init_mmu(void) mmu_vmemmap_psize = MMU_PAGE_2M; } else mmu_vmemmap_psize = mmu_virtual_psize; -#endif #endif /* * initialize page table size