KVM: VMX: Fold __vmx_vcpu_run() into vmx_vcpu_run()
PATCH 1/1 KVM: VMX: Fold __vmx_vcpu_run() into vmx_vcpu_run()
cea15c2 ("KVM: Move KVM context switch into own function") split vmx_vcpu_run() to prevent multiple copies of the context switch from being generated (causing problems due to a label). This patch folds them back together again and adds the __noclone attribute to prevent the label from being duplicated.
--- arch/x86/kvm/vmx.c | 63 ++++++++++++++++++++------------------------------- 1 files changed, 25 insertions(+), 38 deletions(-)
arch/x86/kvm/vmx.c +25 -38
@@ -3902,17 +3902,33 @@ static void vmx_cancel_injection(struct kvm_vcpu *vcpu)#define Q "l"#endif -/* -* We put this into a separate noinline function to prevent the compiler -* from duplicating the code. This is needed because this code -* uses non local labels that cannot be duplicated. -* Do not put any flow control into this function. -* Better would be to put this whole monstrosity into a .S file. -*/ -static void noinline do_vmx_vcpu_run(struct kvm_vcpu *vcpu) +static void vmx_vcpu_run (struct kvm_vcpu *vcpu) {struct vcpu_vmx *vmx =to_vmx (vcpu); - asmvolatile ( + +/* Record the guest's net vcpu time for enforced NMI injections. */ +if (unlikely (!cpu_has_virtual_nmis () && vmx->soft_vnmi_blocked)) + vmx->entry_time =ktime_get (); + +/* Don't enter VMX if guest state is invalid, let the exit handler +start emulation until we arrive back to a valid state */ +if (vmx->emulation_required && emulate_invalid_guest_state) +return ; + +if (test_bit (VCPU_REGS_RSP , (unsigned long *)&vcpu->arch.regs_dirty)) +vmcs_writel (GUEST_RSP , vcpu->arch.regs[VCPU_REGS_RSP ]); +if (test_bit (VCPU_REGS_RIP , (unsigned long *)&vcpu->arch.regs_dirty)) +vmcs_writel (GUEST_RIP , vcpu->arch.regs[VCPU_REGS_RIP ]); + +/* When single-stepping over STI and MOV SS, we must clear the +* corresponding interruptibility bits in the guest state. Otherwise +* vmentry fails as it then expects bit 14 (BS) in pending debug +* exceptions being set, but that's not correct for the guest debugging +* case. */ +if (vcpu->guest_debug &KVM_GUESTDBG_SINGLESTEP ) +vmx_set_interrupt_shadow (vcpu,0 ); + + asm(/* Store host registers */ "push %%" R "dx; push %%" R "bp;" "push %%"R"cx \n\t"
@@ -4007,35 +4023,6 @@ static void noinline do_vmx_vcpu_run(struct kvm_vcpu *vcpu) , "r8", "r9", "r10", "r11", "r12", "r13", "r14", "r15" #endif ); -} - -static void vmx_vcpu_run (struct kvm_vcpu *vcpu) -{ -struct vcpu_vmx *vmx =to_vmx (vcpu); - -/* Record the guest's net vcpu time for enforced NMI injections. */ -if (unlikely (!cpu_has_virtual_nmis () && vmx->soft_vnmi_blocked)) - vmx->entry_time =ktime_get (); - -/* Don't enter VMX if guest state is invalid, let the exit handler -start emulation until we arrive back to a valid state */ -if (vmx->emulation_required && emulate_invalid_guest_state) -return ; - -if (test_bit (VCPU_REGS_RSP , (unsigned long *)&vcpu->arch.regs_dirty)) -vmcs_writel (GUEST_RSP , vcpu->arch.regs[VCPU_REGS_RSP ]); -if (test_bit (VCPU_REGS_RIP , (unsigned long *)&vcpu->arch.regs_dirty)) -vmcs_writel (GUEST_RIP , vcpu->arch.regs[VCPU_REGS_RIP ]); - -/* When single-stepping over STI and MOV SS, we must clear the -* corresponding interruptibility bits in the guest state. Otherwise -* vmentry fails as it then expects bit 14 (BS) in pending debug -* exceptions being set, but that's not correct for the guest debugging -* case. */ -if (vcpu->guest_debug &KVM_GUESTDBG_SINGLESTEP ) -vmx_set_interrupt_shadow (vcpu,0 ); - -do_vmx_vcpu_run (vcpu); vcpu->arch.regs_avail = ~((1 <<VCPU_REGS_RIP ) | (1 <<VCPU_REGS_RSP ) | (1 <<VCPU_EXREG_PDPTR ));
Signature · 1 line
1.7.3.1
Quoted 4 lines · Avi Kivity
cea15c2 ("KVM: Move KVM context switch into own function") split
vmx_vcpu_run()to prevent multiple copies of the context switch from being generated (causing problems due to a label). This patch folds them back together again and adds the__nocloneattribute to prevent the label from being duplicated.
That won't work on gcc versions that didn't have __noclone yet. Noclone is fairly recent (4.5 or 4.4)
-Andi
Quoted 8 lines · Andi Kleen
Quoted 4 lines · Avi Kivity
cea15c2 ("KVM: Move KVM context switch into own function") split
vmx_vcpu_run()to prevent multiple copies of the context switch from being generated (causing problems due to a label). This patch folds them back together again and adds the__nocloneattribute to prevent the label from being duplicated.That won't work on gcc versions that didn't have
__nocloneyet. Noclone is fairly recent (4.5 or 4.4)
Are the gcc versions that don't have noclone susceptible to cloning?
Signature · 1 line
error compiling committee.c: too many arguments to function
Quoted 11 lines · Avi Kivity
Quoted 8 lines · Andi Kleen
Quoted 4 lines · Avi Kivity
cea15c2 ("KVM: Move KVM context switch into own function") split
vmx_vcpu_run()to prevent multiple copies of the context switch from being generated (causing problems due to a label). This patch folds them back together again and adds the__nocloneattribute to prevent the label from being duplicated.That won't work on gcc versions that didn't have
__nocloneyet. Noclone is fairly recent (4.5 or 4.4)Are the gcc versions that don't have noclone susceptible to cloning?
I believe the problem can happen due to inlining already
-Andi
Quoted 8 lines · Andi Kleen
Quoted 7 lines · Avi Kivity
Quoted 6 lines · Andi Kleen
Quoted 4 lines · Avi Kivity
cea15c2 ("KVM: Move KVM context switch into own function") split
vmx_vcpu_run()to prevent multiple copies of the context switch from being generated (causing problems due to a label). This patch folds them back together again and adds the__nocloneattribute to prevent the label from being duplicated.
Quoted 6 lines
Quoted 4 lines
Quoted 2 lines
That won't work on gcc versions that didn't have
__nocloneyet. Noclone is fairly recent (4.5 or 4.4)Are the gcc versions that don't have noclone susceptible to cloning?
I believe the problem can happen due to inlining already
vmx_vcpu_run() cannot be inlined (it is only called via a function pointer; call site is in a different module)
Signature · 1 line
error compiling committee.c: too many arguments to function
Quoted 9 lines · Avi Kivity
Quoted 8 lines · Andi Kleen
Quoted 7 lines · Avi Kivity
Quoted 6 lines · Andi Kleen
Quoted 4 lines · Avi Kivity
cea15c2 ("KVM: Move KVM context switch into own function") split
vmx_vcpu_run()to prevent multiple copies of the context switch from being generated (causing problems due to a label). This patch folds them back together again and adds the__nocloneattribute to prevent the label from being duplicated.
Quoted 9 lines
Quoted 6 lines
Quoted 4 lines
Quoted 2 lines
That won't work on gcc versions that didn't have
__nocloneyet. Noclone is fairly recent (4.5 or 4.4)Are the gcc versions that don't have noclone susceptible to cloning?
I believe the problem can happen due to inlining already
vmx_vcpu_run()cannot be inlined (it is only called via a function pointer; call site is in a different module)
Well, I've applied the patch; if it breaks again, let me know, and I'll revert it.
Signature · 1 line
error compiling committee.c: too many arguments to function