KVM: x86: Rename Hyper-V remote TLB hooks to match established scheme

Rename the Hyper-V hooks for TLB flushing to match the naming scheme used
by all the other TLB flushing hooks, e.g. in kvm_x86_ops, vendor code,
arch hooks from common code, etc.

Reviewed-by: David Matlack <dmatlack@google.com>
Reviewed-by: Vitaly Kuznetsov <vkuznets@redhat.com>
Link: https://lore.kernel.org/r/20230405003133.419177-2-seanjc@google.com
Signed-off-by: Sean Christopherson <seanjc@google.com>

diff --git a/arch/x86/include/asm/kvm-x86-ops.h b/arch/x86/include/asm/kvm-x86-ops.h
index 8dc345cc63188b4f338317dc18752b1bfd0954e4..430ca22170e06c7575784b90770c7a3d23b111d5 100644 (file)
--- a/arch/x86/include/asm/kvm-x86-ops.h
+++ b/arch/x86/include/asm/kvm-x86-ops.h
@@ -54,8 +54,8 @@ KVM_X86_OP(set_rflags)
 KVM_X86_OP(get_if_flag)
 KVM_X86_OP(flush_tlb_all)
 KVM_X86_OP(flush_tlb_current)
-KVM_X86_OP_OPTIONAL(tlb_remote_flush)
-KVM_X86_OP_OPTIONAL(tlb_remote_flush_with_range)
+KVM_X86_OP_OPTIONAL(flush_remote_tlbs)
+KVM_X86_OP_OPTIONAL(flush_remote_tlbs_range)
 KVM_X86_OP(flush_tlb_gva)
 KVM_X86_OP(flush_tlb_guest)
 KVM_X86_OP(vcpu_pre_run)

diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
index 991296a2f807dc8a80c18b18488c96e9b2e8295a..ec22101410ee637bb28614edc8c22905405847a7 100644 (file)
--- a/arch/x86/include/asm/kvm_host.h
+++ b/arch/x86/include/asm/kvm_host.h
@@ -1588,9 +1588,9 @@ struct kvm_x86_ops {
 
        void (*flush_tlb_all)(struct kvm_vcpu *vcpu);
        void (*flush_tlb_current)(struct kvm_vcpu *vcpu);
-       int  (*tlb_remote_flush)(struct kvm *kvm);
-       int  (*tlb_remote_flush_with_range)(struct kvm *kvm,
-                       struct kvm_tlb_range *range);
+       int  (*flush_remote_tlbs)(struct kvm *kvm);
+       int  (*flush_remote_tlbs_range)(struct kvm *kvm,
+                                       struct kvm_tlb_range *range);
 
        /*
         * Flush any TLB entries associated with the given GVA.
@@ -1794,8 +1794,8 @@ void kvm_arch_free_vm(struct kvm *kvm);
 #define __KVM_HAVE_ARCH_FLUSH_REMOTE_TLB
 static inline int kvm_arch_flush_remote_tlb(struct kvm *kvm)
 {
-       if (kvm_x86_ops.tlb_remote_flush &&
-           !static_call(kvm_x86_tlb_remote_flush)(kvm))
+       if (kvm_x86_ops.flush_remote_tlbs &&
+           !static_call(kvm_x86_flush_remote_tlbs)(kvm))
                return 0;
        else
                return -ENOTSUPP;

diff --git a/arch/x86/kvm/kvm_onhyperv.c b/arch/x86/kvm/kvm_onhyperv.c
index 482d6639ef8894d089770aecfc2a63b77ad499ea..2e2d08da8a3f9c26dc16fab0bff7ac94ce46437a 100644 (file)
--- a/arch/x86/kvm/kvm_onhyperv.c
+++ b/arch/x86/kvm/kvm_onhyperv.c
@@ -29,8 +29,7 @@ static inline int hv_remote_flush_root_tdp(hpa_t root_tdp,
                return hyperv_flush_guest_mapping(root_tdp);
 }
 
-int hv_remote_flush_tlb_with_range(struct kvm *kvm,
-               struct kvm_tlb_range *range)
+int hv_flush_remote_tlbs_range(struct kvm *kvm, struct kvm_tlb_range *range)
 {
        struct kvm_arch *kvm_arch = &kvm->arch;
        struct kvm_vcpu *vcpu;
@@ -86,19 +85,19 @@ int hv_remote_flush_tlb_with_range(struct kvm *kvm,
        spin_unlock(&kvm_arch->hv_root_tdp_lock);
        return ret;
 }
-EXPORT_SYMBOL_GPL(hv_remote_flush_tlb_with_range);
+EXPORT_SYMBOL_GPL(hv_flush_remote_tlbs_range);
 
-int hv_remote_flush_tlb(struct kvm *kvm)
+int hv_flush_remote_tlbs(struct kvm *kvm)
 {
-       return hv_remote_flush_tlb_with_range(kvm, NULL);
+       return hv_flush_remote_tlbs_range(kvm, NULL);
 }
-EXPORT_SYMBOL_GPL(hv_remote_flush_tlb);
+EXPORT_SYMBOL_GPL(hv_flush_remote_tlbs);
 
 void hv_track_root_tdp(struct kvm_vcpu *vcpu, hpa_t root_tdp)
 {
        struct kvm_arch *kvm_arch = &vcpu->kvm->arch;
 
-       if (kvm_x86_ops.tlb_remote_flush == hv_remote_flush_tlb) {
+       if (kvm_x86_ops.flush_remote_tlbs == hv_flush_remote_tlbs) {
                spin_lock(&kvm_arch->hv_root_tdp_lock);
                vcpu->arch.hv_root_tdp = root_tdp;
                if (root_tdp != kvm_arch->hv_root_tdp)

diff --git a/arch/x86/kvm/kvm_onhyperv.h b/arch/x86/kvm/kvm_onhyperv.h
index 287e98ef9df3d820244133f4aa73547abe613f1d..55d7fcb84cc1ea328f7f5d3856c2a1466b4976f6 100644 (file)
--- a/arch/x86/kvm/kvm_onhyperv.h
+++ b/arch/x86/kvm/kvm_onhyperv.h
@@ -7,9 +7,8 @@
 #define __ARCH_X86_KVM_KVM_ONHYPERV_H__
 
 #if IS_ENABLED(CONFIG_HYPERV)
-int hv_remote_flush_tlb_with_range(struct kvm *kvm,
-               struct kvm_tlb_range *range);
-int hv_remote_flush_tlb(struct kvm *kvm);
+int hv_flush_remote_tlbs_range(struct kvm *kvm, struct kvm_tlb_range *range);
+int hv_flush_remote_tlbs(struct kvm *kvm);
 void hv_track_root_tdp(struct kvm_vcpu *vcpu, hpa_t root_tdp);
 #else /* !CONFIG_HYPERV */
 static inline void hv_track_root_tdp(struct kvm_vcpu *vcpu, hpa_t root_tdp)

diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c
index 4c874d4ec68f513781a0efe88a8ea52f05964725..7654be48ff69a9e005f4015a18ed8a18094f96d5 100644 (file)
--- a/arch/x86/kvm/mmu/mmu.c
+++ b/arch/x86/kvm/mmu/mmu.c
@@ -270,9 +270,9 @@ static inline unsigned long kvm_mmu_get_guest_pgd(struct kvm_vcpu *vcpu,
        return mmu->get_guest_pgd(vcpu);
 }
 
-static inline bool kvm_available_flush_tlb_with_range(void)
+static inline bool kvm_available_flush_remote_tlbs_range(void)
 {
-       return kvm_x86_ops.tlb_remote_flush_with_range;
+       return kvm_x86_ops.flush_remote_tlbs_range;
 }
 
 void kvm_flush_remote_tlbs_range(struct kvm *kvm, gfn_t start_gfn,
@@ -284,8 +284,8 @@ void kvm_flush_remote_tlbs_range(struct kvm *kvm, gfn_t start_gfn,
        range.start_gfn = start_gfn;
        range.pages = nr_pages;
 
-       if (kvm_x86_ops.tlb_remote_flush_with_range)
-               ret = static_call(kvm_x86_tlb_remote_flush_with_range)(kvm, &range);
+       if (kvm_x86_ops.flush_remote_tlbs_range)
+               ret = static_call(kvm_x86_flush_remote_tlbs_range)(kvm, &range);
 
        if (ret)
                kvm_flush_remote_tlbs(kvm);
@@ -1498,7 +1498,7 @@ restart:
                }
        }
 
-       if (need_flush && kvm_available_flush_tlb_with_range()) {
+       if (need_flush && kvm_available_flush_remote_tlbs_range()) {
                kvm_flush_remote_tlbs_gfn(kvm, gfn, level);
                return false;
        }
@@ -6623,7 +6623,7 @@ restart:
                                                               PG_LEVEL_NUM)) {
                        kvm_zap_one_rmap_spte(kvm, rmap_head, sptep);
 
-                       if (kvm_available_flush_tlb_with_range())
+                       if (kvm_available_flush_remote_tlbs_range())
                                kvm_flush_remote_tlbs_sptep(kvm, sptep);
                        else
                                need_tlb_flush = 1;

diff --git a/arch/x86/kvm/svm/svm_onhyperv.h b/arch/x86/kvm/svm/svm_onhyperv.h
index cff838f15db5399b1fba358965e38fb8adcddea0..823001033539ce07374a99bc4575e8814722fc83 100644 (file)
--- a/arch/x86/kvm/svm/svm_onhyperv.h
+++ b/arch/x86/kvm/svm/svm_onhyperv.h
@@ -35,9 +35,8 @@ static inline __init void svm_hv_hardware_setup(void)
        if (npt_enabled &&
            ms_hyperv.nested_features & HV_X64_NESTED_ENLIGHTENED_TLB) {
                pr_info(KBUILD_MODNAME ": Hyper-V enlightened NPT TLB flush enabled\n");
-               svm_x86_ops.tlb_remote_flush = hv_remote_flush_tlb;
-               svm_x86_ops.tlb_remote_flush_with_range =
-                               hv_remote_flush_tlb_with_range;
+               svm_x86_ops.flush_remote_tlbs = hv_flush_remote_tlbs;
+               svm_x86_ops.flush_remote_tlbs_range = hv_flush_remote_tlbs_range;
        }
 
        if (ms_hyperv.nested_features & HV_X64_NESTED_DIRECT_FLUSH) {

diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
index d7bf14abdba1df6e91df8e96e23b935fe788b896..8031bded75cc60dfe2bef1e61a6fb2cc701d5fdb 100644 (file)
--- a/arch/x86/kvm/vmx/vmx.c
+++ b/arch/x86/kvm/vmx/vmx.c
@@ -8432,9 +8432,8 @@ static __init int hardware_setup(void)
 #if IS_ENABLED(CONFIG_HYPERV)
        if (ms_hyperv.nested_features & HV_X64_NESTED_GUEST_MAPPING_FLUSH
            && enable_ept) {
-               vmx_x86_ops.tlb_remote_flush = hv_remote_flush_tlb;
-               vmx_x86_ops.tlb_remote_flush_with_range =
-                               hv_remote_flush_tlb_with_range;
+               vmx_x86_ops.flush_remote_tlbs = hv_flush_remote_tlbs;
+               vmx_x86_ops.flush_remote_tlbs_range = hv_flush_remote_tlbs_range;
        }
 #endif