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

Commit e0b890d3 authored by Gleb Natapov's avatar Gleb Natapov Committed by Paolo Bonzini
Browse files

KVM: nVMX: Amend nested_run_pending logic 



EXIT_REASON_VMLAUNCH/EXIT_REASON_VMRESUME exit does not mean that nested
VM will actually run during next entry. Move setting nested_run_pending
closer to vmentry emulation code and move its clearing close to vmexit to
minimize amount of code that will erroneously run with nested_run_pending
set.

Signed-off-by: default avatarGleb Natapov <gleb@redhat.com>
Reviewed-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 6a3f95a6

arch/x86/kvm/vmx.c

+12 −14
Original line number Diff line number Diff line
@@ -6742,20 +6742,6 @@ static int vmx_handle_exit(struct kvm_vcpu *vcpu) 
	if (vmx->emulation_required)

		return handle_invalid_guest_state(vcpu);



	/*

	 * the KVM_REQ_EVENT optimization bit is only on for one entry, and if

	 * we did not inject a still-pending event to L1 now because of

	 * nested_run_pending, we need to re-enable this bit.

	 */

	if (vmx->nested.nested_run_pending)

		kvm_make_request(KVM_REQ_EVENT, vcpu);



	if (!is_guest_mode(vcpu) && (exit_reason == EXIT_REASON_VMLAUNCH ||

	    exit_reason == EXIT_REASON_VMRESUME))

		vmx->nested.nested_run_pending = 1;

	else

		vmx->nested.nested_run_pending = 0;



	if (is_guest_mode(vcpu) && nested_vmx_exit_handled(vcpu)) {

		nested_vmx_vmexit(vcpu);

		return 1;
@@ -7290,6 +7276,16 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu) 
	vmx->exit_reason = vmcs_read32(VM_EXIT_REASON);

	trace_kvm_exit(vmx->exit_reason, vcpu, KVM_ISA_VMX);



	/*

	 * the KVM_REQ_EVENT optimization bit is only on for one entry, and if

	 * we did not inject a still-pending event to L1 now because of

	 * nested_run_pending, we need to re-enable this bit.

	 */

	if (vmx->nested.nested_run_pending)

		kvm_make_request(KVM_REQ_EVENT, vcpu);



	vmx->nested.nested_run_pending = 0;



	vmx_complete_atomic_exit(vmx);

	vmx_recover_nmi_blocking(vmx);

	vmx_complete_interrupts(vmx);
@@ -7948,6 +7944,8 @@ static int nested_vmx_run(struct kvm_vcpu *vcpu, bool launch) 


	enter_guest_mode(vcpu);



	vmx->nested.nested_run_pending = 1;



	vmx->nested.vmcs01_tsc_offset = vmcs_read64(TSC_OFFSET);



	cpu = get_cpu();