KVM: VMX: Clean up vmx_refresh_apicv_exec_ctrl()
PATCH v9 6/9 KVM: VMX: Clean up vmx_refresh_apicv_exec_ctrl()
Remove the condition check cpu_has_secondary_exec_ctrls(). Calling vmx_refresh_apicv_exec_ctrl() premises secondary controls activated and VMCS fields related to APICv valid as well. If it's invoked in wrong circumstance at the worst case, VMX operation will report VMfailValid error without further harmful impact and just functions as if all the secondary controls were 0.
Suggested-by Sean Christopherson <[email protected]>
Signed-off-by Zeng Guang <[email protected]>
--- arch/x86/kvm/vmx/vmx.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-)
arch/x86/kvm/vmx/vmx.c +9 -10
@@ -4194,16 +4194,15 @@ static void vmx_refresh_apicv_exec_ctrl(struct kvm_vcpu *vcpu)struct vcpu_vmx *vmx =to_vmx (vcpu);pin_controls_set (vmx,vmx_pin_based_exec_ctrl (vmx)); -if (cpu_has_secondary_exec_ctrls ()) { -if (kvm_vcpu_apicv_active (vcpu)) -secondary_exec_controls_setbit (vmx, -SECONDARY_EXEC_APIC_REGISTER_VIRT | -SECONDARY_EXEC_VIRTUAL_INTR_DELIVERY ); -else -secondary_exec_controls_clearbit (vmx, -SECONDARY_EXEC_APIC_REGISTER_VIRT | -SECONDARY_EXEC_VIRTUAL_INTR_DELIVERY ); - } + +if (kvm_vcpu_apicv_active (vcpu)) +secondary_exec_controls_setbit (vmx, +SECONDARY_EXEC_APIC_REGISTER_VIRT | +SECONDARY_EXEC_VIRTUAL_INTR_DELIVERY ); +else +secondary_exec_controls_clearbit (vmx, +SECONDARY_EXEC_APIC_REGISTER_VIRT | +SECONDARY_EXEC_VIRTUAL_INTR_DELIVERY );vmx_update_msr_bitmap_x2apic (vcpu); }
Signature · 1 line
2.27.0