From mboxrd@z Thu Jan 1 00:00:00 1970 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 F104BC07CB1 for ; Wed, 29 Nov 2023 12:31:42 +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=KQa/ljbJ48ppHIMthzqbM3RhLhiBc0c5h3xfDRWz8Qs=; b=kBdvwU3TF+RUiVtFonDUPK3W0A M4nbrc24qqTVhq/sfhQ0/6I9pd9e62FUtvQrE3K3l0mKRMeagZ3J5sJJURqQz3lWHfUi1hVePaiBx aeA6Ddvg6ZlbihPeeLFUOfoMV5xcbGJgxAomArPba6gIe+AbXf1JC/3VJoe/VRblwSi7z35F+POk/ Jx8tU+L65IEBZKM/3xqnYHhKqzJr2m+/jbRgBLpKry9uFmo13i++DH486Xt7TOeeu1/m3vWIp2c1u b9wJCdN74qR/ikubrH/4tvZcZZ3VdoSAYl4BO3SX9AHrYnU8UaT4yGkwK6/GP1PbKnNNjs1fkT2ip LIyqoiNA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1r8Jim-008KK5-0s; Wed, 29 Nov 2023 12:31:16 +0000 Received: from mail-yw1-x1149.google.com ([2607:f8b0:4864:20::1149]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1r8Ia2-007zd8-0N for linux-arm-kernel@lists.infradead.org; Wed, 29 Nov 2023 11:18:17 +0000 Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-5cd2100f467so87492217b3.1 for ; Wed, 29 Nov 2023 03:18:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1701256689; x=1701861489; 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=zO78n1C+IUUd4qQDduar+mDDdO70FT4CA4aVaSqaf3o=; b=mAISG6FsQtLgV/hkszmF64O7wVSCixNmSACw6A59ERzmk95oLhBAHoEDiPtN6UHkWy Dx2rQvE/FEc6i7ujoQ3KAAohEA7eMXTZ8u8xklHgg5Px8AWXLZxBQlg9fx1vkmg8kYes dWZ7txA/wO9Ipfo8ROkUlyySNOyk+LWfbd3M4D958h6bMhmlHLSlSohmUqwiCChm/xZE ZQ89aOFhndTSwYQxajrCSMJWqsadjoinkm8yCljJBnSolCb8AMMLgp6RZY6kGs+vDRbt IfsZ8Ax8ZRBK1lEPtejhVBCQ497SP9EmC1zLgvRS7hhDb6kwJN5wUvWwgjjgS9BZwmIz s5Xg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701256689; x=1701861489; 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=zO78n1C+IUUd4qQDduar+mDDdO70FT4CA4aVaSqaf3o=; b=tUFo9dz+Cw2aFLg2n6SDqcRaFVrzOLyvenQ8tVqfsjQ36BLC/n/XzY2uNJLaj9HYNV Cbpf6ucH7ehaIIlZniRqH/xIrcvE5vBr9JOR4qcQlnE5FU+56NwFcNd8L4w7fixHH79s bmfAoFCiKiFtQcRCTm/YVZ+tQfRTp4jya+3zikf8NnCcHkX5vo8dZzm0NXzhZNAR9whG Z/ekAzdBgYVGTkQ1XbjNgGE+U3z96LHoikAWjQUA6lujX7EMfKyEZEOTkGZ+6o/XvTaD 2shBiMfmXlpWFPuspi0Kxz7Cio/hIr7nWWZbGDEsEnuAglEC0iv4gKYFUj40BQKDSuGa HU3g== X-Gm-Message-State: AOJu0Yw74VLcuxGzxeyWtKGrLXhOX+NpnMzRtiV0sx0yah+gZo2oOjdy FzwN6qU9RqFBXyNe3snilDxY3RzomhBOPNQUbXmOHWyrHOd6YpkLNb0YWu9JgXQKlcNJdD3TS3S U+ehiSQ12ko3Ppv14LJ1ZZGa8k5p6uPenoret6QtpF1PUJOl7LFLz5N7ZQkHmDwJ2QEbpDFVtPT M= X-Google-Smtp-Source: AGHT+IGFPadz6MH05et4BIFs550wiCDinfCHp6+3nT9j4xdoitrM8aWgYbctRehDLV1Bg8bidfUYqKbL X-Received: from palermo.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:118a]) (user=ardb job=sendgmr) by 2002:a05:690c:844:b0:5cd:c47d:d89e with SMTP id bz4-20020a05690c084400b005cdc47dd89emr521871ywb.1.1701256688378; Wed, 29 Nov 2023 03:18:08 -0800 (PST) Date: Wed, 29 Nov 2023 12:16:19 +0100 In-Reply-To: <20231129111555.3594833-43-ardb@google.com> Mime-Version: 1.0 References: <20231129111555.3594833-43-ardb@google.com> X-Developer-Key: i=ardb@kernel.org; a=openpgp; fpr=F43D03328115A198C90016883D200E9CA6329909 X-Developer-Signature: v=1; a=openpgp-sha256; l=3393; i=ardb@kernel.org; h=from:subject; bh=nYRIcwIYlsV304zLeGlXyA6jIf75Zhb+sT/wec3N1GQ=; b=owGbwMvMwCFmkMcZplerG8N4Wi2JITVdto2fbcOUV+skt3O8293ufaNIrmj/mc9Hv+QZiN3eK jDl8+LojlIWBjEOBlkxRRaB2X/f7Tw9UarWeZYszBxWJpAhDFycAjCRijqG/wGcNg/ly2+sD1rG kfbU7Pz7A7vfTQ0469G8+qmQRPqcp+IM/5NNivuu+G1njwp0q+Su15XcyWI5j/2z8s71109rh8g 8YQEA X-Mailer: git-send-email 2.43.0.rc1.413.gea7ed67945-goog Message-ID: <20231129111555.3594833-66-ardb@google.com> Subject: [PATCH v6 23/41] 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-20231129_031810_174126_958FA2C7 X-CRM114-Status: GOOD ( 15.72 ) 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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 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 = .; -- 2.43.0.rc1.413.gea7ed67945-goog _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel