Commit 29763138 authored by Dongli Zhang's avatar Dongli Zhang Committed by Sean Christopherson
Browse files

KVM: nVMX: Immediately refresh APICv controls as needed on nested VM-Exit 



If an APICv status updated was pended while L2 was active, immediately
refresh vmcs01's controls instead of pending KVM_REQ_APICV_UPDATE as
kvm_vcpu_update_apicv() only calls into vendor code if a change is
necessary.

E.g. if APICv is inhibited, and then activated while L2 is running:

  kvm_vcpu_update_apicv()
  |
  -> __kvm_vcpu_update_apicv()
     |
     -> apic->apicv_active = true
      |
      -> vmx_refresh_apicv_exec_ctrl()
         |
         -> vmx->nested.update_vmcs01_apicv_status = true
          |
          -> return

Then L2 exits to L1:

  __nested_vmx_vmexit()
  |
  -> kvm_make_request(KVM_REQ_APICV_UPDATE)

  vcpu_enter_guest(): KVM_REQ_APICV_UPDATE
  -> kvm_vcpu_update_apicv()
     |
     -> __kvm_vcpu_update_apicv()
        |
        -> return // because if (apic->apicv_active == activate)

Reported-by: default avatarChao Gao <chao.gao@intel.com>
Closes: https://lore.kernel.org/all/aQ2jmnN8wUYVEawF@intel.com


Fixes: 7c69661e ("KVM: nVMX: Defer APICv updates while L2 is active until L1 is active")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarDongli Zhang <dongli.zhang@oracle.com>
[sean: write changelog]
Link: https://patch.msgid.link/20251205231913.441872-3-seanjc@google.com


Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
parent b2849bec

arch/x86/kvm/vmx/nested.c

+2 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include "trace.h"

#include "vmx.h"

#include "smm.h"

#include "x86_ops.h"



static bool __read_mostly enable_shadow_vmcs = 1;

module_param_named(enable_shadow_vmcs, enable_shadow_vmcs, bool, S_IRUGO);
@@ -5216,7 +5217,7 @@ void __nested_vmx_vmexit(struct kvm_vcpu *vcpu, u32 vm_exit_reason, 


	if (vmx->nested.update_vmcs01_apicv_status) {

		vmx->nested.update_vmcs01_apicv_status = false;

		kvm_make_request(KVM_REQ_APICV_UPDATE, vcpu);

		vmx_refresh_apicv_exec_ctrl(vcpu);

	}



	if (vmx->nested.update_vmcs01_hwapic_isr) {