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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 8EA9CECAAD8 for ; Fri, 23 Sep 2022 13:39:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:CC:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=S6asy0qLmGYi38Vhxx+EItd0zDepXIeRMERawn837nk=; b=IilZ5x3EkYmdNY T7GZjiwLRxurxNyZXluZ2+09xx6E0BkTqgv5rEE0tiFYmUVyGDacqrYhaXoveWnA61yacOGQpnOEi VE1clgtDY16fSU+8nCDjKEmPJWyehd3/CYBPbQWeN4pHbjRNJdQTSs/G2gxNLQdxgM7q+RJSh70sr tToFgpGWpi5QY1vZ9cbNlW3O0C4h9zRpwlD8hWuIPY24O2DaeP7zRklD1URuw1C9hNZcQkzE4Vsfg 4IOBoesqTgZR9uIxS0JHklGtGnUJdxmSsw0Tc6DHEnWERqbwOED1FcaxRHItl+VBzVLxrCoYohErC lg1oCnkJ8fELfg3yrBPQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1obisu-004T73-Hs; Fri, 23 Sep 2022 13:38:28 +0000 Received: from mail-am6eur05on2059.outbound.protection.outlook.com ([40.107.22.59] helo=EUR05-AM6-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1obisr-004T5C-7r for linux-arm-kernel@lists.infradead.org; Fri, 23 Sep 2022 13:38:27 +0000 ARC-Seal: i=2; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=pass; b=oVmYwQ36a0TtJ3MyH7OuSka/2vkAnLScCtS1V+Ge5YB7duWKqwdvrWynbFxG8UM/h9qYjqEIxJlG9P2qCZt4BEK0JAwQsPm3sQVRuzck2Jd2IQTCWqQrT1GHkCakAHBGokBxbf+md/oi5KUnpGwj5qjJpYxIX0siGHX9lm7z93I13xEJE1uTstqVYiitz25NkwRqLONKYqhjXlQx9JRznwzZOdHwb3h+rJjVAeCxInMcW/Y3B5B9rEcOKeMoxmohAR81oRvbkK68wTlOClBc4U8VXA6IUv1kPET2oAt+M7I+Dwpl9Y2ftZtEj0vI9dd97976pu1Dui09vGpPWsNQlg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=F50MnLown6O6UdldbmJ9lwmGsF8SXWjvRm/NrKDPtqw=; b=UlRGh3LswyEA8aAcBfDcUhEtax8H5Nye+lClmH02gr/LNdVhIFrSaPwRmnvY1IHPuU+6/ccqgMQzBFiINN1PtgSCCYHbkaKbI8d7qVV97BM2eOISmmQAbWBRf8IOArgZOED3tsWdhmGkPqvj9t3wwzZ+YksHGlD92HRpOWq/ygTHMc2LJ0ryOK965Tui313f+p2OvpsuLvtsbPlwzqa+Yb9VeG2EpYhlKyBvOM49eSYu4ypI1P73a5kUzJ+vrJCWj6l1BEVVh/WrkPCRnbTye4ln+dF3kOBQi7Vq2E+NBzsXKwaFlicWwFhVwnrzj7KC0WqFBZFdURP79BfGEM3j8w== ARC-Authentication-Results: i=2; mx.microsoft.com 1; spf=pass (sender ip is 63.35.35.123) smtp.rcpttodomain=lists.infradead.org smtp.mailfrom=arm.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=arm.com; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com; arc=pass (0 oda=1 ltdi=1 spf=[1,1,smtp.mailfrom=arm.com] dmarc=[1,1,header.from=arm.com]) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=F50MnLown6O6UdldbmJ9lwmGsF8SXWjvRm/NrKDPtqw=; b=6eOX9uavQgamxYw87+fhpNh6qXsh7sXNXFoYePaCd21lcHl0UixS5I8ObGVKWO6AskbgGkURz47Sa9+Wa/LiNdmtVDwJE72dAFvxsZZQpDzSbnndiQCebxiznAaUqBohSxaC+I6XBVrO6nI3MXy/3dEggEUhTYHHCgZ5cNAyGxs= Received: from DB6PR0802CA0027.eurprd08.prod.outlook.com (2603:10a6:4:a3::13) by DBBPR08MB6092.eurprd08.prod.outlook.com (2603:10a6:10:20e::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5654.20; Fri, 23 Sep 2022 13:38:20 +0000 Received: from DBAEUR03FT003.eop-EUR03.prod.protection.outlook.com (2603:10a6:4:a3:cafe::a7) by DB6PR0802CA0027.outlook.office365.com (2603:10a6:4:a3::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5654.20 via Frontend Transport; Fri, 23 Sep 2022 13:38:20 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 63.35.35.123 as permitted sender) receiver=protection.outlook.com; client-ip=63.35.35.123; helo=64aa7808-outbound-1.mta.getcheckrecipient.com; pr=C Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by DBAEUR03FT003.mail.protection.outlook.com (100.127.142.89) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5654.14 via Frontend Transport; Fri, 23 Sep 2022 13:38:19 +0000 Received: ("Tessian outbound 8ec96648b960:v124"); Fri, 23 Sep 2022 13:38:19 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 3b6cd83aec325509 X-CR-MTA-TID: 64aa7808 Received: from 76396a742e6d.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 84B5C344-AEB7-4507-BEAC-01CEEC2BF51B.1; Fri, 23 Sep 2022 13:38:12 +0000 Received: from EUR02-AM5-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 76396a742e6d.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Fri, 23 Sep 2022 13:38:12 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DWFPdejftFtMbDkiOLHlwUYSFQ9DsNL6BMLi16M9q7QokRngA0TAPe4quyKBljsYEjyR32P2soHYCI+yogFdtkdI26XD60cB86kkumZ43zkD1QcxDjY3ZcxGSB4r31ntHejSylldc/doH2OxENGJ9O61Tn9zGRfHl29KEeFPBugGRETqenoGKqUizeRyPlvDLlGLGp14xxmfot9TqJyl8a8p+ljYhZEkzMVEYTExKFo8Xn9FZAZdGJ7teCzceC9RVsoR8rZfzKnoHvxPcVjXvrSS0WlLS6+ytcsOFSTfUrhCJ4Kqqbn421bPP6I0dlAWwM7qBx5ZIcSy8jdK3F/LcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=F50MnLown6O6UdldbmJ9lwmGsF8SXWjvRm/NrKDPtqw=; b=DFzqwfgE91lZa2NcCNex/OsG25coTkxONfP8v3f+Jd/FFa9QtmskP2SWsS8vtJ1wc7O+eHfOqPIdfz3Jb8TXtB69vCl20t5peK+5AxMSt3qKbpy7hBQgZgt8uBRgFDpcLd5RFNHGOGijv4B/mhZ6llnASkoBTQMRFDiaz9sa+qVEivAJMGEmBoaXkfJB/YzSVNP1o3yy2b87ZiHcX3fOkJVrECGsU3S/J+4wlETo9pj6vD2GNi2W5tIFbFPeYbAFkmEs+fXgTFM5JVReuqmVsYVxhl2O6pdwte8lrTrGseuBOlC1m3gXBkfb7I16f8XTj/UPktq2kIfQC+i/ATCFVg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 40.67.248.234) smtp.rcpttodomain=lists.infradead.org smtp.mailfrom=arm.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=arm.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=F50MnLown6O6UdldbmJ9lwmGsF8SXWjvRm/NrKDPtqw=; b=6eOX9uavQgamxYw87+fhpNh6qXsh7sXNXFoYePaCd21lcHl0UixS5I8ObGVKWO6AskbgGkURz47Sa9+Wa/LiNdmtVDwJE72dAFvxsZZQpDzSbnndiQCebxiznAaUqBohSxaC+I6XBVrO6nI3MXy/3dEggEUhTYHHCgZ5cNAyGxs= Received: from FR3P281CA0154.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a2::7) by AS4PR08MB7632.eurprd08.prod.outlook.com (2603:10a6:20b:4cf::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5654.20; Fri, 23 Sep 2022 13:38:11 +0000 Received: from VE1EUR03FT038.eop-EUR03.prod.protection.outlook.com (2603:10a6:d10:a2:cafe::4) by FR3P281CA0154.outlook.office365.com (2603:10a6:d10:a2::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.7 via Frontend Transport; Fri, 23 Sep 2022 13:38:11 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 40.67.248.234) smtp.mailfrom=arm.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 40.67.248.234 as permitted sender) receiver=protection.outlook.com; client-ip=40.67.248.234; helo=nebula.arm.com; pr=C Received: from nebula.arm.com (40.67.248.234) by VE1EUR03FT038.mail.protection.outlook.com (10.152.19.112) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5654.14 via Frontend Transport; Fri, 23 Sep 2022 13:38:10 +0000 Received: from AZ-NEU-EX02.Emea.Arm.com (10.251.26.5) by AZ-NEU-EX03.Arm.com (10.251.24.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.9; Fri, 23 Sep 2022 13:38:04 +0000 Received: from AZ-NEU-EX03.Arm.com (10.251.24.31) by AZ-NEU-EX02.Emea.Arm.com (10.251.26.5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.9; Fri, 23 Sep 2022 13:38:03 +0000 Received: from e124191.cambridge.arm.com (10.1.197.45) by mail.arm.com (10.251.24.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.9 via Frontend Transport; Fri, 23 Sep 2022 13:38:03 +0000 Date: Fri, 23 Sep 2022 14:38:02 +0100 From: Joey Gouly To: Anshuman Khandual CC: , Catalin Marinas , Will Deacon , Subject: Re: [PATCH] arm64/mm: Drop ARM64_KERNEL_USES_PMD_MAPS Message-ID: <20220923133802.GA22477@e124191.cambridge.arm.com> References: <20220923130841.1382741-1-anshuman.khandual@arm.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20220923130841.1382741-1-anshuman.khandual@arm.com> User-Agent: Mutt/1.9.4 (2018-02-28) X-EOPAttributedMessage: 1 X-MS-TrafficTypeDiagnostic: VE1EUR03FT038:EE_|AS4PR08MB7632:EE_|DBAEUR03FT003:EE_|DBBPR08MB6092:EE_ X-MS-Office365-Filtering-Correlation-Id: 7c4fa84a-3ece-4fff-70bf-08da9d68e0c9 x-checkrecipientrouted: true NoDisclaimer: true X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: DWsqFBZTkbgCZdKNOM0LEX5nLa45ecN3LQxnCIy67fiH0LHzBpV1lla4jUx1G1ONNdBAM8tFPmkA0+x57u2oPYlQFpQw4er0Q5tPGEeJuAMIHCZmHdls8jrbOOHn7+YV8deoL9vLnrZNnzUlbICtajpDcqfrsCzAHk4j0Pxikp3UHCJOupMq3NxHZ/iRcsoVgL+aaMw/6RUvhwDOP7JDXHj6QKGOV6It0XRkeCAXFxj2VEfbO+9k8RbMVmjPDHk+mX45M+Aibj3x++397MdUNxy3BmNjlyLtpvVkK3/7XPSoxB3Qn8brqxt5wm3EJAbnHjjyv7gqscoCB71MYNmWXo9jLRcL/iWZ5SjpkCflThyiRSX4b/kXX9P5mtBaQrM7Dkwl67WJ4vasOD9u9MFKLT9JVH8zYJCJm66FUjzYF7bA/lJU7BdfKMQFejIo09OSDDGu3+wlX9K6F1joZe8wValtxjKq6JFC6S1vguwaOI1lZlk/7rnXPwZoAl7qukrBnXO1XitLrsKQ77mki8o6JqR2cpOAylPYd4Q8kGSip6dTFt5i/QX/jUyRPykv8IH/RxG8r7lSmkAH74jaTg2EkPjT4J8O5SjFwFPJbifjdxgTG11Rc4d0UnXEMVPDMYYnk5ywyktFiMzN01PIVD8lAZyVixV9OhfLxDI9TG/HVT6F43PAwy7ow+C4emlbXZ8kn/J27ChxYdABquiuGVpU0ZlL9WxcIdMaBJZKnysRkZIl/8G4zduF5FUajp+GiozEhP7IdrAo9hGGLYpH+EUfHZotepJMLaG2wEsnBHZk9FgOpsZCloDlDZMKgn0fZ3nfQBH3kvZzF9RlGdTyZtOM+Q== X-Forefront-Antispam-Report-Untrusted: CIP:40.67.248.234;CTRY:IE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:nebula.arm.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230022)(4636009)(396003)(346002)(136003)(376002)(39860400002)(451199015)(40470700004)(36840700001)(46966006)(336012)(82740400003)(356005)(81166007)(86362001)(33656002)(36860700001)(41300700001)(47076005)(426003)(40480700001)(40460700003)(1076003)(82310400005)(478600001)(44832011)(6862004)(4326008)(186003)(8676002)(8936002)(55016003)(26005)(7696005)(2906002)(316002)(5660300002)(70586007)(70206006)(83380400001)(966005)(54906003)(6636002)(36900700001);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS4PR08MB7632 X-MS-Exchange-Transport-CrossTenantHeadersStripped: DBAEUR03FT003.eop-EUR03.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: bafb83f8-fae2-4035-469a-08da9d68db78 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: KX5O7WZIWPfOhtpu7vSAyDrh0TfBLwSuhFnppevgWuVRI/nod5zVdFO05QzVSOVggoars6YIJ7Y/I3WK0hUqbHzpoy+zXIFILI48j43/PnBuDyp0K/f679yJIEl2XVojtQSgj3blSJZ6+VM5YK6SXAi6A/OYtJZelLd5WxBL+80E23fWJyrNnsYGOYfporQRidDyxYk/MFVQKNdf4ph+9GtEE8/OpC18+JvtxC2vuftrt0c1JE1pwxKWWgoYgqvrGCJjDSVOmzevTtdmEFQct4dH85qtc9ELIqO/m7tQdcmfrkJRTL3TFyM3nGAzXlhNftB+DWKIekJNIwAg5GaMUrjejWTqsZ5Czg9pVh/v6oWEHdgxoLfWVpUoGshgn6xVKscLMI9X1vW0Qt6xn0yRqiGNepaovv3fqZXwqocCSGkG83utpt50nYZy90rhG468aEukvnqiIg5tsvmZ5sm51Z2utSK67E3EjdoUsIsnRmN5Ai7D9D75X2EIkf86dM6ey0eopBnep0JGgTwRyLAbKOw3xDFEYhJwgJW63oHI0KXrogFESR3oHIcpB3HZzlUtBeou4fMqDAVtRZW6Do5GGLMyu+4yONTY9SgGUCAS5+6LHbSbE395CFrZFca3W7mAP0x7dlbaUPP0EH3yiz4BySUvA9enOzgk9Lnj/xWYcr/TN0FRziON21omj9H+BYhdNgXPQT1WeSSwEOTSl1Q6H2W55eGyzoLlAdvHKeUYKjkADohezSh9I14BWRmpl93pORg+uceXa5FdESSaBo3+Kcp4GrylEd64B//hWQBbREA= X-Forefront-Antispam-Report: CIP:63.35.35.123;CTRY:IE;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:64aa7808-outbound-1.mta.getcheckrecipient.com;PTR:ec2-63-35-35-123.eu-west-1.compute.amazonaws.com;CAT:NONE;SFS:(13230022)(4636009)(39860400002)(396003)(136003)(376002)(346002)(451199015)(46966006)(40470700004)(36840700001)(70206006)(478600001)(70586007)(7696005)(41300700001)(86362001)(4326008)(82310400005)(8936002)(81166007)(26005)(55016003)(8676002)(40460700003)(6636002)(33656002)(966005)(316002)(6862004)(54906003)(186003)(1076003)(44832011)(336012)(2906002)(47076005)(426003)(83380400001)(40480700001)(5660300002)(82740400003)(36860700001);DIR:OUT;SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Sep 2022 13:38:19.9804 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7c4fa84a-3ece-4fff-70bf-08da9d68e0c9 X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d;Ip=[63.35.35.123];Helo=[64aa7808-outbound-1.mta.getcheckrecipient.com] X-MS-Exchange-CrossTenant-AuthSource: DBAEUR03FT003.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR08MB6092 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220923_063825_471911_72AF8F6B X-CRM114-Status: GOOD ( 20.09 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi Anshuman, On Fri, Sep 23, 2022 at 06:38:41PM +0530, Anshuman Khandual wrote: > Currently ARM64_KERNEL_USES_PMD_MAPS is an unnecessary abstraction. Kernel > mapping at PMD (aka huge page aka block) level, is only applicable with 4K > base page, which makes it 2MB aligned, a necessary requirement for linear > mapping and physical memory start address. This can be easily achieved by > directly checking against base page size itself. This drops off the macro > ARM64_KERNE_USES_PMD_MAPS which is redundant. > > Cc: Catalin Marinas > Cc: Will Deacon > Cc: linux-arm-kernel@lists.infradead.org > Signed-off-by: Anshuman Khandual > --- > This applies on v6.0-rc6 after the following patch. > > https://lore.kernel.org/all/20220920014951.196191-1-wangkefeng.wang@huawei.com/ > > arch/arm64/include/asm/kernel-pgtable.h | 33 +++++++++---------------- > arch/arm64/mm/mmu.c | 2 +- > 2 files changed, 12 insertions(+), 23 deletions(-) > > diff --git a/arch/arm64/include/asm/kernel-pgtable.h b/arch/arm64/include/asm/kernel-pgtable.h > index 32d14f481f0c..5c2f72bae2ca 100644 > --- a/arch/arm64/include/asm/kernel-pgtable.h > +++ b/arch/arm64/include/asm/kernel-pgtable.h > @@ -18,11 +18,6 @@ > * with 4K (section size = 2M) but not with 16K (section size = 32M) or > * 64K (section size = 512M). > */ > -#ifdef CONFIG_ARM64_4K_PAGES > -#define ARM64_KERNEL_USES_PMD_MAPS 1 > -#else > -#define ARM64_KERNEL_USES_PMD_MAPS 0 > -#endif There is now a dangling comment above this. I think it's quite a useful comment, so could be moved elsewhere if possible. Or maybe just keep ARM64_KERNEL_USES_PMD_MAPS because it's not a big abstraction and it's more obvious to why there's differences in SWAPPER_BLOCK_SIZE etc. > > /* > * The idmap and swapper page tables need some space reserved in the kernel > @@ -34,10 +29,20 @@ > * VA range, so pages required to map highest possible PA are reserved in all > * cases. > */ > -#if ARM64_KERNEL_USES_PMD_MAPS > +#ifdef CONFIG_ARM64_4K_PAGES > #define SWAPPER_PGTABLE_LEVELS (CONFIG_PGTABLE_LEVELS - 1) > +#define SWAPPER_BLOCK_SHIFT PMD_SHIFT > +#define SWAPPER_BLOCK_SIZE PMD_SIZE > +#define SWAPPER_TABLE_SHIFT PUD_SHIFT > +#define SWAPPER_RW_MMUFLAGS (PMD_ATTRINDX(MT_NORMAL) | SWAPPER_PMD_FLAGS) > +#define SWAPPER_RX_MMUFLAGS (SWAPPER_RW_MMUFLAGS | PMD_SECT_RDONLY) > #else > #define SWAPPER_PGTABLE_LEVELS (CONFIG_PGTABLE_LEVELS) > +#define SWAPPER_BLOCK_SHIFT PAGE_SHIFT > +#define SWAPPER_BLOCK_SIZE PAGE_SIZE > +#define SWAPPER_TABLE_SHIFT PMD_SHIFT > +#define SWAPPER_RW_MMUFLAGS (PTE_ATTRINDX(MT_NORMAL) | SWAPPER_PTE_FLAGS) > +#define SWAPPER_RX_MMUFLAGS (SWAPPER_RW_MMUFLAGS | PTE_RDONLY) > #endif > > > @@ -96,15 +101,6 @@ > #define INIT_IDMAP_DIR_PAGES EARLY_PAGES(KIMAGE_VADDR, _end + MAX_FDT_SIZE + SWAPPER_BLOCK_SIZE, 1) > > /* Initial memory map size */ > -#if ARM64_KERNEL_USES_PMD_MAPS > -#define SWAPPER_BLOCK_SHIFT PMD_SHIFT > -#define SWAPPER_BLOCK_SIZE PMD_SIZE > -#define SWAPPER_TABLE_SHIFT PUD_SHIFT > -#else > -#define SWAPPER_BLOCK_SHIFT PAGE_SHIFT > -#define SWAPPER_BLOCK_SIZE PAGE_SIZE > -#define SWAPPER_TABLE_SHIFT PMD_SHIFT > -#endif Also a dangling comment here. Thanks, Joey > > /* > * Initial memory map attributes. > @@ -112,13 +108,6 @@ > #define SWAPPER_PTE_FLAGS (PTE_TYPE_PAGE | PTE_AF | PTE_SHARED) > #define SWAPPER_PMD_FLAGS (PMD_TYPE_SECT | PMD_SECT_AF | PMD_SECT_S) > > -#if ARM64_KERNEL_USES_PMD_MAPS > -#define SWAPPER_RW_MMUFLAGS (PMD_ATTRINDX(MT_NORMAL) | SWAPPER_PMD_FLAGS) > -#define SWAPPER_RX_MMUFLAGS (SWAPPER_RW_MMUFLAGS | PMD_SECT_RDONLY) > -#else > -#define SWAPPER_RW_MMUFLAGS (PTE_ATTRINDX(MT_NORMAL) | SWAPPER_PTE_FLAGS) > -#define SWAPPER_RX_MMUFLAGS (SWAPPER_RW_MMUFLAGS | PTE_RDONLY) > -#endif > > /* > * To make optimal use of block mappings when laying out the linear > diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c > index 69deed27dec8..df1eac788c33 100644 > --- a/arch/arm64/mm/mmu.c > +++ b/arch/arm64/mm/mmu.c > @@ -1192,7 +1192,7 @@ int __meminit vmemmap_populate(unsigned long start, unsigned long end, int node, > > WARN_ON((start < VMEMMAP_START) || (end > VMEMMAP_END)); > > - if (!ARM64_KERNEL_USES_PMD_MAPS) > + if (!IS_ENABLED(CONFIG_ARM64_4K_PAGES)) > return vmemmap_populate_basepages(start, end, node, altmap); > > do { _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel