Commit 13908510 authored by Sean Christopherson's avatar Sean Christopherson Committed by Paolo Bonzini

KVM: x86: Use KVM cpu caps to detect MSR_TSC_AUX virt support

Check for MSR_TSC_AUX virtualization via kvm_cpu_cap_has() and drop
->rdtscp_supported().

Note, vmx_rdtscp_supported() needs to hang around a tiny bit longer due
other usage in VMX code.

No functional change intended.
Reviewed-by: default avatarVitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: default avatarSean Christopherson <sean.j.christopherson@intel.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 7c7f9548
...@@ -1156,7 +1156,6 @@ struct kvm_x86_ops { ...@@ -1156,7 +1156,6 @@ struct kvm_x86_ops {
int (*get_tdp_level)(struct kvm_vcpu *vcpu); int (*get_tdp_level)(struct kvm_vcpu *vcpu);
u64 (*get_mt_mask)(struct kvm_vcpu *vcpu, gfn_t gfn, bool is_mmio); u64 (*get_mt_mask)(struct kvm_vcpu *vcpu, gfn_t gfn, bool is_mmio);
int (*get_lpage_level)(void); int (*get_lpage_level)(void);
bool (*rdtscp_supported)(void);
void (*set_tdp_cr3)(struct kvm_vcpu *vcpu, unsigned long cr3); void (*set_tdp_cr3)(struct kvm_vcpu *vcpu, unsigned long cr3);
......
...@@ -6074,11 +6074,6 @@ static int svm_get_lpage_level(void) ...@@ -6074,11 +6074,6 @@ static int svm_get_lpage_level(void)
return PT_PDPE_LEVEL; return PT_PDPE_LEVEL;
} }
static bool svm_rdtscp_supported(void)
{
return boot_cpu_has(X86_FEATURE_RDTSCP);
}
static bool svm_pt_supported(void) static bool svm_pt_supported(void)
{ {
return false; return false;
...@@ -7445,7 +7440,6 @@ static struct kvm_x86_ops svm_x86_ops __ro_after_init = { ...@@ -7445,7 +7440,6 @@ static struct kvm_x86_ops svm_x86_ops __ro_after_init = {
.cpuid_update = svm_cpuid_update, .cpuid_update = svm_cpuid_update,
.rdtscp_supported = svm_rdtscp_supported,
.pt_supported = svm_pt_supported, .pt_supported = svm_pt_supported,
.set_supported_cpuid = svm_set_supported_cpuid, .set_supported_cpuid = svm_set_supported_cpuid,
......
...@@ -7939,9 +7939,6 @@ static struct kvm_x86_ops vmx_x86_ops __ro_after_init = { ...@@ -7939,9 +7939,6 @@ static struct kvm_x86_ops vmx_x86_ops __ro_after_init = {
.get_lpage_level = vmx_get_lpage_level, .get_lpage_level = vmx_get_lpage_level,
.cpuid_update = vmx_cpuid_update, .cpuid_update = vmx_cpuid_update,
.rdtscp_supported = vmx_rdtscp_supported,
.set_supported_cpuid = vmx_set_supported_cpuid, .set_supported_cpuid = vmx_set_supported_cpuid,
.has_wbinvd_exit = cpu_has_vmx_wbinvd_exit, .has_wbinvd_exit = cpu_has_vmx_wbinvd_exit,
......
...@@ -5215,7 +5215,7 @@ static void kvm_init_msr_list(void) ...@@ -5215,7 +5215,7 @@ static void kvm_init_msr_list(void)
continue; continue;
break; break;
case MSR_TSC_AUX: case MSR_TSC_AUX:
if (!kvm_x86_ops->rdtscp_supported()) if (!kvm_cpu_cap_has(X86_FEATURE_RDTSCP))
continue; continue;
break; break;
case MSR_IA32_RTIT_CTL: case MSR_IA32_RTIT_CTL:
......
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