From patchwork Fri Nov 24 10:19:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 13467457 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 973F2C61DF4 for ; Fri, 24 Nov 2023 10:23:43 +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=xwHkk4ksK65UUzQ8XTUFpehDJFUNJHZXoxeYCghyQnM=; b=zunnNsKEWN8FJysVl++3f+Icn7 Zpdyws/h7FCo3+Jz5YhuRst656eehE3vzrf9+uTbAIqdXkEdH9Gwq8SNpBNSPF5tIGSVYCKErDyWe 7razxx8G57iZZV4xI/uvMPjDUfNi/AI2iGKpsUs/zGg3KjEiq3G41EN4/TGme5NFZ03TvXBSHtvFE lir3klWTkulYbcopzzCgYpGV62r1tY2pdSv6VTQnprCyLhK6Ea0S5q7IwyOx5qbZ/unt3tt4H3WhS hR3/Hvd6GFdANA/Sm7edAZJzLRqup0lcKLA33iIa1/E1iXGTI94rVK43weWBoBzAFuslflmUXH9p/ p8Ay7MRw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1r6TKz-006psu-25; Fri, 24 Nov 2023 10:23:05 +0000 Received: from mail-wr1-x44a.google.com ([2a00:1450:4864:20::44a]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1r6TJY-006pFN-3B for linux-arm-kernel@lists.infradead.org; Fri, 24 Nov 2023 10:21:49 +0000 Received: by mail-wr1-x44a.google.com with SMTP id ffacd0b85a97d-332e11a22a0so879152f8f.2 for ; Fri, 24 Nov 2023 02:21:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1700821294; x=1701426094; 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=mJgEdoeKR1YMff1vw9Z8TUCFCAyrBcTVbGoDtrpkcs8=; b=pd6H8LJpmUVpdYVFnuGKl7JmtZXOze6G63Tr+0hd6blhaaLaACRcdym5sjfpRfnO9H oqupgB/tXIIHCiOTjmCCyDbHWgCpCBk9wR6GyW42sEEWRxCs+HvKjsj7vhfS83+5eKza PXIgIA0UKU8PP5rINLTUI09woisOxqCmUrsCd8OO29htonOD6GfpkvGy9ckv5widyOAN IGGMy88T1tW0Qih1OScw9/qMN7Ce6fClDb5qiDCXakgFhBlHPm73hHS3brPZ9ymeCvvG YHSIJhqNWg85RChxg7tKIbXHbl32pqU7ASyI5mjIvfTUi6tS7ieGRmPutN01VCEwz3yE AW5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700821294; x=1701426094; 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=mJgEdoeKR1YMff1vw9Z8TUCFCAyrBcTVbGoDtrpkcs8=; b=GBSs6Gs2IoxVSMCXioPinCN8KnHrog2JDFIjITXvKBZUYm1IuswNsI5v1jxp2PMjTH V7PTvU0AgwwfjZizlK/cz4Kna8Jp9POFoKxINVyCkfDSMyIQ2kkCGC+Z0DiqBg9oPzqK 5aFMyR61N0OWpLnMd0ndsKuB72VlE5mZf0DEtBrRknl1HAmvkHLWJF/5wm6tjv4AgIKa Qh+ZMd6m/zNO9HjjS9IIdZktR868vFs3ws5d0ZNm3fzaRH3wyKGn/h+RZAc2PNx6HEVe 7FXvBqnbuiVWnf2ie2R3G+jbrUGAtstUN3gJXGpKhhBMcCk8elc1vN2oRwEf4LhmnNUp 4KsA== X-Gm-Message-State: AOJu0YzmmccnTA1JyDyyuvow01vsLF7DRH4KQWTa99JR0jWRkoxg1pM6 jMtdM4C9TZ1YaMTUTIia+YSDOt7wCOvlmm3rqmHSSrnlSuFuWFnFyU9ZRm5UP26nNAS12IaCoTe YoG4krGIXf1N/JQWdC0TAsFzoieSY7k8EpHpmBKxXZytud4WLtLhBP59pI7G2T0YPGQq+zZW6DU s= X-Google-Smtp-Source: AGHT+IF7i63j4DMd/T0VsobpBh4NmkpDg/L++ezYBLCukmzuDXbgKh3wJFKmzM5MHHZqdSh9zc6oRZit X-Received: from palermo.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:118a]) (user=ardb job=sendgmr) by 2002:adf:dd81:0:b0:32f:b3eb:c3d8 with SMTP id x1-20020adfdd81000000b0032fb3ebc3d8mr34650wrl.5.1700821293684; Fri, 24 Nov 2023 02:21:33 -0800 (PST) Date: Fri, 24 Nov 2023 11:19:15 +0100 In-Reply-To: <20231124101840.944737-41-ardb@google.com> Mime-Version: 1.0 References: <20231124101840.944737-41-ardb@google.com> X-Developer-Key: i=ardb@kernel.org; a=openpgp; fpr=F43D03328115A198C90016883D200E9CA6329909 X-Developer-Signature: v=1; a=openpgp-sha256; l=5172; i=ardb@kernel.org; h=from:subject; bh=xUwSPPT81eaQTdUSndo82jx0GrRomul61QO77P+qcOg=; b=owGbwMvMwCFmkMcZplerG8N4Wi2JITWhYn2wV+8rUefCBt4W3bOs/uVqbEVfhMMC+HZ9vL1zc 3Xb2dMdpSwMYhwMsmKKLAKz/77beXqiVK3zLFmYOaxMIEMYuDgFYCLLJBj+GXxRcjq5TPOEyM+Q ezX/bkud/F2xVrh8gpFz7v7fk28v9GZkuPRCRUbj4JOKrasVBNweXdE2eNDDYiJ1p3+eVnXuUt8 dDAA= X-Mailer: git-send-email 2.43.0.rc1.413.gea7ed67945-goog Message-ID: <20231124101840.944737-76-ardb@google.com> Subject: [PATCH v5 35/39] arm64: pgtable: Decouple PGDIR size macros from PGD/PUD/PMD levels 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-20231124_022137_055681_E4A31B23 X-CRM114-Status: GOOD ( 18.56 ) 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 The mapping from PGD/PUD/PMD to levels and shifts is very confusing, given that, due to folding, the shifts may be equal for different levels, if the macros are even #define'd to begin with. In a subsequent patch, we will modify the ID mapping code to decouple the number of levels from the kernel's view of how these types are folded, so prepare for this by reformulating the macros without the use of these types. Instead, use SWAPPER_BLOCK_SHIFT as the base quantity, and derive it from either PAGE_SHIFT or PMD_SHIFT, which -if defined at all- are defined unambiguously for a given page size, regardless of the number of configured levels. Signed-off-by: Ard Biesheuvel --- arch/arm64/include/asm/kernel-pgtable.h | 65 ++++++-------------- 1 file changed, 19 insertions(+), 46 deletions(-) diff --git a/arch/arm64/include/asm/kernel-pgtable.h b/arch/arm64/include/asm/kernel-pgtable.h index 742a4b2778f7..f1fc98a233d5 100644 --- a/arch/arm64/include/asm/kernel-pgtable.h +++ b/arch/arm64/include/asm/kernel-pgtable.h @@ -13,27 +13,22 @@ #include /* - * The linear mapping and the start of memory are both 2M aligned (per - * the arm64 booting.txt requirements). Hence we can use section mapping - * with 4K (section size = 2M) but not with 16K (section size = 32M) or - * 64K (section size = 512M). + * The physical and virtual addresses of the start of the kernel image are + * equal modulo 2 MiB (per the arm64 booting.txt requirements). Hence we can + * use section mapping with 4K (section size = 2M) but not with 16K (section + * size = 32M) or 64K (section size = 512M). */ - -/* - * The idmap and swapper page tables need some space reserved in the kernel - * image. Both require pgd, pud (4 levels only) and pmd tables to (section) - * map the kernel. With the 64K page configuration, swapper and idmap need to - * map to pte level. The swapper also maps the FDT (see __create_page_tables - * for more information). Note that the number of ID map translation levels - * could be increased on the fly if system RAM is out of reach for the default - * VA range, so pages required to map highest possible PA are reserved in all - * cases. - */ -#ifdef CONFIG_ARM64_4K_PAGES -#define SWAPPER_PGTABLE_LEVELS (CONFIG_PGTABLE_LEVELS - 1) +#if defined(PMD_SIZE) && PMD_SIZE <= MIN_KIMG_ALIGN +#define SWAPPER_BLOCK_SHIFT PMD_SHIFT +#define SWAPPER_SKIP_LEVEL 1 #else -#define SWAPPER_PGTABLE_LEVELS (CONFIG_PGTABLE_LEVELS) +#define SWAPPER_BLOCK_SHIFT PAGE_SHIFT +#define SWAPPER_SKIP_LEVEL 0 #endif +#define SWAPPER_BLOCK_SIZE (UL(1) << SWAPPER_BLOCK_SHIFT) +#define SWAPPER_TABLE_SHIFT (SWAPPER_BLOCK_SHIFT + PAGE_SHIFT - 3) + +#define SWAPPER_PGTABLE_LEVELS (CONFIG_PGTABLE_LEVELS - SWAPPER_SKIP_LEVEL) #define IDMAP_VA_BITS 48 #define IDMAP_LEVELS ARM64_HW_PGTABLE_LEVELS(IDMAP_VA_BITS) @@ -53,24 +48,13 @@ #define EARLY_ENTRIES(vstart, vend, shift, add) \ (SPAN_NR_ENTRIES(vstart, vend, shift) + (add)) -#define EARLY_PGDS(vstart, vend, add) (EARLY_ENTRIES(vstart, vend, PGDIR_SHIFT, add)) - -#if SWAPPER_PGTABLE_LEVELS > 3 -#define EARLY_PUDS(vstart, vend, add) (EARLY_ENTRIES(vstart, vend, PUD_SHIFT, add)) -#else -#define EARLY_PUDS(vstart, vend, add) (0) -#endif +#define EARLY_LEVEL(lvl, vstart, vend, add) \ + (SWAPPER_PGTABLE_LEVELS > lvl ? EARLY_ENTRIES(vstart, vend, SWAPPER_BLOCK_SHIFT + lvl * (PAGE_SHIFT - 3), add) : 0) -#if SWAPPER_PGTABLE_LEVELS > 2 -#define EARLY_PMDS(vstart, vend, add) (EARLY_ENTRIES(vstart, vend, SWAPPER_TABLE_SHIFT, add)) -#else -#define EARLY_PMDS(vstart, vend, add) (0) -#endif - -#define EARLY_PAGES(vstart, vend, add) ( 1 /* PGDIR page */ \ - + EARLY_PGDS((vstart), (vend), add) /* each PGDIR needs a next level page table */ \ - + EARLY_PUDS((vstart), (vend), add) /* each PUD needs a next level page table */ \ - + EARLY_PMDS((vstart), (vend), add)) /* each PMD needs a next level page table */ +#define EARLY_PAGES(vstart, vend, add) (1 /* PGDIR page */ \ + + EARLY_LEVEL(3, (vstart), (vend), add) /* each entry needs a next level page table */ \ + + EARLY_LEVEL(2, (vstart), (vend), add) /* each entry needs a next level page table */ \ + + EARLY_LEVEL(1, (vstart), (vend), add))/* each entry needs a next level page table */ #define INIT_DIR_SIZE (PAGE_SIZE * (EARLY_PAGES(KIMAGE_VADDR, _end, EXTRA_PAGE) + EARLY_SEGMENT_EXTRA_PAGES)) /* the initial ID map may need two extra pages if it needs to be extended */ @@ -81,17 +65,6 @@ #endif #define INIT_IDMAP_DIR_PAGES EARLY_PAGES(KIMAGE_VADDR, _end + MAX_FDT_SIZE + SWAPPER_BLOCK_SIZE, 1) -/* Initial memory map size */ -#ifdef CONFIG_ARM64_4K_PAGES -#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 - /* The number of segments in the kernel image (text, rodata, inittext, initdata, data+bss) */ #define KERNEL_SEGMENT_COUNT 5