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 4CA1CC47DDB for ; Tue, 23 Jan 2024 14:58:44 +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:Cc:To:From:Subject:Message-ID: References:Mime-Version:In-Reply-To:Date:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=kKGxAu/23K5GwPJka3yLNyC3K3IhRJTVVqr7BiT+fM8=; b=eW79b/Uoer7RZw0bbW10G5160X GmEEisJOh+J6Td9vKbcKJ4aMuytKFcnESXyWYIxh19hOEolOvA+DMl+l1bzPRKR9Zm3fRkA33+RyL 5HC8qhqY7wTX/YQLwsV4vS2q+qg7+4+bs4n4NBi5GFSg1InWvxiDSrFt8I+uQUZNQxFvfzdNrzKeV ADpP8OJYH52UTizKzT0NFdDXV/MTguco6GURQmj3eCC9f+GeZZqSLj0K8xsgMJIpDq5NW/gfxmSZA kge8v8ijcX+rASBYgTQZbRNcqQ2P0XVBKfffzDup+rAL4y0ZIEl85PANKdCnhEEmbfT0wHU3WT43i SZr5kCWw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rSIEA-00Gvh1-22; Tue, 23 Jan 2024 14:58:14 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rSIC2-00GuT7-2V for linux-arm-kernel@bombadil.infradead.org; Tue, 23 Jan 2024 14:56:02 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Type:Cc:To:From:Subject: Message-ID:References:Mime-Version:In-Reply-To:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=O9qiOJlG6eSRmj+2/Xt1pD4QlhObgBVPxSvpDPcf5G4=; b=MRYnToQhdvjWfBIWumSWVxjaOl eDEuzLoiW/BzHd7yyQiEQ++ktD8go8wyEORGPihZANe/6jxB+qERG+NbBSyOGeaPxfK/LaeEWWBbI FzFLBl7XibvDT0viJ6XjrolzJtROvjJ6whNbixE4wiRQzR6oQ4CepweOWYF/pgtB2f0OHLwSnRaT7 V2wJZxQwJWsdyRh+bK2nXFR7tfUgFhQv6RNVTbbeja8+vq4Vxz0HkOwO4rFN2L7iz9O6E1gIs+ysw uB0R0XdgxmxDlG8UTx4A0pjA6IUGG/crXeZfC37S2h7S+NQadIMQDCHifelZyvpVCZ7BCaLj515qe jS6ptYiA==; Received: from mail-yb1-xb4a.google.com ([2607:f8b0:4864:20::b4a]) by desiato.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rSIBz-00000003vaj-1Qiy for linux-arm-kernel@lists.infradead.org; Tue, 23 Jan 2024 14:56:01 +0000 Received: by mail-yb1-xb4a.google.com with SMTP id 3f1490d57ef6-dc265e7a67cso4805921276.0 for ; Tue, 23 Jan 2024 06:55:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1706021757; x=1706626557; darn=lists.infradead.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=O9qiOJlG6eSRmj+2/Xt1pD4QlhObgBVPxSvpDPcf5G4=; b=vq+CuIZQcf1pZUdzZk7cT/P1ncPdH034IiLPNDDlsQuVWVsuKtfdqM/27tT687bFZm fBgyEm3/WT4075ZiG+mUDVUHw++3VHC8z+zeQ8DeexynBWEzuHFyfn/7q1Mzem6G2SAr blakp+wURILvFpsUdMzcHl1tXD9dLaAKRpR0JoJaEFkGQowHRiI8vKGeYO1RINQTtF8J wCHQHzle7rLKgvo+uMYYwH8NAHyVRS4IgzVU7aSiCuV4e4m6IBw55zkJXCov+lbnrKvh bY7e/37Lqt7I4W743gywcORxBjwhWBhCO0aDmSFsFwSBISj2MNfhn+OpIlku2eGPbNVG 6IQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706021757; x=1706626557; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=O9qiOJlG6eSRmj+2/Xt1pD4QlhObgBVPxSvpDPcf5G4=; b=XPjZVhPr9ulZNyIpdvCZMfGj1oqsz6yFYTBZXqjA01Anauq93PpU2h4Y0FvzThNfbG rQbkigUJsHI9WjGoylKJkGDh5KU6L8BydDNFTnEZKv1HlMVuSpLy8/RGkkmrU3368P8W 2wj8J5ST8hUqaHelHHjHvOXJ/Hl2vaH8Wic/yS6YqbXNX2kwjFLinJl6vqpKkz8NVO9S w9AS2WB21iejBccXL2Vh8ySa8/cXgUXb0gEF+jcypusK6nVlkbbc3YP8JJObFZ0SzMDs lwCFqWTGdFxNYnrWCqsHRtyJoEPtnJo95fLpAkR+Y5ILuoyR76QdBlzs0Jl5xsxDlqOt l/AA== X-Gm-Message-State: AOJu0YxDYmGfBkto72yoYrnhhvAiOWqp/zgJPjqZ/5SAdws3W6cZPYtf uYr+4Soj0DCxXBRghLXm3NJ9xEGFnNdn7glntUag6bdLv6A9JsPOJoq5iavdEnsVcxlj/50biNO uWcEvMutRcI8x19wTrRgHR5xeGYouhRTbrRR+DUcSoe9VUiR5ANTyGQpyKI9iIDK4F5BkZJoY/S WkJRidnXB5y6vzFm9xq4E26pGuToF2UtanmaB6eu+0 X-Google-Smtp-Source: AGHT+IHGvSasga/ZGkYDTl5sF03mWgQ+ZYkap/sC0aPKguF3Vf3FZZhmZA032Mmrj6IaPmbXHSmPEODv X-Received: from palermo.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:118a]) (user=ardb job=sendgmr) by 2002:a05:6902:352:b0:dc3:696e:ffae with SMTP id e18-20020a056902035200b00dc3696effaemr778325ybs.3.1706021757629; Tue, 23 Jan 2024 06:55:57 -0800 (PST) Date: Tue, 23 Jan 2024 15:53:40 +0100 In-Reply-To: <20240123145258.1462979-52-ardb+git@google.com> Mime-Version: 1.0 References: <20240123145258.1462979-52-ardb+git@google.com> X-Developer-Key: i=ardb@kernel.org; a=openpgp; fpr=F43D03328115A198C90016883D200E9CA6329909 X-Developer-Signature: v=1; a=openpgp-sha256; l=5970; i=ardb@kernel.org; h=from:subject; bh=Zg78vKr18nGmVnJrGgMQil7+9p7HwMxWJLpooTu47cY=; b=owGbwMvMwCFmkMcZplerG8N4Wi2JIXX9pe/aZn+Tn3AmXXkjNEHllWpBGt+vsr3VrbPaj5ko/ rj8U/RyRykLgxgHg6yYIovA7L/vdp6eKFXrPEsWZg4rE8gQBi5OAZjIPjVGhjdp9X/OCHyduaC0 ebq5U4h3fbv37L5yrY0HPppwnZaM2sTwP0Pt7ZQ6BX03jozDdd/k3AO+9X6NWyqd2rSjtr/twt9 NHAA= X-Mailer: git-send-email 2.43.0.429.g432eaa2c6b-goog Message-ID: <20240123145258.1462979-93-ardb+git@google.com> Subject: [PATCH v7 41/50] arm64: mm: Add 5 level paging support to fixmap and swapper handling From: Ard Biesheuvel To: linux-arm-kernel@lists.infradead.org Cc: Ard Biesheuvel , Catalin Marinas , Will Deacon , Marc Zyngier , Mark Rutland , Ryan Roberts , Anshuman Khandual , Kees Cook X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240123_145559_623883_7EDE6282 X-CRM114-Status: GOOD ( 14.92 ) 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 From: Ard Biesheuvel Add support for using 5 levels of paging in the fixmap, as well as in the kernel page table handling code which uses fixmaps internally. This also handles the case where a 5 level build runs on hardware that only supports 4 levels of paging. Signed-off-by: Ard Biesheuvel --- arch/arm64/include/asm/fixmap.h | 1 + arch/arm64/include/asm/pgtable.h | 45 ++++++++++++++++--- arch/arm64/mm/fixmap.c | 2 +- arch/arm64/mm/mmu.c | 47 ++++++++++++++++++-- 4 files changed, 85 insertions(+), 10 deletions(-) diff --git a/arch/arm64/include/asm/fixmap.h b/arch/arm64/include/asm/fixmap.h index 8aabd45e9a13..87e307804b99 100644 --- a/arch/arm64/include/asm/fixmap.h +++ b/arch/arm64/include/asm/fixmap.h @@ -87,6 +87,7 @@ enum fixed_addresses { FIX_PTE, FIX_PMD, FIX_PUD, + FIX_P4D, FIX_PGD, __end_of_fixed_addresses diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h index 7eb2b933ed3c..3d7fb3cde83d 100644 --- a/arch/arm64/include/asm/pgtable.h +++ b/arch/arm64/include/asm/pgtable.h @@ -621,12 +621,12 @@ static inline bool pud_table(pud_t pud) { return true; } PUD_TYPE_TABLE) #endif -extern pgd_t init_pg_dir[PTRS_PER_PGD]; +extern pgd_t init_pg_dir[]; extern pgd_t init_pg_end[]; -extern pgd_t swapper_pg_dir[PTRS_PER_PGD]; -extern pgd_t idmap_pg_dir[PTRS_PER_PGD]; -extern pgd_t tramp_pg_dir[PTRS_PER_PGD]; -extern pgd_t reserved_pg_dir[PTRS_PER_PGD]; +extern pgd_t swapper_pg_dir[]; +extern pgd_t idmap_pg_dir[]; +extern pgd_t tramp_pg_dir[]; +extern pgd_t reserved_pg_dir[]; extern void set_swapper_pgd(pgd_t *pgdp, pgd_t pgd); @@ -891,12 +891,47 @@ static inline p4d_t *p4d_offset(pgd_t *pgdp, unsigned long addr) return p4d_offset_lockless(pgdp, READ_ONCE(*pgdp), addr); } +static inline p4d_t *p4d_set_fixmap(unsigned long addr) +{ + if (!pgtable_l5_enabled()) + return NULL; + return (p4d_t *)set_fixmap_offset(FIX_P4D, addr); +} + +static inline p4d_t *p4d_set_fixmap_offset(pgd_t *pgdp, unsigned long addr) +{ + if (!pgtable_l5_enabled()) + return pgd_to_folded_p4d(pgdp, addr); + return p4d_set_fixmap(p4d_offset_phys(pgdp, addr)); +} + +static inline void p4d_clear_fixmap(void) +{ + if (pgtable_l5_enabled()) + clear_fixmap(FIX_P4D); +} + +/* use ONLY for statically allocated translation tables */ +static inline p4d_t *p4d_offset_kimg(pgd_t *pgdp, u64 addr) +{ + if (!pgtable_l5_enabled()) + return pgd_to_folded_p4d(pgdp, addr); + return (p4d_t *)__phys_to_kimg(p4d_offset_phys(pgdp, addr)); +} + #define pgd_page(pgd) pfn_to_page(__phys_to_pfn(__pgd_to_phys(pgd))) #else static inline bool pgtable_l5_enabled(void) { return false; } +/* Match p4d_offset folding in */ +#define p4d_set_fixmap(addr) NULL +#define p4d_set_fixmap_offset(p4dp, addr) ((p4d_t *)p4dp) +#define p4d_clear_fixmap() + +#define p4d_offset_kimg(dir,addr) ((p4d_t *)dir) + #endif /* CONFIG_PGTABLE_LEVELS > 4 */ #define pgd_ERROR(e) \ diff --git a/arch/arm64/mm/fixmap.c b/arch/arm64/mm/fixmap.c index 9404f282f829..d22506e9c7fd 100644 --- a/arch/arm64/mm/fixmap.c +++ b/arch/arm64/mm/fixmap.c @@ -104,7 +104,7 @@ void __init early_fixmap_init(void) unsigned long end = FIXADDR_TOP; pgd_t *pgdp = pgd_offset_k(addr); - p4d_t *p4dp = p4d_offset(pgdp, addr); + p4d_t *p4dp = p4d_offset_kimg(pgdp, addr); early_fixmap_init_pud(p4dp, addr, end); } diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c index d30ae4d3fdd9..8e5b3a7c5afd 100644 --- a/arch/arm64/mm/mmu.c +++ b/arch/arm64/mm/mmu.c @@ -313,15 +313,14 @@ static void alloc_init_cont_pmd(pud_t *pudp, unsigned long addr, } while (addr = next, addr != end); } -static void alloc_init_pud(pgd_t *pgdp, unsigned long addr, unsigned long end, +static void alloc_init_pud(p4d_t *p4dp, unsigned long addr, unsigned long end, phys_addr_t phys, pgprot_t prot, phys_addr_t (*pgtable_alloc)(int), int flags) { unsigned long next; - pud_t *pudp; - p4d_t *p4dp = p4d_offset(pgdp, addr); p4d_t p4d = READ_ONCE(*p4dp); + pud_t *pudp; if (p4d_none(p4d)) { p4dval_t p4dval = P4D_TYPE_TABLE | P4D_TABLE_UXN; @@ -369,6 +368,46 @@ static void alloc_init_pud(pgd_t *pgdp, unsigned long addr, unsigned long end, pud_clear_fixmap(); } +static void alloc_init_p4d(pgd_t *pgdp, unsigned long addr, unsigned long end, + phys_addr_t phys, pgprot_t prot, + phys_addr_t (*pgtable_alloc)(int), + int flags) +{ + unsigned long next; + pgd_t pgd = READ_ONCE(*pgdp); + p4d_t *p4dp; + + if (pgd_none(pgd)) { + pgdval_t pgdval = PGD_TYPE_TABLE | PGD_TABLE_UXN; + phys_addr_t p4d_phys; + + if (flags & NO_EXEC_MAPPINGS) + pgdval |= PGD_TABLE_PXN; + BUG_ON(!pgtable_alloc); + p4d_phys = pgtable_alloc(P4D_SHIFT); + __pgd_populate(pgdp, p4d_phys, pgdval); + pgd = READ_ONCE(*pgdp); + } + BUG_ON(pgd_bad(pgd)); + + p4dp = p4d_set_fixmap_offset(pgdp, addr); + do { + p4d_t old_p4d = READ_ONCE(*p4dp); + + next = p4d_addr_end(addr, end); + + alloc_init_pud(p4dp, addr, next, phys, prot, + pgtable_alloc, flags); + + BUG_ON(p4d_val(old_p4d) != 0 && + p4d_val(old_p4d) != READ_ONCE(p4d_val(*p4dp))); + + phys += next - addr; + } while (p4dp++, addr = next, addr != end); + + p4d_clear_fixmap(); +} + static void __create_pgd_mapping_locked(pgd_t *pgdir, phys_addr_t phys, unsigned long virt, phys_addr_t size, pgprot_t prot, @@ -391,7 +430,7 @@ static void __create_pgd_mapping_locked(pgd_t *pgdir, phys_addr_t phys, do { next = pgd_addr_end(addr, end); - alloc_init_pud(pgdp, addr, next, phys, prot, pgtable_alloc, + alloc_init_p4d(pgdp, addr, next, phys, prot, pgtable_alloc, flags); phys += next - addr; } while (pgdp++, addr = next, addr != end); -- 2.43.0.429.g432eaa2c6b-goog _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel