iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

KVM: x86: Move XSAVES CPUID adjust to VMX's KVM cpu cap update

Browse Source 
Move the clearing of the XSAVES CPUID bit into VMX, which has a separate
VMCS control to enable XSAVES in non-root, to eliminate the last ugly
renmant of the undesirable "unsigned f_* = *_supported ? F(*) : 0"
pattern in the common CPUID handling code.

Drop ->xsaves_supported(), CPUID adjustment was the only user.

No functional change intended.

Reviewed-by: Vitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Sean Christopherson 2020-03-02 15:56:44 -08:00 committed by Paolo Bonzini
parent 3ec6fd8cf0
commit b3d895d5c4
4 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/x86/include/asm/kvm_host.h
View File

@ -1177,7 +1177,6 @@ struct kvm_x86_ops {
void (*handle_exit_irqoff)(struct kvm_vcpu *vcpu, void (*handle_exit_irqoff)(struct kvm_vcpu *vcpu,
enum exit_fastpath_completion *exit_fastpath); enum exit_fastpath_completion *exit_fastpath);
bool (*xsaves_supported)(void);
bool (*umip_emulated)(void); bool (*umip_emulated)(void);
bool (*pt_supported)(void); bool (*pt_supported)(void);

4
arch/x86/kvm/cpuid.c
View File

@ -629,10 +629,6 @@ static inline int __do_cpuid_func(struct kvm_cpuid_array *array, u32 function)
goto out; goto out;
cpuid_entry_mask(entry, CPUID_D_1_EAX); cpuid_entry_mask(entry, CPUID_D_1_EAX);
if (!kvm_x86_ops->xsaves_supported())
cpuid_entry_clear(entry, X86_FEATURE_XSAVES);
if (entry->eax & (F(XSAVES)|F(XSAVEC))) if (entry->eax & (F(XSAVES)|F(XSAVEC)))
entry->ebx = xstate_required_size(supported_xcr0, true); entry->ebx = xstate_required_size(supported_xcr0, true);
else else

6
arch/x86/kvm/svm.c
View File

@ -6089,11 +6089,6 @@ static bool svm_rdtscp_supported(void)
return boot_cpu_has(X86_FEATURE_RDTSCP); return boot_cpu_has(X86_FEATURE_RDTSCP);
} }
static bool svm_xsaves_supported(void)
{
return boot_cpu_has(X86_FEATURE_XSAVES);
}
static bool svm_umip_emulated(void) static bool svm_umip_emulated(void)
{ {
return false; return false;
@ -7466,7 +7461,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, .rdtscp_supported = svm_rdtscp_supported,
.xsaves_supported = svm_xsaves_supported,
.umip_emulated = svm_umip_emulated, .umip_emulated = svm_umip_emulated,
.pt_supported = svm_pt_supported, .pt_supported = svm_pt_supported,

5
arch/x86/kvm/vmx/vmx.c
View File

@ -7162,6 +7162,10 @@ static __init void vmx_set_cpu_caps(void)
boot_cpu_has(X86_FEATURE_OSPKE)) boot_cpu_has(X86_FEATURE_OSPKE))
kvm_cpu_cap_set(X86_FEATURE_PKU); kvm_cpu_cap_set(X86_FEATURE_PKU);
/* CPUID 0xD.1 */
if (!vmx_xsaves_supported())
kvm_cpu_cap_clear(X86_FEATURE_XSAVES);
/* CPUID 0x80000001 */ /* CPUID 0x80000001 */
if (!cpu_has_vmx_rdtscp()) if (!cpu_has_vmx_rdtscp())
kvm_cpu_cap_clear(X86_FEATURE_RDTSCP); kvm_cpu_cap_clear(X86_FEATURE_RDTSCP);
@ -7961,7 +7965,6 @@ static struct kvm_x86_ops vmx_x86_ops __ro_after_init = {
.check_intercept = vmx_check_intercept, .check_intercept = vmx_check_intercept,
.handle_exit_irqoff = vmx_handle_exit_irqoff, .handle_exit_irqoff = vmx_handle_exit_irqoff,
.xsaves_supported = vmx_xsaves_supported,
.umip_emulated = vmx_umip_emulated, .umip_emulated = vmx_umip_emulated,
.pt_supported = vmx_pt_supported, .pt_supported = vmx_pt_supported,