From patchwork Tue Jan 23 14:53:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 13527722 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 00755C47DDF for ; Tue, 23 Jan 2024 16:01:08 +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=N2xbvML27RG2Z3raVSmHZUiduCtNnLKb2DJ8JYr8z+4=; b=2JYlvAbK0CgMXslJak9qPMqlV/ yybAYEDJQcdh4RFcVQxEYJVhi6xdYEkzBVTNMiW+UzNkVc1PbiRF//PlEFwLX33OEJ8OYQ4HHoNcf TRTQkEz9EoMwAvvf9ZNEFjGfa0DfS5PVjhqSjU9YxoQrS/fC3R31aRJnHl9M37bQ96mUyzJDzCM7V OSh19QlUHC+ApIxs3efk8TBFNEtKJa6+Kq1RZ95qpO/kf9UzRUpHRvn1BkZp4uvkxzxGiIYSKNavl ffMYlUuFQ0x/BcwbiZycEXEWAhp4hUIKR0DuC5N0DphnhK7LPpGqnh+BTvRtkd7m9IxnKGbZlnbsR 4kDsDItg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rSJCR-00HArF-0i; Tue, 23 Jan 2024 16:00:31 +0000 Received: from mail-yb1-xb49.google.com ([2607:f8b0:4864:20::b49]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rSIAv-00Gtm5-13 for linux-arm-kernel@lists.infradead.org; Tue, 23 Jan 2024 14:55:02 +0000 Received: by mail-yb1-xb49.google.com with SMTP id 3f1490d57ef6-dc26605c3aaso5339006276.0 for ; Tue, 23 Jan 2024 06:54:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1706021692; x=1706626492; 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=ZXAZZP0VPvaQerv7KCHEBp12Yb5fRWF0OZVW+VVhVrM=; b=tHYQ/bQte5p4JEfs0S/HLqQkoTJQdJX2Rn/8qQY4KpGL9B1dHmMv+EN0WlooSw9efY 3PPbqQ4cHoNd5ly/jnzsKiieHYm0kyT6Jm0//iRaFyN5BdJaWVQVkK8/nw4UloSYnDmr mz+pgW1PfQlU7P2R4wh+HJseAk+teOIwHMajc9NaEYlbRxnGWV28nGDwpqq6cSJW/Ki9 IjSf3PYnKq5BpXH3k6uDI6e1IR30saB6TtQrUlkvEqdQw7locT+D6YqJnXx69MYunZ8Q PcI0HHwFKsaWRJM/Ka0IAxJwe2wKq3ulo8uT4yZmzS/nw0l5FwTY8+NJmIvCrJuT/lV/ ihvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706021692; x=1706626492; 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=ZXAZZP0VPvaQerv7KCHEBp12Yb5fRWF0OZVW+VVhVrM=; b=RT2Ancm9owJZsVHVJN3vle/HLu5jNSIAExOWgIlSKGFft29OUYlmpGGirjO/S5DPW/ sHavL2rbOmnsPZhM2v4M3lZl2eaQBbBLU+IFanEKuR2UnhmKpkeR66EknxKvSEeiJYC3 ZHu2UhO9YuOiA3ENO1L5GRat8rBvuI8nnaMBSWF6DM1vH2pKWBFbuO+hqiKbdDOd5CQg 6vBmIEQtIUTyWdTH7hlGiuYyB7F5Px7yP+g8n06W4WZpYpSJdi6FfmCMT2O5/1G8fNd5 /Zz9Pn3wrcBp0xdm1an3fDiUrFZwY2ciq0X3sMbrMx1UxB+m/+gF4K7aWTcsAcTWL0xf UeQw== X-Gm-Message-State: AOJu0YxRuL9eA2c+NVlw5HWXYZUPXPm5iKC7yFEtdEd58orejZeP17F/ GwCxKHkaUv+0/j1kVi/3i+doSJ/PW+5B8UqXH2xNB00Jmy7lQPOVek3wm7b7aNkLs7Y4jPWGnF6 Vv50LwbQNehIyWTdBcjOPTI0mz5UB7vTt4YFc58qZZmohcKTsULqOILYxSHccfoHkuDIGVDgPYu 2MOpBCMHV7QFiroCCEtBXi3sr3MmxlqjAte6j0eggn X-Google-Smtp-Source: AGHT+IF4w5lRpARpQGQ27GqnkxdobUxYqxFQSiQrx++5yB5uplTXFLUaNWRtE0oTohZTnhEn+UIYl6Rn X-Received: from palermo.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:118a]) (user=ardb job=sendgmr) by 2002:a05:6902:1a47:b0:dc2:65f1:57e0 with SMTP id cy7-20020a0569021a4700b00dc265f157e0mr417536ybb.8.1706021691770; Tue, 23 Jan 2024 06:54:51 -0800 (PST) Date: Tue, 23 Jan 2024 15:53:12 +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=3389; i=ardb@kernel.org; h=from:subject; bh=/tshOW2txPHrwVcGFKbXruO3ZYyYRxtzskBM1EnORU0=; b=owGbwMvMwCFmkMcZplerG8N4Wi2JIXX9pZtyx4rVRLZUGeQGXLSU+1DlanP+2b4ey2MPNl//+ n6e0ifWjlIWBjEOBlkxRRaB2X/f7Tw9UarWeZYszBxWJpAhDFycAjCRZbUM/93Tl8wMf+Pq/vRa W9S/xbJs8r1NTd7vrPL0mLjyLe8y7mJkOJIo9Z2pI9c44dzkW5NfFdso3Djw5FqrhOOTmMw5s/T /swMA X-Mailer: git-send-email 2.43.0.429.g432eaa2c6b-goog Message-ID: <20240123145258.1462979-65-ardb+git@google.com> Subject: [PATCH v7 13/50] arm64: head: Clear BSS and the kernel page tables in one go 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_065453_389607_706936E4 X-CRM114-Status: GOOD ( 15.57 ) 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 We will move the CPU feature overrides into BSS in a subsequent patch, and this requires that BSS is zeroed before the feature override detection code runs. So let's map BSS read-write in the ID map, and zero it via this mapping. Since the kernel page tables are right next to it, and also zeroed via the ID map, let's drop the separate clear_page_tables() function, and just zero everything in one go. Signed-off-by: Ard Biesheuvel --- arch/arm64/kernel/head.S | 33 +++++++------------- arch/arm64/kernel/vmlinux.lds.S | 3 ++ 2 files changed, 14 insertions(+), 22 deletions(-) diff --git a/arch/arm64/kernel/head.S b/arch/arm64/kernel/head.S index ca5e5fbefcd3..2af518161f3a 100644 --- a/arch/arm64/kernel/head.S +++ b/arch/arm64/kernel/head.S @@ -177,17 +177,6 @@ SYM_CODE_START_LOCAL(preserve_boot_args) ret SYM_CODE_END(preserve_boot_args) -SYM_FUNC_START_LOCAL(clear_page_tables) - /* - * Clear the init page tables. - */ - adrp x0, init_pg_dir - adrp x1, init_pg_end - sub x2, x1, x0 - mov x1, xzr - b __pi_memset // tail call -SYM_FUNC_END(clear_page_tables) - /* * Macro to populate page table entries, these entries can be pointers to the next level * or last level entries pointing to physical memory. @@ -386,9 +375,9 @@ SYM_FUNC_START_LOCAL(create_idmap) map_memory x0, x1, x3, x6, x7, x3, IDMAP_PGD_ORDER, x10, x11, x12, x13, x14, EXTRA_SHIFT - /* Remap the kernel page tables r/w in the ID map */ + /* Remap BSS and the kernel page tables r/w in the ID map */ adrp x1, _text - adrp x2, init_pg_dir + adrp x2, __bss_start adrp x3, _end bic x4, x2, #SWAPPER_BLOCK_SIZE - 1 mov_q x5, SWAPPER_RW_MMUFLAGS @@ -489,14 +478,6 @@ SYM_FUNC_START_LOCAL(__primary_switched) mov x0, x20 bl set_cpu_boot_mode_flag - // Clear BSS - adr_l x0, __bss_start - mov x1, xzr - adr_l x2, __bss_stop - sub x2, x2, x0 - bl __pi_memset - dsb ishst // Make zero page visible to PTW - #if VA_BITS > 48 adr_l x8, vabits_actual // Set this early so KASAN early init str x25, [x8] // ... observes the correct value @@ -782,6 +763,15 @@ SYM_FUNC_START_LOCAL(__primary_switch) adrp x1, reserved_pg_dir adrp x2, init_idmap_pg_dir bl __enable_mmu + + // Clear BSS + adrp x0, __bss_start + mov x1, xzr + adrp x2, init_pg_end + sub x2, x2, x0 + bl __pi_memset + dsb ishst // Make zero page visible to PTW + #ifdef CONFIG_RELOCATABLE adrp x23, KERNEL_START and x23, x23, MIN_KIMG_ALIGN - 1 @@ -796,7 +786,6 @@ SYM_FUNC_START_LOCAL(__primary_switch) orr x23, x23, x0 // record kernel offset #endif #endif - bl clear_page_tables bl create_kernel_mapping adrp x1, init_pg_dir diff --git a/arch/arm64/kernel/vmlinux.lds.S b/arch/arm64/kernel/vmlinux.lds.S index 8dd5dda66f7c..8a3c6aacc355 100644 --- a/arch/arm64/kernel/vmlinux.lds.S +++ b/arch/arm64/kernel/vmlinux.lds.S @@ -311,12 +311,15 @@ SECTIONS __pecoff_data_rawsize = ABSOLUTE(. - __initdata_begin); _edata = .; + /* start of zero-init region */ BSS_SECTION(SBSS_ALIGN, 0, 0) . = ALIGN(PAGE_SIZE); init_pg_dir = .; . += INIT_DIR_SIZE; init_pg_end = .; + /* end of zero-init region */ + #ifdef CONFIG_RELOCATABLE . += SZ_4K; /* stack for the early relocation code */ early_init_stack = .;