Re: [RFC 01/17] x86/asm/64: Remove the restore_c_regs_and_iret label

From: Ingo Molnar
Date: Thu Sep 07 2017 - 05:49:24 EST



* Ingo Molnar <mingo@xxxxxxxxxx> wrote:

>
> * Borislav Petkov <bp@xxxxxxxxx> wrote:
>
> > On Wed, Sep 06, 2017 at 02:36:46PM -0700, Andy Lutomirski wrote:
> > > The only user was the 64-bit opportunistic SYSRET failure path, and
> > > that path didn't really need it. This change makes the
> > > opportunistic SYSRET code a bit more straightforward and gets rid of
> > > the label.
> > >
> > > Signed-off-by: Andy Lutomirski <luto@xxxxxxxxxx>
> > > ---
> > > arch/x86/entry/entry_64.S | 5 ++---
> > > 1 file changed, 2 insertions(+), 3 deletions(-)
> >
> > Btw, you need to refresh your stuff because of those UNWIND_HINT_EMPTY
> > things. I get:
> >
> > checking file arch/x86/entry/entry_64.S
> > Hunk #1 succeeded at 245 (offset 5 lines).
> > Hunk #2 FAILED at 308.
> > Hunk #3 succeeded at 637 (offset 88 lines).
> > 1 out of 3 hunks FAILED
> >
> > Otherwise
> >
> > Reviewed-by: Borislav Petkov <bp@xxxxxxx>
>
> I'd suggest tip:master or upstream 24e700e291d5 as a post-merge-window base for
> x86 bits.

Actually, scratch that, 1c9fe4409ce3 is probably the best base, it includes the
PCID fixes. Haven't had much time to test that base though.

Thanks,

Ingo