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 9D18BC4332F for ; Mon, 28 Nov 2022 16:18:33 +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:MIME-Version:In-Reply-To:From: References:Cc:To:Subject:Date:Message-ID:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=j5IcNnl73eUUr6QfT/XpdQIzZj9KaSGyAmZH9xE0rsY=; b=q5J3a5PonxAmkW7ry7GteR1681 k4x7Ij/egVziuY3j4ZWyCGqB33OEPPhBDtqHpELP4ON8tR5ezo6DCVclc0gQyzw6M8v9BfoVRUkQ3 2wsNOjBH0YwnZOSKkfywzcmtMP6wsMnWAjAbN43WhQRldN0hVuKzr+KoQuCZerlrJcYb6U9c42KCm daw3RSqeEkRyH8buT87KwZWxtU7GE94XXjX8wUmsboDPagCMRIdcwCiWkJEpW811vGtZR7KSV0q6Y OZAv+gnaj0phLuGJqXfz+gZ8B88zQFAU5kQdTa9RORwdQTmj/mbk+CTAJAws2OUTNQz5WglIDWZg/ NhIuGr/Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1ozgog-002kRh-P1; Mon, 28 Nov 2022 16:17:10 +0000 Received: from mail-db8eur05on20607.outbound.protection.outlook.com ([2a01:111:f400:7e1a::607] helo=EUR05-DB8-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1ozgod-002kO8-Bt for linux-arm-kernel@lists.infradead.org; Mon, 28 Nov 2022 16:17:09 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ynv5YvQN07ilbc0nO+W9yYY8nOQiwtstddRhaIVpjkNzf/QpHDQP+aFHl7G1WMK+xrV2G7GqPE5UxZ0FWvnUu4bhbwQQgeDerTHxQmHkOZlypc/wHpzj20shRLm9OevK6hEk8p6o4jSHsIEnGaQCcjiDWmxeY4DhYtdL6iEcgwsCCy1GT5tUATTvRs/v9JLjrWanLnfHfbRH6pul81uNOM0zCHt7VGnPSfTpotBZ97VOlHSYnOvOo86RiNP7CSr4Ci3UK2sD6sXR/XqwRiw4zCsK0vE5AI0wXkczQbxpniO5BXnDq0l0Dj2OjK6J/1kEvwkna5VgT8t/rKlWp38cfQ== 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=EFRRD/ANyniVsKYBUI5lNsBAnaQymI1jf/BGtArYlrE=; b=ElRsny+FDugX96v497nKtPTUvyKc+mRqqaxYDuuONIXX4sNu5yyTY8Q8i3FzbOgKRL5SiSPL12lVDBLemZcfDnoSa2k+f/j/YqLKNZj+UPi6UcggDl3ojOGF9NS+NXfqrBmnlWcdqM/7c4oeX+38gmvtHwLfECBNgmgiSTKuvZwupker6zK+pKkwcPDWG5U8JOjh+oYHndcKzMEPzdv45Ea577ZmVDQ1yVVaCuMG4YmOQ24tUbEsqAlYFoWKcctIcm7PJXdLe+jU/XObXMUb2A1f3SHSfIECYsP8ps42fUvwVj5gKu+BJuuArqWtatzV9d7kbWasXd8P4ib6vvIqYQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=arm.com; dmarc=pass action=none header.from=arm.com; dkim=pass header.d=arm.com; 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=EFRRD/ANyniVsKYBUI5lNsBAnaQymI1jf/BGtArYlrE=; b=p7f5UYQVNOl8yd5jO0nlNOcujUQQD30dkQiKJyj17xfD6giAJDk7wx+R/eKf64DCzufCgmbftvVwdqhhybYELoVn77GEN5j8LTN3ZOICkmQ8KV6h7qoccComZU6Lao2U7v8IKiDe/+j3OcTvmwHVVQmPAbWYojJQQH+4pJm0l/8= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=arm.com; Received: from AS8PR08MB6995.eurprd08.prod.outlook.com (2603:10a6:20b:34d::13) by AS8PR08MB8826.eurprd08.prod.outlook.com (2603:10a6:20b:5bb::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5880.8; Mon, 28 Nov 2022 16:17:02 +0000 Received: from AS8PR08MB6995.eurprd08.prod.outlook.com ([fe80::e825:ff01:1f8:4c1f]) by AS8PR08MB6995.eurprd08.prod.outlook.com ([fe80::e825:ff01:1f8:4c1f%4]) with mapi id 15.20.5880.008; Mon, 28 Nov 2022 16:17:02 +0000 Message-ID: <6f0cc4a8-a58d-e715-3078-5b8ccc288c2e@arm.com> Date: Mon, 28 Nov 2022 16:17:00 +0000 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.5.0 Subject: Re: [PATCH v2 12/19] arm64: mm: Add definitions to support 5 levels of paging Content-Language: en-US To: Ard Biesheuvel , linux-arm-kernel@lists.infradead.org Cc: Marc Zyngier , Will Deacon , Mark Rutland , Kees Cook , Catalin Marinas , Mark Brown , Anshuman Khandual , Richard Henderson References: <20221124123932.2648991-1-ardb@kernel.org> <20221124123932.2648991-13-ardb@kernel.org> From: Ryan Roberts In-Reply-To: <20221124123932.2648991-13-ardb@kernel.org> X-ClientProxiedBy: LO6P265CA0002.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:339::11) To AS8PR08MB6995.eurprd08.prod.outlook.com (2603:10a6:20b:34d::13) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8PR08MB6995:EE_|AS8PR08MB8826:EE_ X-MS-Office365-Filtering-Correlation-Id: 0df1bddb-137e-4a41-9891-08dad15bfba3 NoDisclaimer: true X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: h7Rgwh6MWcBPJd2KpzSB2IQsRUNaT2Uf33pT8aeT/dA5Pn+2/67vdqU+XotgncOFmk57qc/Vu6DoVuD3l4xg1PLXAVYviOYIJPCBMig39Fk2Zddt0XyswpWSy3sZh9bJg6hSvtm/xuTE4rmjRnxh0Q8cqkxn9+Go7OIF0A1EaLl0XSICgmGabA6DrXqGd41WklHx4QleF71uIxcZm4L0Ou5My9v01w6Jnmh2ZMY/wBYodCt8XnYzPwEA7gih0+n09wRJ+wL/e3D0wDM+z1C5sicYfQwaE2WlMwJC4ipY2qpvu64aj8WW43cP4UcNJxvMou7rcuIl6f0UCNFlEOMMoDK1pP5jV89RuzzrQCAxxhjpMgE8QYHx6IWCFmwVL2FTzOBpeGcsGzORZuCgSGC5fNyr92lflvHbYYRbKmjkb0fuqD8SETF/r1BNNNpsJFExGeCGfOTFKIL2KNX7nB1zYmS7DHBLjFmzlCQ18IRMamUqMBJhdSBn6mJPb3K/p8O34B4098aeWEaDzgb8owCD2vJ0Pe7xdgDp2NUcWY+lvHxC8QI4zvPytM+B45pZC3dzXwXQy+AlLZGV/7Z0mFovZmmFdACIMEDAFQ6c6R67j3tCLW70tqBsKG//wSK0nAuStJztroyaHpz6lm5vopGnrx869WTC/CusRMTjrXDBSebSliiIjUw4jMgmDlFkm5HEO5P93IjKiIpbs7BsUuaaUuxvqjkjWLeJgE6RlG2+ZBk= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AS8PR08MB6995.eurprd08.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(4636009)(396003)(136003)(366004)(346002)(376002)(39860400002)(451199015)(83380400001)(86362001)(31696002)(44832011)(41300700001)(2906002)(38100700002)(5660300002)(8936002)(4326008)(6506007)(53546011)(6512007)(26005)(186003)(316002)(2616005)(66476007)(66556008)(66946007)(6486002)(8676002)(54906003)(478600001)(36756003)(31686004)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?QXFDRTAySHJvcDJNQk9GMEI1WEdkQS9lUy9IWHZHZll5NTJISTByL3dubWpk?= =?utf-8?B?UXN0RVgzK1dPK2Q5QW5DbWNESFdFM1NJbmhQM0dqVE5yVWZhQ0NhREg1M0R5?= =?utf-8?B?N1hpcnlKOTlzSlo1VmExbVdDakpCbEk1cjB3L2VaRnBUWHFjZ1BGbkNWaTgz?= =?utf-8?B?K2Y4NmZ5a0V2eU9HWDM5MkYvS3JqdGxSUjBrc3M5Tmx2cnhTVU12VDNORitu?= =?utf-8?B?U2FqazlBSVlLWlFjdlhIbG5FczNEYVlDSEM4dGp0TStmM015VXZvZWhpTFJt?= =?utf-8?B?UUN0aXlYTkhKN1ZjTzdJZVhjcUNhdExOa2ZCWUJvRit1VEN1cXRxWUtIUEtq?= =?utf-8?B?SDFpSE44QjZla1hOQ08wSE1sWktEWjRzM3hVRzlhSE45Rk44Rm12WXc2bk5l?= =?utf-8?B?ZmVScksvWGdzeSs1dC8zQTlvTTZwaFVsYlhzeWZtUVlNRWdOSkltUGlOVXBh?= =?utf-8?B?YSt3Ym96UTZpTlhQaFdYak54ZlEvcUliM043QW9pa0JLL3luMEhkSkF5bXpF?= =?utf-8?B?Tno0cWVXYUJCdE9seXdyKzNyRUpaRkZaMUtmSmI5MldlTUhZR3dnTU1lUEFz?= =?utf-8?B?U3hQcFNXSWFVUU16SWhWSTdqeVR6MEYrbFpucXJLamVkVkRjQ3ozZEM3NDRB?= =?utf-8?B?UEdOZHJKVGtvTkI5SVREQllqZnA0bVFZT0w4NU9rVjE1NnRGOTVCZTBkNVRK?= =?utf-8?B?MmtQaWJDRHltbWQ3OFhxMVRnd2dUNlRSdVYrakxsMDBHK01zQ0NqeTI5ODVR?= =?utf-8?B?VHdoM3ZvTjFjNmxjMHQ0bGFBZ0s5clRGMVYrM0xTTkQ1VlRuZDhaV0tFUW1N?= =?utf-8?B?dlY3dnNWQk1CY3dURGtFZ21yM0FGOGVmMmsvVUpUS1pxR0lHaGZ5TitLZUl5?= =?utf-8?B?Ymo1bjBwdFhIM1RDYmNGYmIya0JpTlgzQ0xTNW00V2tKUVk0SkowTFJNTWhj?= =?utf-8?B?YVp6NUNYbFlvV1haNEhrc3JQVHRHeDBJK0p3R2lzdU82b2dQSW5TS0dKeUlr?= =?utf-8?B?NUlWUkZoZWFIeGpWbnkvZmhVZG1RTTlqRzBoZ0h4UWdGL3Vub0FjVnM5QkFS?= =?utf-8?B?SGpyekRVNnlGWCtacEQyVmt1QmRJQnFzYzQ0MjBEQzJGSGNub244SmFoWlZT?= =?utf-8?B?alUrVlpnVW9BdWdBR2dGeWl5SkprZ3RQajUwZHpKaGFmamJQS1UxSVAwSkJE?= =?utf-8?B?d1lWNGIyZTZhWXdGbjhMRWhsdERJQ2diR0RGSkZWeEtMZGZFZWFMRG9XQkhv?= =?utf-8?B?bEdYTGRKa09kNXlpYW1MVDFsQjZieWJNVTIvRHVLLzlVYUU5dDJMY2lxeER4?= =?utf-8?B?a2F0ZHlaNjZSUTRKQWU2THJqc0hGRDFMT0xITlJhU0tlcEgwTC9nMzBRV3Fx?= =?utf-8?B?Y0YySGw5cUNFcUM3WDRQSU9jYTl5TlRiOVZpZUsrN1Zsd3FxS2p5U1J2TnVO?= =?utf-8?B?OTFWamwralBzZllSd3BOZENjNitBeG52UFJ2djIxbXJOcHFjL2RHblErbXZN?= =?utf-8?B?ci9UOWV4QXRrWlhwcDlpZm1HNFMwOHJmTjdKWlRxeThleEpyN0l1a3cyeEdU?= =?utf-8?B?VzlOdjA4ZzZSTW5OS29zVFljVGpNNjh4dnVwNUpaL3puRm15dXpoR09rM3VI?= =?utf-8?B?YkJKWG1zS0ZuOUVtaHl3M1BMZ3YwY1BsUkY2MDA3R0lzNXFFKytoRUhaVWZz?= =?utf-8?B?Q3VOTnBzNEdDRzBBNytsamhtSkxtUWg5Z2RLKy9TUkZTb290cmZRY2piTkRW?= =?utf-8?B?aGg1dS9hSmhtZlVJL0FDT3RXZDRWQlJCUWhwSmltdkg5Z2R3MnA0emUvUWxD?= =?utf-8?B?cHlpeEpmdXVmUlNRMlF4aW9PVitUOFRLdTRZVC85eWFzNWs5cTIySEwyOXZR?= =?utf-8?B?R2VMeXV2R1dTT2RVL2xscUo1TnF1UHlOZy94NGlqZlpCUlBYZ2k2cmNlOGx5?= =?utf-8?B?cU82b000b2tmc0wxYTBHZkpOYUNXdzdvNmFQVm5TWGc1T214ZTNuK0QxZlI0?= =?utf-8?B?M3FoM2FxV2JHSDYwOFdOWnFvR25ISmtlWjhDNlcvZENYa1BrSUNBTDQxVjRC?= =?utf-8?B?NmhNektMa2prNTQ1WWh6cmhrYkl4UkhObDY2cTdmV2tnek5CRjBOT29xOWVz?= =?utf-8?Q?4YmPLKIVEwYf0aB1qRDwV1Gls?= X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0df1bddb-137e-4a41-9891-08dad15bfba3 X-MS-Exchange-CrossTenant-AuthSource: AS8PR08MB6995.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Nov 2022 16:17:02.2878 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: MP59s8LYcd+dHrXlTDCBZxs+zy7N7NesmPC0hZZdlCDinHqzoCpryQL5GU37caZ2qJtC9b4SB8samb0zfWtlng== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB8826 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221128_081707_676707_12946A59 X-CRM114-Status: GOOD ( 30.42 ) 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 On 24/11/2022 12:39, Ard Biesheuvel wrote: > Add the required types and descriptor accessors to support 5 levels of > paging in the common code. This is one of the prerequisites for > supporting 52-bit virtual addressing with 4k pages. > > Note that this does not cover the code that handles kernel mappings or > the fixmap. > > Signed-off-by: Ard Biesheuvel > --- > arch/arm64/include/asm/pgalloc.h | 41 +++++++++++ > arch/arm64/include/asm/pgtable-hwdef.h | 22 +++++- > arch/arm64/include/asm/pgtable-types.h | 6 ++ > arch/arm64/include/asm/pgtable.h | 75 +++++++++++++++++++- > arch/arm64/mm/mmu.c | 31 +++++++- > arch/arm64/mm/pgd.c | 15 +++- > 6 files changed, 181 insertions(+), 9 deletions(-) > > diff --git a/arch/arm64/include/asm/pgalloc.h b/arch/arm64/include/asm/pgalloc.h > index 237224484d0f..cae8c648f462 100644 > --- a/arch/arm64/include/asm/pgalloc.h > +++ b/arch/arm64/include/asm/pgalloc.h > @@ -60,6 +60,47 @@ static inline void __p4d_populate(p4d_t *p4dp, phys_addr_t pudp, p4dval_t prot) > } > #endif /* CONFIG_PGTABLE_LEVELS > 3 */ > > +#if CONFIG_PGTABLE_LEVELS > 4 > + > +static inline void __pgd_populate(pgd_t *pgdp, phys_addr_t p4dp, pgdval_t prot) > +{ > + if (pgtable_l5_enabled()) > + set_pgd(pgdp, __pgd(__phys_to_pgd_val(p4dp) | prot)); > +} > + > +static inline void pgd_populate(struct mm_struct *mm, pgd_t *pgdp, p4d_t *p4dp) > +{ > + pgdval_t pgdval = PGD_TYPE_TABLE; > + > + pgdval |= (mm == &init_mm) ? PGD_TABLE_UXN : PGD_TABLE_PXN; > + __pgd_populate(pgdp, __pa(p4dp), pgdval); > +} > + > +static inline p4d_t *p4d_alloc_one(struct mm_struct *mm, unsigned long addr) > +{ > + gfp_t gfp = GFP_PGTABLE_USER; > + > + if (mm == &init_mm) > + gfp = GFP_PGTABLE_KERNEL; > + return (p4d_t *)get_zeroed_page(gfp); > +} > + > +static inline void p4d_free(struct mm_struct *mm, p4d_t *p4d) > +{ > + if (!pgtable_l5_enabled()) > + return; > + BUG_ON((unsigned long)p4d & (PAGE_SIZE-1)); > + free_page((unsigned long)p4d); > +} > + > +#define __p4d_free_tlb(tlb, p4d, addr) p4d_free((tlb)->mm, p4d) > +#else > +static inline void __pgd_populate(pgd_t *pgdp, phys_addr_t p4dp, pgdval_t prot) > +{ > + BUILD_BUG(); > +} > +#endif /* CONFIG_PGTABLE_LEVELS > 4 */ > + > extern pgd_t *pgd_alloc(struct mm_struct *mm); > extern void pgd_free(struct mm_struct *mm, pgd_t *pgdp); > > diff --git a/arch/arm64/include/asm/pgtable-hwdef.h b/arch/arm64/include/asm/pgtable-hwdef.h > index b91fe4781b06..b364b02e696b 100644 > --- a/arch/arm64/include/asm/pgtable-hwdef.h > +++ b/arch/arm64/include/asm/pgtable-hwdef.h > @@ -26,10 +26,10 @@ > #define ARM64_HW_PGTABLE_LEVELS(va_bits) (((va_bits) - 4) / (PAGE_SHIFT - 3)) > > /* > - * Size mapped by an entry at level n ( 0 <= n <= 3) > + * Size mapped by an entry at level n ( -1 <= n <= 3) > * We map (PAGE_SHIFT - 3) at all translation levels and PAGE_SHIFT bits > * in the final page. The maximum number of translation levels supported by > - * the architecture is 4. Hence, starting at level n, we have further > + * the architecture is 5. Hence, starting at level n, we have further > * ((4 - n) - 1) levels of translation excluding the offset within the page. > * So, the total number of bits mapped by an entry at level n is : > * Is it neccessary to represent the levels as (-1 - 3) in the kernel or are you open to switching to (0 - 4)? There are a couple of other places where translation level is used, which I found and fixed up for the KVM LPA2 support work. It got a bit messy to represent the levels using the architectural range (-1 - 3) so I ended up representing them as (0 - 4). The main issue was that KVM represents level as unsigned so that change would have looked quite big. Most of this is confined to KVM and the only place it really crosses over with the kernel is at __tlbi_level(). Which makes me think you might be missing some required changes (I didn't notice these in your other patches): Looking at the TLB management stuff, I think there are some places you will need to fix up to correctly handle the extra level in the kernel (e.g. tlb_get_level(), flush_tlb_range()). There are some new ecodings for level in the FSC field in the ESR. You might need to update the fault_info array in fault.c to represent these and correctly handle user space faults for the new level? > [...] Thanks, Ryan _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel