From: Ard Biesheuvel <ardb@kernel.org>
To: Borislav Petkov <bp@alien8.de>
Cc: Ard Biesheuvel <ardb+git@google.com>,
linux-kernel@vger.kernel.org,
Kevin Loughlin <kevinloughlin@google.com>,
Tom Lendacky <thomas.lendacky@amd.com>,
Dionna Glaze <dionnaglaze@google.com>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>,
Dave Hansen <dave.hansen@linux.intel.com>,
Andy Lutomirski <luto@kernel.org>, Arnd Bergmann <arnd@arndb.de>,
Nathan Chancellor <nathan@kernel.org>,
Nick Desaulniers <ndesaulniers@google.com>,
Justin Stitt <justinstitt@google.com>,
Kees Cook <keescook@chromium.org>,
Brian Gerst <brgerst@gmail.com>,
linux-arch@vger.kernel.org, llvm@lists.linux.dev
Subject: Re: [PATCH v3 03/19] x86/startup_64: Drop long return to initial_code pointer
Date: Wed, 31 Jan 2024 14:57:18 +0100 [thread overview]
Message-ID: <CAMj1kXF7T4morB+Z3BDy-UaeHoeU6fHtnaa-7HJY_NR3RVC5sg@mail.gmail.com> (raw)
In-Reply-To: <20240131134431.GJZbpOvz3Ibhg4VhCl@fat_crate.local>
On Wed, 31 Jan 2024 at 14:45, Borislav Petkov <bp@alien8.de> wrote:
>
> On Mon, Jan 29, 2024 at 07:05:06PM +0100, Ard Biesheuvel wrote:
> > From: Ard Biesheuvel <ardb@kernel.org>
> >
> > Since commit 866b556efa12 ("x86/head/64: Install startup GDT"), the
> > primary startup sequence sets the code segment register (CS) to __KERNEL_CS
> > before calling into the startup code shared between primary and
> > secondary boot.
> >
> > This means a simple indirect call is sufficient here.
> >
> > Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
> > ---
> > arch/x86/kernel/head_64.S | 35 ++------------------
> > 1 file changed, 3 insertions(+), 32 deletions(-)
> >
> > diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S
> > index d4918d03efb4..4017a49d7b76 100644
> > --- a/arch/x86/kernel/head_64.S
> > +++ b/arch/x86/kernel/head_64.S
> > @@ -428,39 +428,10 @@ SYM_INNER_LABEL(secondary_startup_64_no_verify, SYM_L_GLOBAL)
> > movq %r15, %rdi
> >
> > .Ljump_to_C_code:
> > - /*
> > - * Jump to run C code and to be on a real kernel address.
> > - * Since we are running on identity-mapped space we have to jump
> > - * to the full 64bit address, this is only possible as indirect
> > - * jump. In addition we need to ensure %cs is set so we make this
> > - * a far return.
> > - *
> > - * Note: do not change to far jump indirect with 64bit offset.
> > - *
> > - * AMD does not support far jump indirect with 64bit offset.
> > - * AMD64 Architecture Programmer's Manual, Volume 3: states only
> > - * JMP FAR mem16:16 FF /5 Far jump indirect,
> > - * with the target specified by a far pointer in memory.
> > - * JMP FAR mem16:32 FF /5 Far jump indirect,
> > - * with the target specified by a far pointer in memory.
> > - *
> > - * Intel64 does support 64bit offset.
> > - * Software Developer Manual Vol 2: states:
> > - * FF /5 JMP m16:16 Jump far, absolute indirect,
> > - * address given in m16:16
> > - * FF /5 JMP m16:32 Jump far, absolute indirect,
> > - * address given in m16:32.
> > - * REX.W + FF /5 JMP m16:64 Jump far, absolute indirect,
> > - * address given in m16:64.
> > - */
> > - pushq $.Lafter_lret # put return address on stack for unwinder
> > xorl %ebp, %ebp # clear frame pointer
> > - movq initial_code(%rip), %rax
> > - pushq $__KERNEL_CS # set correct cs
> > - pushq %rax # target address in negative space
> > - lretq
> > -.Lafter_lret:
> > - ANNOTATE_NOENDBR
> > + ANNOTATE_RETPOLINE_SAFE
> > + callq *initial_code(%rip)
> > + int3
> > SYM_CODE_END(secondary_startup_64)
> >
> > #include "verify_cpu.S"
>
> objtool doesn't like it yet:
>
> vmlinux.o: warning: objtool: verify_cpu+0x0: stack state mismatch: cfa1=4+8 cfa2=-1+0
>
> Once we've solved this, I'll take this one even now - very nice cleanup!
>
s/int3/RET seems to do the trick.
As long as there is an instruction that follows the callq, the
unwinder will see secondary_startup_64 at the base of the call stack.
We never return here anyway.
next prev parent reply other threads:[~2024-01-31 13:57 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-29 18:05 [PATCH v3 00/19] x86: Confine early 1:1 mapped startup code Ard Biesheuvel
2024-01-29 18:05 ` [PATCH v3 01/19] efi/libstub: Add generic support for parsing mem_encrypt= Ard Biesheuvel
2024-01-31 7:31 ` Borislav Petkov
2024-02-01 16:23 ` Kevin Loughlin
2024-02-01 16:28 ` Ard Biesheuvel
2024-01-29 18:05 ` [PATCH v3 02/19] x86/boot: Move mem_encrypt= parsing to the decompressor Ard Biesheuvel
2024-01-31 8:35 ` Borislav Petkov
2024-01-31 9:12 ` Ard Biesheuvel
2024-01-31 9:29 ` Borislav Petkov
2024-01-31 9:59 ` Ard Biesheuvel
2024-02-01 14:17 ` Tom Lendacky
2024-02-01 16:15 ` Ard Biesheuvel
2024-02-02 16:35 ` [PATCH] x86/Kconfig: Remove CONFIG_AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT Borislav Petkov
2024-02-02 16:47 ` Ard Biesheuvel
2024-02-03 10:50 ` [tip: x86/sev] " tip-bot2 for Borislav Petkov (AMD)
2024-01-29 18:05 ` [PATCH v3 03/19] x86/startup_64: Drop long return to initial_code pointer Ard Biesheuvel
2024-01-31 13:44 ` Borislav Petkov
2024-01-31 13:57 ` Ard Biesheuvel [this message]
2024-01-31 14:07 ` Ard Biesheuvel
2024-01-31 16:29 ` Borislav Petkov
2024-01-31 18:14 ` [tip: x86/boot] " tip-bot2 for Ard Biesheuvel
2024-01-29 18:05 ` [PATCH v3 04/19] x86/startup_64: Simplify calculation of initial page table address Ard Biesheuvel
2024-02-05 10:40 ` Borislav Petkov
2024-01-29 18:05 ` [PATCH v3 05/19] x86/startup_64: Simplify CR4 handling in startup code Ard Biesheuvel
2024-02-06 18:21 ` Borislav Petkov
2024-02-07 10:38 ` Ard Biesheuvel
2024-01-29 18:05 ` [PATCH v3 06/19] x86/startup_64: Drop global variables keeping track of LA57 state Ard Biesheuvel
2024-02-07 13:29 ` Borislav Petkov
2024-02-09 13:55 ` Ard Biesheuvel
2024-02-10 10:40 ` Borislav Petkov
2024-02-11 22:36 ` Ard Biesheuvel
2024-01-29 18:05 ` [PATCH v3 07/19] x86/startup_64: Simplify virtual switch on primary boot Ard Biesheuvel
2024-02-07 14:50 ` Borislav Petkov
2024-01-29 18:05 ` [PATCH v3 08/19] x86/head64: Replace pointer fixups with PIE codegen Ard Biesheuvel
2024-02-12 10:29 ` Borislav Petkov
2024-02-12 11:52 ` Ard Biesheuvel
2024-02-12 14:18 ` Borislav Petkov
2024-01-29 18:05 ` [PATCH v3 09/19] x86/head64: Simplify GDT/IDT initialization code Ard Biesheuvel
2024-02-12 14:37 ` Borislav Petkov
2024-02-12 15:23 ` Ard Biesheuvel
2024-01-29 18:05 ` [PATCH v3 10/19] asm-generic: Add special .pi.text section for position independent code Ard Biesheuvel
2024-01-29 18:05 ` [PATCH v3 11/19] x86: Move return_thunk to __pitext section Ard Biesheuvel
2024-01-29 18:05 ` [PATCH v3 12/19] x86/head64: Move early startup code into __pitext Ard Biesheuvel
2024-01-29 18:05 ` [PATCH v3 13/19] modpost: Warn about calls from __pitext into other text sections Ard Biesheuvel
2024-01-29 18:05 ` [PATCH v3 14/19] x86/coco: Make cc_set_mask() static inline Ard Biesheuvel
2024-01-30 23:16 ` Kevin Loughlin
2024-01-30 23:36 ` Ard Biesheuvel
2024-01-29 18:05 ` [PATCH v3 15/19] x86/sev: Make all code reachable from 1:1 mapping __pitext Ard Biesheuvel
2024-01-29 18:05 ` [PATCH v3 16/19] x86/sev: Avoid WARN() in early code Ard Biesheuvel
2024-01-29 18:05 ` [PATCH v3 17/19] x86/sev: Use PIC codegen for early SEV startup code Ard Biesheuvel
2024-01-29 18:05 ` [PATCH v3 18/19] x86/sev: Drop inline asm LEA instructions for RIP-relative references Ard Biesheuvel
2024-01-29 18:05 ` [PATCH v3 19/19] x86/startup_64: Don't bother setting up GS before the kernel is mapped Ard Biesheuvel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAMj1kXF7T4morB+Z3BDy-UaeHoeU6fHtnaa-7HJY_NR3RVC5sg@mail.gmail.com \
--to=ardb@kernel.org \
--cc=ardb+git@google.com \
--cc=arnd@arndb.de \
--cc=bp@alien8.de \
--cc=brgerst@gmail.com \
--cc=dave.hansen@linux.intel.com \
--cc=dionnaglaze@google.com \
--cc=justinstitt@google.com \
--cc=keescook@chromium.org \
--cc=kevinloughlin@google.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=llvm@lists.linux.dev \
--cc=luto@kernel.org \
--cc=mingo@redhat.com \
--cc=nathan@kernel.org \
--cc=ndesaulniers@google.com \
--cc=tglx@linutronix.de \
--cc=thomas.lendacky@amd.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).