Commit b83237ad authored by Vitaly Kuznetsov's avatar Vitaly Kuznetsov Committed by Paolo Bonzini

KVM: x86: Rename 'enable_direct_tlbflush' to 'enable_l2_tlb_flush'

To make terminology between Hyper-V-on-KVM and KVM-on-Hyper-V consistent,
rename 'enable_direct_tlbflush' to 'enable_l2_tlb_flush'. The change
eliminates the use of confusing 'direct' and adds the missing underscore.

No functional change.
Reviewed-by: default avatarMaxim Levitsky <mlevitsk@redhat.com>
Reviewed-by: default avatarSean Christopherson <seanjc@google.com>
Signed-off-by: default avatarVitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Message-Id: <20221101145426.251680-6-vkuznets@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 26b516bb
...@@ -125,7 +125,7 @@ KVM_X86_OP_OPTIONAL(guest_memory_reclaimed) ...@@ -125,7 +125,7 @@ KVM_X86_OP_OPTIONAL(guest_memory_reclaimed)
KVM_X86_OP(get_msr_feature) KVM_X86_OP(get_msr_feature)
KVM_X86_OP(can_emulate_instruction) KVM_X86_OP(can_emulate_instruction)
KVM_X86_OP(apic_init_signal_blocked) KVM_X86_OP(apic_init_signal_blocked)
KVM_X86_OP_OPTIONAL(enable_direct_tlbflush) KVM_X86_OP_OPTIONAL(enable_l2_tlb_flush)
KVM_X86_OP_OPTIONAL(migrate_timers) KVM_X86_OP_OPTIONAL(migrate_timers)
KVM_X86_OP(msr_filter_changed) KVM_X86_OP(msr_filter_changed)
KVM_X86_OP(complete_emulated_msr) KVM_X86_OP(complete_emulated_msr)
......
...@@ -1652,7 +1652,7 @@ struct kvm_x86_ops { ...@@ -1652,7 +1652,7 @@ struct kvm_x86_ops {
void *insn, int insn_len); void *insn, int insn_len);
bool (*apic_init_signal_blocked)(struct kvm_vcpu *vcpu); bool (*apic_init_signal_blocked)(struct kvm_vcpu *vcpu);
int (*enable_direct_tlbflush)(struct kvm_vcpu *vcpu); int (*enable_l2_tlb_flush)(struct kvm_vcpu *vcpu);
void (*migrate_timers)(struct kvm_vcpu *vcpu); void (*migrate_timers)(struct kvm_vcpu *vcpu);
void (*msr_filter_changed)(struct kvm_vcpu *vcpu); void (*msr_filter_changed)(struct kvm_vcpu *vcpu);
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#include "kvm_onhyperv.h" #include "kvm_onhyperv.h"
#include "svm_onhyperv.h" #include "svm_onhyperv.h"
int svm_hv_enable_direct_tlbflush(struct kvm_vcpu *vcpu) int svm_hv_enable_l2_tlb_flush(struct kvm_vcpu *vcpu)
{ {
struct hv_vmcb_enlightenments *hve; struct hv_vmcb_enlightenments *hve;
struct hv_partition_assist_pg **p_hv_pa_pg = struct hv_partition_assist_pg **p_hv_pa_pg =
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
static struct kvm_x86_ops svm_x86_ops; static struct kvm_x86_ops svm_x86_ops;
int svm_hv_enable_direct_tlbflush(struct kvm_vcpu *vcpu); int svm_hv_enable_l2_tlb_flush(struct kvm_vcpu *vcpu);
static inline void svm_hv_init_vmcb(struct vmcb *vmcb) static inline void svm_hv_init_vmcb(struct vmcb *vmcb)
{ {
...@@ -53,8 +53,8 @@ static inline void svm_hv_hardware_setup(void) ...@@ -53,8 +53,8 @@ static inline void svm_hv_hardware_setup(void)
vp_ap->nested_control.features.directhypercall = 1; vp_ap->nested_control.features.directhypercall = 1;
} }
svm_x86_ops.enable_direct_tlbflush = svm_x86_ops.enable_l2_tlb_flush =
svm_hv_enable_direct_tlbflush; svm_hv_enable_l2_tlb_flush;
} }
} }
......
...@@ -527,7 +527,7 @@ static unsigned long host_idt_base; ...@@ -527,7 +527,7 @@ static unsigned long host_idt_base;
static bool __read_mostly enlightened_vmcs = true; static bool __read_mostly enlightened_vmcs = true;
module_param(enlightened_vmcs, bool, 0444); module_param(enlightened_vmcs, bool, 0444);
static int hv_enable_direct_tlbflush(struct kvm_vcpu *vcpu) static int hv_enable_l2_tlb_flush(struct kvm_vcpu *vcpu)
{ {
struct hv_enlightened_vmcs *evmcs; struct hv_enlightened_vmcs *evmcs;
struct hv_partition_assist_pg **p_hv_pa_pg = struct hv_partition_assist_pg **p_hv_pa_pg =
...@@ -8520,8 +8520,8 @@ static int __init vmx_init(void) ...@@ -8520,8 +8520,8 @@ static int __init vmx_init(void)
} }
if (ms_hyperv.nested_features & HV_X64_NESTED_DIRECT_FLUSH) if (ms_hyperv.nested_features & HV_X64_NESTED_DIRECT_FLUSH)
vmx_x86_ops.enable_direct_tlbflush vmx_x86_ops.enable_l2_tlb_flush
= hv_enable_direct_tlbflush; = hv_enable_l2_tlb_flush;
} else { } else {
enlightened_vmcs = false; enlightened_vmcs = false;
......
...@@ -4481,7 +4481,7 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext) ...@@ -4481,7 +4481,7 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)
kvm_x86_ops.nested_ops->get_state(NULL, NULL, 0) : 0; kvm_x86_ops.nested_ops->get_state(NULL, NULL, 0) : 0;
break; break;
case KVM_CAP_HYPERV_DIRECT_TLBFLUSH: case KVM_CAP_HYPERV_DIRECT_TLBFLUSH:
r = kvm_x86_ops.enable_direct_tlbflush != NULL; r = kvm_x86_ops.enable_l2_tlb_flush != NULL;
break; break;
case KVM_CAP_HYPERV_ENLIGHTENED_VMCS: case KVM_CAP_HYPERV_ENLIGHTENED_VMCS:
r = kvm_x86_ops.nested_ops->enable_evmcs != NULL; r = kvm_x86_ops.nested_ops->enable_evmcs != NULL;
...@@ -5494,10 +5494,10 @@ static int kvm_vcpu_ioctl_enable_cap(struct kvm_vcpu *vcpu, ...@@ -5494,10 +5494,10 @@ static int kvm_vcpu_ioctl_enable_cap(struct kvm_vcpu *vcpu,
} }
return r; return r;
case KVM_CAP_HYPERV_DIRECT_TLBFLUSH: case KVM_CAP_HYPERV_DIRECT_TLBFLUSH:
if (!kvm_x86_ops.enable_direct_tlbflush) if (!kvm_x86_ops.enable_l2_tlb_flush)
return -ENOTTY; return -ENOTTY;
return static_call(kvm_x86_enable_direct_tlbflush)(vcpu); return static_call(kvm_x86_enable_l2_tlb_flush)(vcpu);
case KVM_CAP_HYPERV_ENFORCE_CPUID: case KVM_CAP_HYPERV_ENFORCE_CPUID:
return kvm_hv_set_enforce_cpuid(vcpu, cap->args[0]); return kvm_hv_set_enforce_cpuid(vcpu, cap->args[0]);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment