KVM: VMX: Introduce vmx_msr_bitmap_l01_changed() helper

In preparation to enabling 'Enlightened MSR Bitmap' feature for Hyper-V
guests move MSR bitmap update tracking to a dedicated helper.

Note: vmx_msr_bitmap_l01_changed() is called when MSR bitmap might be
updated. KVM doesn't check if the bit we're trying to set is already set
(or the bit it's trying to clear is already cleared). Such situations
should not be common and a few false positives should not be a problem.

No functional change intended.

Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
Reviewed-by: Sean Christopherson <seanjc@google.com>
Message-Id: <20211129094704.326635-3-vkuznets@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
index 9d7f26eaf05f1db9f2e77275f7d9329eb36690d1..7ee50671191b3cd96cfffd821891a74c0d5e3ca2 100644 (file)
--- a/arch/x86/kvm/vmx/vmx.c
+++ b/arch/x86/kvm/vmx/vmx.c
@@ -3688,6 +3688,17 @@ void free_vpid(int vpid)
        spin_unlock(&vmx_vpid_lock);
 }
 
+static void vmx_msr_bitmap_l01_changed(struct vcpu_vmx *vmx)
+{
+       /*
+        * When KVM is a nested hypervisor on top of Hyper-V and uses
+        * 'Enlightened MSR Bitmap' feature L0 needs to know that MSR
+        * bitmap has changed.
+        */
+       if (static_branch_unlikely(&enable_evmcs))
+               evmcs_touch_msr_bitmap();
+}
+
 void vmx_disable_intercept_for_msr(struct kvm_vcpu *vcpu, u32 msr, int type)
 {
        struct vcpu_vmx *vmx = to_vmx(vcpu);
@@ -3696,8 +3707,7 @@ void vmx_disable_intercept_for_msr(struct kvm_vcpu *vcpu, u32 msr, int type)
        if (!cpu_has_vmx_msr_bitmap())
                return;
 
-       if (static_branch_unlikely(&enable_evmcs))
-               evmcs_touch_msr_bitmap();
+       vmx_msr_bitmap_l01_changed(vmx);
 
        /*
         * Mark the desired intercept state in shadow bitmap, this is needed
@@ -3741,8 +3751,7 @@ void vmx_enable_intercept_for_msr(struct kvm_vcpu *vcpu, u32 msr, int type)
        if (!cpu_has_vmx_msr_bitmap())
                return;
 
-       if (static_branch_unlikely(&enable_evmcs))
-               evmcs_touch_msr_bitmap();
+       vmx_msr_bitmap_l01_changed(vmx);
 
        /*
         * Mark the desired intercept state in shadow bitmap, this is needed