Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 34f0c1ad authored by Jan Kiszka's avatar Jan Kiszka Committed by Avi Kivity
Browse files

KVM: VMX: Fix locking order in handle_invalid_guest_state 



Release and re-acquire preemption and IRQ lock in the same order as
vcpu_enter_guest does.

Signed-off-by: default avatarJan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 025dbbf3

arch/x86/kvm/vmx.c

+2 −2
Original line number Diff line number Diff line
@@ -3157,8 +3157,8 @@ static void handle_invalid_guest_state(struct kvm_vcpu *vcpu, 
	struct vcpu_vmx *vmx = to_vmx(vcpu);

	enum emulation_result err = EMULATE_DONE;



	preempt_enable();

	local_irq_enable();

	preempt_enable();



	while (!guest_state_valid(vcpu)) {

		err = emulate_instruction(vcpu, kvm_run, 0, 0, 0);
@@ -3177,8 +3177,8 @@ static void handle_invalid_guest_state(struct kvm_vcpu *vcpu, 
			schedule();

	}



	local_irq_disable();

	preempt_disable();

	local_irq_disable();



	vmx->invalid_state_emulation_result = err;

}