From patchwork Tue Mar 7 14:04:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 13163801 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 45BD1C678D4 for ; Tue, 7 Mar 2023 14:39:45 +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:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=+pqHTp0iCRYFlzhp0RliQjj7dWOq3NiWmM+dN0BMvEQ=; b=z9LAIF3+Nm3Itm Ij4SezwckfgS6nSE8hhCQEcU1mnEUyR8U4NlJk8kG5WyI/zCTx8xcdMtXazam4fHlD4kIvgeD+94j ClUopyYTnA+EJWKhWKKkuob5keO3npt1oxpznp25RrzCzQJK6XtOnW9ZAyxb6FC/Oswy39xv8Pw5w gpAp9MAr+RQlE5qGHLjf3FcwYGftU6UnhUl+Q/WeWFSVhjPz/0lhzuqL3o2EiYsiD1CFdiPgbmaLl z5Bvj8eMzFpAj1iKE83Z+08Q7Pgib+02Lj8P/0qkhrgRM6BoYnjnAZGx/suYppjrWdmisyAgXi4aC 2u5oPkL0T+VCEaQpI8Lg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pZYSZ-000rwn-HO; Tue, 07 Mar 2023 14:38:35 +0000 Received: from ams.source.kernel.org ([2604:1380:4601:e00::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pZXyv-000eXD-QT for linux-arm-kernel@lists.infradead.org; Tue, 07 Mar 2023 14:07:59 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 81465B818FA; Tue, 7 Mar 2023 14:07:56 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4A1C9C433A4; Tue, 7 Mar 2023 14:07:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1678198075; bh=fcy++RWuRbBBHw56QOT+oXIgL+AugLZxq+IvNCB50sk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hUzHbJjf7kiWWmaqsrzJIjXwiaG8HD504qAbcJqXcK3SWWQQxmDlHqAIcytgLAW40 sMRCt+PKe8J0HHpiGK98GdPjdByLrIscwhPG2PJye2lUYjEdADOZ4doOMUVc1w2VfF zt6fvfJ3QvtrKolEzUbx0QjVE6vL+32NhrmKy4xb2RKDCQ6b4oANRXdvbIW5Grik3D bf+gYK2IoGv1ZypSGeDo/wFSeW0HM8JCU/nLv/r7u54vHarO7cWdSt9O3gE8T1YVCM wSFSLhCSQk+u1Vdc2or8y0buQ3u3hfDl1MU9MtIyiNmob+PR3M4ReWTrPuCU7JDljG fvX1vLaYgBc2A== From: Ard Biesheuvel To: linux-kernel@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, Ard Biesheuvel , Catalin Marinas , Will Deacon , Marc Zyngier , Mark Rutland , Ryan Roberts , Anshuman Khandual , Kees Cook Subject: [PATCH v3 32/60] arm64: head: allocate more pages for the kernel mapping Date: Tue, 7 Mar 2023 15:04:54 +0100 Message-Id: <20230307140522.2311461-33-ardb@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230307140522.2311461-1-ardb@kernel.org> References: <20230307140522.2311461-1-ardb@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1825; i=ardb@kernel.org; h=from:subject; bh=fcy++RWuRbBBHw56QOT+oXIgL+AugLZxq+IvNCB50sk=; b=owGbwMvMwCFmkMcZplerG8N4Wi2JIYXdxf+jbe4jxmXOrYUVzf6Klzkn9cy+dCUs8Fz0DX/hv xdNHas6SlkYxDgYZMUUWQRm/3238/REqVrnWbIwc1iZQIYwcHEKwERm3mD4X+G0QT9N4bjxaTfb cxdXH/CbIy+ueSZ4s7gQm1LBrOYP0xkZti5JqlnnNfuFwKR9htP5pt23m7i4yU5C/uDxuQ2PRRN mMwAA X-Developer-Key: i=ardb@kernel.org; a=openpgp; fpr=F43D03328115A198C90016883D200E9CA6329909 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230307_060758_076503_B3A16457 X-CRM114-Status: GOOD ( 15.20 ) 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 In preparation for switching to an early kernel mapping routine that maps each segment according to its precise boundaries, and with the correct attributes, let's allocate some extra pages for page tables for the 4k page size configuration. This is necessary because the start and end of each segment may not be aligned to the block size, and so we'll need an extra page table at each segment boundary. Signed-off-by: Ard Biesheuvel --- arch/arm64/include/asm/kernel-pgtable.h | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/arch/arm64/include/asm/kernel-pgtable.h b/arch/arm64/include/asm/kernel-pgtable.h index 4d13c73171e1e360..50b5c145358a5d8e 100644 --- a/arch/arm64/include/asm/kernel-pgtable.h +++ b/arch/arm64/include/asm/kernel-pgtable.h @@ -80,7 +80,7 @@ + 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 INIT_DIR_SIZE (PAGE_SIZE * EARLY_PAGES(KIMAGE_VADDR, _end, EARLY_KASLR)) +#define INIT_DIR_SIZE (PAGE_SIZE * (EARLY_PAGES(KIMAGE_VADDR, _end, EARLY_KASLR) + EARLY_SEGMENT_EXTRA_PAGES)) /* the initial ID map may need two extra pages if it needs to be extended */ #if VA_BITS < 48 @@ -101,6 +101,15 @@ #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 + +#if SWAPPER_BLOCK_SIZE > SEGMENT_ALIGN +#define EARLY_SEGMENT_EXTRA_PAGES (KERNEL_SEGMENT_COUNT + 1) +#else +#define EARLY_SEGMENT_EXTRA_PAGES 0 +#endif + /* * Initial memory map attributes. */