From patchwork Wed Feb 14 12:29:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 13556426 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 DAB8AC48BC3 for ; Wed, 14 Feb 2024 12:32: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=tTCudcbGEMFtk3xiguU/DN3JC00G1XjoKMND/GWpwi4=; b=yNDFB5tJruO5/gVpDpj99QxhkK VI92Da/RnOjEEp6qH3uqwO29l+ajwsDAOZhtjzsKYJxDeycpjs74PEoFGaUAS8WJGlKbUNslJe+QY 6NonHdxVi1ynNXg/N9iq7Fb8CbOs9BfZrIRsGI1J+z/g35RPwx4CKskHNUdKUwmNPazkSk68ui5gw IvNMWF2SkHx1J69UFSvkWJog5Zl5QVQrc3xtekHO0yczPz3dBjgo+lcvLNlLMRSCip4lz2IlSwwjt VIVsn+DTdXFuxE2nXmBKUakPLXFbDItKm0KNNEoYupFRJcaQuNkHbKqXTba5VpXaFcZhXxZmwEE+u WidDiRVQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1raER8-0000000CpcQ-43Af; Wed, 14 Feb 2024 12:32:27 +0000 Received: from mail-wr1-x449.google.com ([2a00:1450:4864:20::449]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1raEPC-0000000CoaZ-2w4L for linux-arm-kernel@lists.infradead.org; Wed, 14 Feb 2024 12:30:55 +0000 Received: by mail-wr1-x449.google.com with SMTP id ffacd0b85a97d-33cec911abeso223870f8f.1 for ; Wed, 14 Feb 2024 04:30:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1707913824; x=1708518624; 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=rHzLXnWMp/qb9CcigctaSxAY3LCDMp8XlWZr+kP58CI=; b=IYHdU/r6RfPS5bMfJ7vC/KEn9J6f1llRglzn3YKbQSvABRe/aCJyRPd+5Py4GNB7Al 313t2CBlw1UWtq08dtiz7yXUdjQ7THHVleQGrzBZq/gzsxHBtcNvQzYrs9jm96KzLsNj H4gM7PzU2JpswD+IchHEW2RCBD7xp1efRhiFhGN4SiiE5Er9mwxvwS3UP3AsZq2If8Ti eFLgp0z81EH6Bp+SH7rL//q95fVmS50sVYb11FN/BkdXVzmayQrdDDlrfWxtwZ5Utr3Y b0vS1HS1qfECfpXzrZJoKJ1nipLzWvupjGUmQu5HR7MDDmomSh4yoBOtBuC/HFuelBBt RHcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707913824; x=1708518624; 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=rHzLXnWMp/qb9CcigctaSxAY3LCDMp8XlWZr+kP58CI=; b=RZueRBLuxQDzeOc3hOnp4lKXrV4zE0C493eW7sJCZVcmFGJ6NRfMOI79jElVS8MnxV RjsPkJyiV4Vas4syb8YXO/DtZEZpK5dda2kWDzVnmPx+r4BDW38yROJDn4EsDfmKxOxp Rl5vSjEfee12836xDK0NoGEQtoDhuLbLNlU6XTFn5KSpUqmgR+rlQTjRgBoRxhXTJM1C qa9DW/JTDK5yjfQBowvrpIeBlD9yAOCQVLN3K/pcX2mnMG01t0XTkJ8qa626BzA3aKVT BKvTtJHHaKNlNLzyxbeKJRYgsJdE4rksi3JwB/XDba4Q3oTG7GlfAhe5hPuhBVYIupnI ZE6w== X-Gm-Message-State: AOJu0YwcspbhlbjEibsm9hZYsFTGNlOaNhAO6h+XFtkOSNG1CE8Hq7uI vKrJ5L/dFJFW9xlTDGaASxMRRxgN7CxOXFuA8HUU7OslaetHcleSBufbCiNrjhqrR4kiD4px7Iq /nK7It1P7y6O6Zc3mcHcn70xouHlyJOvcnJ8Lq9wSwj7z+0cTgEFprO/tgrqmx5lPkf1njQ7UWq Xh9356wm82AH1UudS/zivoQ9evCyWpTqGJRxj0aAW7 X-Google-Smtp-Source: AGHT+IGwIe3TfoPZ9LcNTq3vHt7jrxSYss7fxn7TyTNi5gPyP3/4y4rk9Myje4KgYAFM7hAi7zUiipYo X-Received: from palermo.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:118a]) (user=ardb job=sendgmr) by 2002:adf:9d92:0:b0:33c:da83:5332 with SMTP id p18-20020adf9d92000000b0033cda835332mr3410wre.0.1707913824354; Wed, 14 Feb 2024 04:30:24 -0800 (PST) Date: Wed, 14 Feb 2024 13:29:06 +0100 In-Reply-To: <20240214122845.2033971-45-ardb+git@google.com> Mime-Version: 1.0 References: <20240214122845.2033971-45-ardb+git@google.com> X-Developer-Key: i=ardb@kernel.org; a=openpgp; fpr=F43D03328115A198C90016883D200E9CA6329909 X-Developer-Signature: v=1; a=openpgp-sha256; l=5168; i=ardb@kernel.org; h=from:subject; bh=TV/DizsBLERKZQHsn8/eWrcp5wXP/p2+PhQIr/g3L9Y=; b=owGbwMvMwCFmkMcZplerG8N4Wi2JIfXMJpHnswt4Ojub/D9v/PjpYafE5hzedY0Wj6pmXKmXm Txz9tWHHaUsDGIcDLJiiiwCs/++23l6olSt8yxZmDmsTCBDGLg4BWAiPTMZ/ieu7kgqYKnuvMqQ wLl14rYEubYLYdLZxdm7y9IfXpRYc5Xhv6OlyvvrKiJrvAVCVcwbtrNNZdbP87zZKqdVeVeUySK AEwA= X-Mailer: git-send-email 2.43.0.687.g38aa6559b0-goog Message-ID: <20240214122845.2033971-65-ardb+git@google.com> Subject: [PATCH v8 20/43] 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-20240214_043027_175738_83E03EDD X-CRM114-Status: GOOD ( 18.98 ) 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