From patchwork Tue Sep 12 14:16:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 13381811 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 F1A51CA0EEB for ; Tue, 12 Sep 2023 14:21:12 +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=NBVnHPQMoYjpAcz3VJicjAb/fnXrzmgP9Xb6iSfdz2Q=; b=dZWWhFlHm2n7qmwz3Y+BjFI8xq XKSTuCQCxpF4jpJjnqLJ3tp2bRNHdl8gsh+VGk7/0QKzlOvebSarUojVcip0zXPVPj0vIvR4W+VjO QsGy4CtUcJ/0dKxoE7sJPk+BUzmOTRJlN32ihOwa7hF/Raa6wNhrCm2lzkdwrMIvoJ7YJLaGj31YG tbHUtF4sbANGM0pYZVEGDgfdgGbdyV/YYoN8xIa1EdAEl6Q8WI2Kd7Se6s4JGTq3uEEBT38OOMXkJ i1Cz4bvyE2nL/TxduxyRSv30W60Pksm/XPA7LCofbVYHL8pBG6PoZRp5z/yG9Nt0s/mF1vIyfJagu 7funVuLw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qg4Fr-003YSw-3A; Tue, 12 Sep 2023 14:20:40 +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 1qg4Eh-003XTq-0P for linux-arm-kernel@bombadil.infradead.org; Tue, 12 Sep 2023 14:19:27 +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=YsvtqLSxpf/VGMm023u50LetdVrmzikeTeAwppCYHyY=; b=PNfVMwyzH9EO5fvgRZ9jAV+bID 3sK3Hvi5TNWnuR5MHYckslsaEXFzF4L91Swk1ODnw3Bhle8UTIgoQsSk9XeBJG8cVHShK0zqtjyBU MrM3tt356ZqXPqESn8E2roh7smXp6BryVTcTckNA7/LEOR4bznJjgMGnu4w9ThAez2aA1Uwq0MkYF C9a86mnY40kansBegbq6FJjYcO8vcC7t4xuU0ePoK0IL7f2o72WtNnEROB+ke59LkoqBhEq8YpkDb 6Dw4yGLMQ2FRQ2bqc+8JVPPBCxmXJqaCRq0OMDv6TrToilY1ToQJ7lnwGnx8G5X8kfVK0roIRGieg 97rh0qgw==; Received: from mail-yb1-xb49.google.com ([2607:f8b0:4864:20::b49]) by desiato.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qg4Ea-006A3s-0h for linux-arm-kernel@lists.infradead.org; Tue, 12 Sep 2023 14:19:25 +0000 Received: by mail-yb1-xb49.google.com with SMTP id 3f1490d57ef6-d7fd4c23315so4915329276.2 for ; Tue, 12 Sep 2023 07:19:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1694528359; x=1695133159; 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=YsvtqLSxpf/VGMm023u50LetdVrmzikeTeAwppCYHyY=; b=4c+A+9Uc8mIHOwL16NyOvtdxbl++gzTy9NqD09/eOXnpBa6HJBBdNF0wyZfYYHvsJR y1rUzcBik/o6WX847+MiShsyUx8ST9LcV2go/dapv7yHQSSIGTkZ0DDTGDnxVCZMKrJ7 7axmls0b34xi9oIGS2cMdpUXku7kE+CVW5jiJGs1DB/FLFkKQbzjKIiFjgVI6tLWovxU XVGhQP1UuWqq0stC1nCJEcvYbe/CPXFiF8tFcAsTNOQA/P9PaYTmTgzmg6/Lo2Rqdusk LVvW/a3XnORogtlN40+6ZOSD1tIUDZNaXx9mawVgG03AfF8ygm3+QYcTtj9yacfdkwlI gCLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694528359; x=1695133159; 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=YsvtqLSxpf/VGMm023u50LetdVrmzikeTeAwppCYHyY=; b=eCD453w6e2mnVkbC5BdCbkUYlfiXa6Lx/k02EK5SJsf5a6xrEQaqaWI6PSE48uoFtc 2K5VPv4nB+Z6K+FMxR3LWe7HqL82xHDkATVqO80Hwu3zsO8BMIcjNBvosYOzX0VuppA/ j44YtVAaac1b7sHexAbznoFpEf2Q6Wg7+pK2fLa1Y32Bxi2Q4gI/UrPEKwXBBF5W/v+7 RKcqoq6+5CgktSJ620fOptYA5zyrrntHJqWPzHBXXK85sXAkJNyNmj5UWIjsH6H4fv1m rQNyOQVGgOXjbnrS4Xq1vpgWoX0JVf2v5Zsw63Dw5kxlCTVUP93dvw3I8kCDdpV3MY/O ideg== X-Gm-Message-State: AOJu0YwqRMBtXeBtFMBicmFEcqFcPdc0vmqOo5iW0Z3gzIkbyIeC16/2 aoIWwtLqmjTRtyULSZarFOKGIKdk2pmyv3zgqzQqw4LvKUP00IxU7hE7gxomkzTWZErVFGU7pAl pELCHDpMK0CUh/H0bsER95nQqnjQKw5/clYnX8ttVlKqcFAagFuG249L24ZzJxIRvBM3yBThMlJ o= X-Google-Smtp-Source: AGHT+IFuow+IpdEvR+JAf2lutI/rsBOhYW9NAZxTepOqyXLQj+ku/HuAnEZD4uAQFk3wNUvi6arU0c9n X-Received: from palermo.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:118a]) (user=ardb job=sendgmr) by 2002:a05:6902:68e:b0:d7e:add7:4de6 with SMTP id i14-20020a056902068e00b00d7eadd74de6mr302400ybt.4.1694528359388; Tue, 12 Sep 2023 07:19:19 -0700 (PDT) Date: Tue, 12 Sep 2023 14:16:41 +0000 In-Reply-To: <20230912141549.278777-63-ardb@google.com> Mime-Version: 1.0 References: <20230912141549.278777-63-ardb@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=qLqflDF20wTMiluuLp5NyqSS00r12/n3JMMEtwTs5Q0=; b=owGbwMvMwCFmkMcZplerG8N4Wi2JIZWh6IyYY3N+7aOq+sknPY7fyVz75LdhY2pP1eVVeWx8f mfdHZo6SlkYxDgYZMUUWQRm/3238/REqVrnWbIwc1iZQIYwcHEKwETqNjAyrDnh6PWUvWZHsL57 16uAGI2MrbbGMqdmxDnopLFcUJ9XzMjwzHr5BO8lXxcVME9uCGNMdjZsqdq1zzbgYtHJmwa72X0 ZAA== X-Mailer: git-send-email 2.42.0.283.g2d96d420d3-goog Message-ID: <20230912141549.278777-114-ardb@google.com> Subject: [PATCH v4 51/61] 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 , Joey Gouly X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230912_151921_840654_25C72293 X-CRM114-Status: GOOD ( 15.87 ) 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: , 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 769abda8a4f9..ad6d129d2098 100644 --- a/arch/arm64/include/asm/pgtable.h +++ b/arch/arm64/include/asm/pgtable.h @@ -613,12 +613,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); @@ -883,12 +883,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 9436a12e1882..355ad694c5ef 100644 --- a/arch/arm64/mm/fixmap.c +++ b/arch/arm64/mm/fixmap.c @@ -101,7 +101,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 ed18cc4cea0d..916f4b1814ff 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);