On Mon, Sep 14, 2020 at 10:37:25PM +0200, Uros Bizjak wrote: > On Mon, Sep 14, 2020 at 9:56 PM Sean Christopherson > <sean.j.christopherson@xxxxxxxxx> wrote: > > > > Move the asm blob that invokes the appropriate IRQ handler after VM-Exit > > into a proper subroutine. Slightly rework the blob so that it plays > > nice with objtool without any additional hints (existing hints aren't > > able to handle returning with a seemingly modified stack size). > > > > Suggested-by: Josh Poimboeuf <jpoimboe@xxxxxxxxxx> > > Cc: Uros Bizjak <ubizjak@xxxxxxxxx> > > Signed-off-by: Sean Christopherson <sean.j.christopherson@xxxxxxxxx> > > --- > > arch/x86/kvm/vmx/vmenter.S | 28 ++++++++++++++++++++++++++++ > > arch/x86/kvm/vmx/vmx.c | 33 +++------------------------------ > > 2 files changed, 31 insertions(+), 30 deletions(-) > > > > diff --git a/arch/x86/kvm/vmx/vmenter.S b/arch/x86/kvm/vmx/vmenter.S > > index 799db084a336..baec1e0fefc5 100644 > > --- a/arch/x86/kvm/vmx/vmenter.S > > +++ b/arch/x86/kvm/vmx/vmenter.S > > @@ -4,6 +4,7 @@ > > #include <asm/bitsperlong.h> > > #include <asm/kvm_vcpu_regs.h> > > #include <asm/nospec-branch.h> > > +#include <asm/segment.h> > > > > #define WORD_SIZE (BITS_PER_LONG / 8) > > > > @@ -294,3 +295,30 @@ SYM_FUNC_START(vmread_error_trampoline) > > > > ret > > SYM_FUNC_END(vmread_error_trampoline) > > + > > +SYM_FUNC_START(vmx_do_interrupt_nmi_irqoff) > > + /* > > + * Unconditionally create a stack frame. RSP needs to be aligned for > > + * x86-64, getting the correct RSP on the stack (for x86-64) would take > > + * two instructions anyways, and it helps make objtool happy (see below). > > + */ > > + push %_ASM_BP > > + mov %rsp, %_ASM_BP > > _ASM_SP instead of %rsp to avoid assembly failure for 32bit targets. *sigh* Thanks! I'll build i386 this time...
