Commit 7204160e authored by Aaron Lewis's avatar Aaron Lewis Committed by Paolo Bonzini
Browse files

KVM: x86: Introduce vcpu->arch.xsaves_enabled 



Cache whether XSAVES is enabled in the guest by adding xsaves_enabled to
vcpu->arch.

Reviewed-by: default avatarJim Mattson <jmattson@google.com>
Signed-off-by: default avatarAaron Lewis <aaronlewis@google.com>
Change-Id: If4638e0901c28a4494dad2e103e2c075e8ab5d68
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 1b84292b

arch/x86/include/asm/kvm_host.h

+1 −0
Original line number Diff line number Diff line
@@ -560,6 +560,7 @@ struct kvm_vcpu_arch { 
	u64 smbase;

	u64 smi_count;

	bool tpr_access_reporting;

	bool xsaves_enabled;

	u64 ia32_xss;

	u64 microcode_version;

	u64 arch_capabilities;

arch/x86/kvm/svm.c

+3 −0
Original line number Diff line number Diff line
@@ -5895,6 +5895,9 @@ static void svm_cpuid_update(struct kvm_vcpu *vcpu) 
{

	struct vcpu_svm *svm = to_svm(vcpu);



	vcpu->arch.xsaves_enabled = guest_cpuid_has(vcpu, X86_FEATURE_XSAVE) &&

				    boot_cpu_has(X86_FEATURE_XSAVES);



	/* Update nrips enabled cache */

	svm->nrips_enabled = !!guest_cpuid_has(&svm->vcpu, X86_FEATURE_NRIPS);

arch/x86/kvm/vmx/vmx.c

+5 −0
Original line number Diff line number Diff line
@@ -4050,6 +4050,8 @@ static void vmx_compute_secondary_exec_control(struct vcpu_vmx *vmx) 
			guest_cpuid_has(vcpu, X86_FEATURE_XSAVE) &&

			guest_cpuid_has(vcpu, X86_FEATURE_XSAVES);



		vcpu->arch.xsaves_enabled = xsaves_enabled;



		if (!xsaves_enabled)

			exec_control &= ~SECONDARY_EXEC_XSAVES;
@@ -7089,6 +7091,9 @@ static void vmx_cpuid_update(struct kvm_vcpu *vcpu) 
{

	struct vcpu_vmx *vmx = to_vmx(vcpu);



	/* xsaves_enabled is recomputed in vmx_compute_secondary_exec_control(). */

	vcpu->arch.xsaves_enabled = false;



	if (cpu_has_secondary_exec_ctrls()) {

		vmx_compute_secondary_exec_control(vmx);

		vmcs_set_secondary_exec_control(vmx);