KVM: VMX: Rename "vmx_find_msr_index" to "vmx_find_loadstore_msr_slot"

Add "loadstore" to vmx_find_msr_index() to differentiate it from the so
called shared MSRs helpers (which will soon be renamed), and replace
"index" with "slot" to better convey that the helper returns slot in the
array, not the MSR index (the value that gets stuffed into ECX).

No functional change intended.

Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
Message-Id: <20200923180409.32255-4-sean.j.christopherson@intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/arch/x86/kvm/vmx/nested.c b/arch/x86/kvm/vmx/nested.c
index b4f63212272bce2471ac66ce950a415ef5b5d601..a4a5aa18be8a46379ac2c2b92a76bde325856d9a 100644 (file)
--- a/arch/x86/kvm/vmx/nested.c
+++ b/arch/x86/kvm/vmx/nested.c
@@ -939,11 +939,11 @@ static bool nested_vmx_get_vmexit_msr_value(struct kvm_vcpu *vcpu,
         * VM-exit in L0, use the more accurate value.
         */
        if (msr_index == MSR_IA32_TSC) {
-               int index = vmx_find_msr_index(&vmx->msr_autostore.guest,
-                                              MSR_IA32_TSC);
+               int i = vmx_find_loadstore_msr_slot(&vmx->msr_autostore.guest,
+                                                   MSR_IA32_TSC);
 
-               if (index >= 0) {
-                       u64 val = vmx->msr_autostore.guest.val[index].value;
+               if (i >= 0) {
+                       u64 val = vmx->msr_autostore.guest.val[i].value;
 
                        *data = kvm_read_l1_tsc(vcpu, val);
                        return true;
@@ -1032,12 +1032,12 @@ static void prepare_vmx_msr_autostore_list(struct kvm_vcpu *vcpu,
        struct vcpu_vmx *vmx = to_vmx(vcpu);
        struct vmx_msrs *autostore = &vmx->msr_autostore.guest;
        bool in_vmcs12_store_list;
-       int msr_autostore_index;
+       int msr_autostore_slot;
        bool in_autostore_list;
        int last;
 
-       msr_autostore_index = vmx_find_msr_index(autostore, msr_index);
-       in_autostore_list = msr_autostore_index >= 0;
+       msr_autostore_slot = vmx_find_loadstore_msr_slot(autostore, msr_index);
+       in_autostore_list = msr_autostore_slot >= 0;
        in_vmcs12_store_list = nested_msr_store_list_has_msr(vcpu, msr_index);
 
        if (in_vmcs12_store_list && !in_autostore_list) {
@@ -1058,7 +1058,7 @@ static void prepare_vmx_msr_autostore_list(struct kvm_vcpu *vcpu,
                autostore->val[last].index = msr_index;
        } else if (!in_vmcs12_store_list && in_autostore_list) {
                last = --autostore->nr;
-               autostore->val[msr_autostore_index] = autostore->val[last];
+               autostore->val[msr_autostore_slot] = autostore->val[last];
        }
 }
 

diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
index 9de90907543fdd1ee7f5f7e357403a4ba5e78093..2329f1bbbe6f1a7bb942b801741107bb831e149f 100644 (file)
--- a/arch/x86/kvm/vmx/vmx.c
+++ b/arch/x86/kvm/vmx/vmx.c
@@ -812,7 +812,7 @@ static void clear_atomic_switch_msr_special(struct vcpu_vmx *vmx,
        vm_exit_controls_clearbit(vmx, exit);
 }
 
-int vmx_find_msr_index(struct vmx_msrs *m, u32 msr)
+int vmx_find_loadstore_msr_slot(struct vmx_msrs *m, u32 msr)
 {
        unsigned int i;
 
@@ -846,7 +846,7 @@ static void clear_atomic_switch_msr(struct vcpu_vmx *vmx, unsigned msr)
                }
                break;
        }
-       i = vmx_find_msr_index(&m->guest, msr);
+       i = vmx_find_loadstore_msr_slot(&m->guest, msr);
        if (i < 0)
                goto skip_guest;
        --m->guest.nr;
@@ -854,7 +854,7 @@ static void clear_atomic_switch_msr(struct vcpu_vmx *vmx, unsigned msr)
        vmcs_write32(VM_ENTRY_MSR_LOAD_COUNT, m->guest.nr);
 
 skip_guest:
-       i = vmx_find_msr_index(&m->host, msr);
+       i = vmx_find_loadstore_msr_slot(&m->host, msr);
        if (i < 0)
                return;
 
@@ -913,9 +913,9 @@ static void add_atomic_switch_msr(struct vcpu_vmx *vmx, unsigned msr,
                wrmsrl(MSR_IA32_PEBS_ENABLE, 0);
        }
 
-       i = vmx_find_msr_index(&m->guest, msr);
+       i = vmx_find_loadstore_msr_slot(&m->guest, msr);
        if (!entry_only)
-               j = vmx_find_msr_index(&m->host, msr);
+               j = vmx_find_loadstore_msr_slot(&m->host, msr);
 
        if ((i < 0 && m->guest.nr == MAX_NR_LOADSTORE_MSRS) ||
            (j < 0 &&  m->host.nr == MAX_NR_LOADSTORE_MSRS)) {

diff --git a/arch/x86/kvm/vmx/vmx.h b/arch/x86/kvm/vmx/vmx.h
index 2e37c17733a85019114236dd17241dca51778853..bce8cc4c97927a7da074c07ba1936d88d31fb5f9 100644 (file)
--- a/arch/x86/kvm/vmx/vmx.h
+++ b/arch/x86/kvm/vmx/vmx.h
@@ -332,7 +332,7 @@ void vmx_set_virtual_apic_mode(struct kvm_vcpu *vcpu);
 struct shared_msr_entry *find_msr_entry(struct vcpu_vmx *vmx, u32 msr);
 void pt_update_intercept_for_msr(struct vcpu_vmx *vmx);
 void vmx_update_host_rsp(struct vcpu_vmx *vmx, unsigned long host_rsp);
-int vmx_find_msr_index(struct vmx_msrs *m, u32 msr);
+int vmx_find_loadstore_msr_slot(struct vmx_msrs *m, u32 msr);
 void vmx_ept_load_pdptrs(struct kvm_vcpu *vcpu);
 
 static inline u8 vmx_get_rvi(void)