From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-yb1-f201.google.com (mail-yb1-f201.google.com [209.85.219.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5EB5252F7B for ; Tue, 13 Feb 2024 12:42:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707828138; cv=none; b=HpDFkgI54yR8ap54kEUJGil9Ol+9e1qz+Ti4PCFDx30lyIImKEOwCez2szaYqjP611HGLM0vtkmBcoKy4juSx6q3vK77zVqX3swpobVL0CfZFJS210bN6qzBz2J1cWbWJSK+Pa6taURfgf3rbi/VhSOjDdZvYt2JAgftwkWKQ74= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707828138; c=relaxed/simple; bh=V43RwcksINAVGLrcC9zNozM9sOBz5XCNbWyT4FUAcEc=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=Haw2Z0gHxWYmtl38lFbcLKkUNAliDFslA83AF/9iXs+fILKloYWMk9+dbmikjK9Q/yv112f6od7xpTdEMicR7TkKij6AXlBnloT9FhLDfL0/P4dRjWbsQpuXnwQEf8+LfYC8j4o+qbHV3c1gALcyPWGT45ZSo6uDbG/TrRqUn4s= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--ardb.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=dtiJbsDY; arc=none smtp.client-ip=209.85.219.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--ardb.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="dtiJbsDY" Received: by mail-yb1-f201.google.com with SMTP id 3f1490d57ef6-dcc73148612so1072497276.1 for ; Tue, 13 Feb 2024 04:42:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1707828135; x=1708432935; darn=lists.linux.dev; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=l9PGLkbb8+qoug2ZrrnwKu6zhcSycBxmHA7JvTLYhJc=; b=dtiJbsDYoozdu6JcnkKF3/6yTEm25b2mEIIGw2eFQamO95OeezQEmUmbkmrgXFslFc xYeIYlFn6HJZ3B5sjomk3J7ytSmy3ZuUhE+JVFNr5XXZ+x+v9+KQiy6Ko6EuglGaKc9D 4aVG3q0mdiP7fSU+EBXIamkIRy4lRIms3kWAtIGr2JrhJDubs/NFNx8+mbs3MjiAHqw8 9tFpyK080eXYcdfb1CiBLqBp4555BYonYxDH1RxflCcHZMKjA7oGoM3BNFSxGnckgvTf 1GqC/QZdIja8o0dHHYncwzD+ofir4ndwb150/yKh+VDnurU8wD6OqVDV+Rw7yDwaEvZ/ 9bow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707828135; x=1708432935; 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=l9PGLkbb8+qoug2ZrrnwKu6zhcSycBxmHA7JvTLYhJc=; b=xJG7s6C2Xcucr0TiiGk3kof/p4jIhw3TQ817GWHNYc0uhYQwzf+lgq1b+oVEjCz3rU fnSM515OYWHz1tX3wHqfxppv+H85AuV+kAD253Uo9fRtJuaEu3iqT8ffBw3vNwckyynW 9TTSaTztR2H+rUPKDg+2MhWelYR0Sj/nw9Tpob9MCzgoRdc9p7b7VIbFeaO/cY1EAtwW REke0HInL37v7Kv8zSeVpn0RTQD4ZhptcljX944LaNS2TrikiGav9DI+31gaStahohg/ Qh8MXwBxJlNlz2VrxwZs6clkolXcW9GrNcfNlU4k2XUrSe2occl6SWqUdJeQi2JZSQRz VYvQ== X-Forwarded-Encrypted: i=1; AJvYcCXkA5Hziy3zRBnLyN5xaR+jc6JiXr7EN8b2k2lCM4mZ0qmN6Lm+36tpXcZoZoFcAZLORLS63iTh1rAFRucgmkq8t4esPQ== X-Gm-Message-State: AOJu0Yw6pmcxpN6jrxSZdLIqDQ0RHdBKgV3S62zPe3hv5UHN+U+fYx89 SgC+a7PfECYShMiWr+g9evvfpgl6F2H/htU7M9WP+MNvvtwWp6MobF1TlL5bKRMyPxx31g== X-Google-Smtp-Source: AGHT+IGjASN7m5SPQBlNVx8g7TNhkNeiu4Ck9pU388+ZGMgbalmk2tWU7OABlbaYA4+Y9UUbzFj+uv94 X-Received: from palermo.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:118a]) (user=ardb job=sendgmr) by 2002:a25:c702:0:b0:dcc:9f24:692b with SMTP id w2-20020a25c702000000b00dcc9f24692bmr44649ybe.13.1707828135418; Tue, 13 Feb 2024 04:42:15 -0800 (PST) Date: Tue, 13 Feb 2024 13:41:50 +0100 In-Reply-To: <20240213124143.1484862-13-ardb+git@google.com> Precedence: bulk X-Mailing-List: llvm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240213124143.1484862-13-ardb+git@google.com> X-Developer-Key: i=ardb@kernel.org; a=openpgp; fpr=F43D03328115A198C90016883D200E9CA6329909 X-Developer-Signature: v=1; a=openpgp-sha256; l=3664; i=ardb@kernel.org; h=from:subject; bh=CIHrtmfTIHf1nWX5y4HvnUdj+zcQXCO5URm4j2f8Yss=; b=owGbwMvMwCFmkMcZplerG8N4Wi2JIfV0cl/Gzc7Pj0827Z2x7tTrdlcrJTWWepkfL7+1Tvbfv L0+de/ajlIWBjEOBlkxRRaB2X/f7Tw9UarWeZYszBxWJpAhDFycAjCRZENGhp1XJhx+OvtJ0OQd t66/4Tg4Z981saPGcaoTv3fmC4oZKr1gZNjyhGdrtnH11bPX511KKZxqfenAYamIjWsevWM+0XN NcyYnAA== X-Mailer: git-send-email 2.43.0.687.g38aa6559b0-goog Message-ID: <20240213124143.1484862-19-ardb+git@google.com> Subject: [PATCH v4 06/11] x86/startup_64: Simplify virtual switch on primary boot From: Ard Biesheuvel To: linux-kernel@vger.kernel.org Cc: Ard Biesheuvel , Kevin Loughlin , Tom Lendacky , Dionna Glaze , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , Andy Lutomirski , Arnd Bergmann , Nathan Chancellor , Nick Desaulniers , Justin Stitt , Kees Cook , Brian Gerst , linux-arch@vger.kernel.org, llvm@lists.linux.dev Content-Type: text/plain; charset="UTF-8" From: Ard Biesheuvel The secondary startup code is used on the primary boot path as well, but in this case, the initial part runs from a 1:1 mapping, until an explicit cross-jump is made to the kernel virtual mapping of the same code. On the secondary boot path, this jump is pointless as the code already executes from the mapping targeted by the jump. So combine this cross-jump with the jump from startup_64() into the common boot path. This simplifies the execution flow, and clearly separates code that runs from a 1:1 mapping from code that runs from the kernel virtual mapping. Note that this requires a page table switch, so hoist the CR3 assignment into startup_64() as well. And since absolute symbol references will no longer be permitted in .head.text once we enable the associated build time checks, a RIP-relative memory operand is used in the JMP instruction, referring to an absolute constant in the .init.rodata section. Given that the secondary startup code does not require a special placement inside the executable, move it to the .noinstr.text section. Signed-off-by: Ard Biesheuvel --- arch/x86/kernel/head_64.S | 42 ++++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S index 6dcc2f7f4108..3fed0aafcb41 100644 --- a/arch/x86/kernel/head_64.S +++ b/arch/x86/kernel/head_64.S @@ -39,7 +39,6 @@ L4_START_KERNEL = l4_index(__START_KERNEL_map) L3_START_KERNEL = pud_index(__START_KERNEL_map) - .text __HEAD .code64 SYM_CODE_START_NOALIGN(startup_64) @@ -126,9 +125,21 @@ SYM_CODE_START_NOALIGN(startup_64) call sev_verify_cbit #endif - jmp 1f + /* + * Switch to early_top_pgt which still has the identity mappings + * present. + */ + movq %rax, %cr3 + + /* Branch to the common startup code at its kernel virtual address */ + ANNOTATE_RETPOLINE_SAFE + jmp *0f(%rip) SYM_CODE_END(startup_64) + __INITRODATA +0: .quad common_startup_64 + + .section .noinstr.text, "ax" SYM_CODE_START(secondary_startup_64) UNWIND_HINT_END_OF_STACK ANNOTATE_NOENDBR @@ -174,8 +185,15 @@ SYM_INNER_LABEL(secondary_startup_64_no_verify, SYM_L_GLOBAL) #ifdef CONFIG_AMD_MEM_ENCRYPT addq sme_me_mask(%rip), %rax #endif + /* + * Switch to the init_top_pgt here, away from the trampoline_pgd and + * unmap the identity mapped ranges. + */ + movq %rax, %cr3 -1: +SYM_INNER_LABEL(common_startup_64, SYM_L_LOCAL) + UNWIND_HINT_END_OF_STACK + ANNOTATE_NOENDBR /* Create a mask of CR4 bits to preserve */ movl $(X86_CR4_PAE | X86_CR4_LA57), %edx @@ -194,16 +212,6 @@ SYM_INNER_LABEL(secondary_startup_64_no_verify, SYM_L_GLOBAL) btsl $X86_CR4_PSE_BIT, %ecx movq %rcx, %cr4 - /* - * Switch to new page-table - * - * For the boot CPU this switches to early_top_pgt which still has the - * identity mappings present. The secondary CPUs will switch to the - * init_top_pgt here, away from the trampoline_pgd and unmap the - * identity mapped ranges. - */ - movq %rax, %cr3 - /* * Do a global TLB flush after the CR3 switch to make sure the TLB * entries from the identity mapping are flushed. @@ -211,14 +219,6 @@ SYM_INNER_LABEL(secondary_startup_64_no_verify, SYM_L_GLOBAL) btsl $X86_CR4_PGE_BIT, %ecx movq %rcx, %cr4 - /* Ensure I am executing from virtual addresses */ - movq $1f, %rax - ANNOTATE_RETPOLINE_SAFE - jmp *%rax -1: - UNWIND_HINT_END_OF_STACK - ANNOTATE_NOENDBR // above - #ifdef CONFIG_SMP /* * For parallel boot, the APIC ID is read from the APIC, and then -- 2.43.0.687.g38aa6559b0-goog