Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 24d1b15f authored by Joerg Roedel's avatar Joerg Roedel Committed by Avi Kivity
Browse files

KVM: SVM: Do not report xsave in supported cpuid 



To support xsave properly for the guest the SVM module need
software support for it. As long as this is not present do
not report the xsave as supported feature in cpuid.
As a side-effect this patch moves the bit() helper function
into the x86.h file so that it can be used in svm.c too.

KVM-Stable-Tag.
Signed-off-by: default avatarJoerg Roedel <joerg.roedel@amd.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 3ea3aa8c

arch/x86/kvm/svm.c

+4 −0
Original line number Diff line number Diff line
@@ -3494,6 +3494,10 @@ static void svm_cpuid_update(struct kvm_vcpu *vcpu) 
static void svm_set_supported_cpuid(u32 func, struct kvm_cpuid_entry2 *entry)

{

	switch (func) {

	case 0x00000001:

		/* Mask out xsave bit as long as it is not supported by SVM */

		entry->ecx &= ~(bit(X86_FEATURE_XSAVE));

		break;

	case 0x80000001:

		if (nested)

			entry->ecx |= (1 << 2); /* Set SVM bit */

arch/x86/kvm/vmx.c

+0 −5
Original line number Diff line number Diff line
@@ -4227,11 +4227,6 @@ static int vmx_get_lpage_level(void) 
		return PT_PDPE_LEVEL;

}



static inline u32 bit(int bitno)

{

	return 1 << (bitno & 31);

}



static void vmx_cpuid_update(struct kvm_vcpu *vcpu)

{

	struct kvm_cpuid_entry2 *best;

arch/x86/kvm/x86.c

+0 −5
Original line number Diff line number Diff line
@@ -155,11 +155,6 @@ struct kvm_stats_debugfs_item debugfs_entries[] = { 


u64 __read_mostly host_xcr0;



static inline u32 bit(int bitno)

{

	return 1 << (bitno & 31);

}



static void kvm_on_user_return(struct user_return_notifier *urn)

{

	unsigned slot;

arch/x86/kvm/x86.h

+5 −0
Original line number Diff line number Diff line
@@ -70,6 +70,11 @@ static inline int is_paging(struct kvm_vcpu *vcpu) 
	return kvm_read_cr0_bits(vcpu, X86_CR0_PG);

}



static inline u32 bit(int bitno)

{

	return 1 << (bitno & 31);

}



void kvm_before_handle_nmi(struct kvm_vcpu *vcpu);

void kvm_after_handle_nmi(struct kvm_vcpu *vcpu);

int kvm_inject_realmode_interrupt(struct kvm_vcpu *vcpu, int irq);