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

KVM: make EFER_RESERVED_BITS configurable for architecture code 



This patch give the SVM and VMX implementations the ability to add some bits
the guest can set in its EFER register.

Signed-off-by: default avatarJoerg Roedel <joerg.roedel@amd.com>
Signed-off-by: default avatarAvi Kivity <avi@qumranet.com>
parent 0aac03f0

arch/x86/kvm/x86.c

+9 −2
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ 
			  | X86_CR4_OSXMMEXCPT | X86_CR4_VMXE))



#define CR8_RESERVED_BITS (~(unsigned long)X86_CR8_TPR)

#define EFER_RESERVED_BITS 0xfffffffffffff2fe

static u64 __read_mostly efer_reserved_bits = 0xfffffffffffff2fe;



#define VM_STAT(x) offsetof(struct kvm, stat.x), KVM_STAT_VM

#define VCPU_STAT(x) offsetof(struct kvm_vcpu, stat.x), KVM_STAT_VCPU
@@ -428,7 +428,7 @@ static u32 emulated_msrs[] = { 


static void set_efer(struct kvm_vcpu *vcpu, u64 efer)

{

	if (efer & EFER_RESERVED_BITS) {

	if (efer & efer_reserved_bits) {

		printk(KERN_DEBUG "set_efer: 0x%llx #GP, reserved bits\n",

		       efer);

		kvm_inject_gp(vcpu, 0);
@@ -452,6 +452,13 @@ static void set_efer(struct kvm_vcpu *vcpu, u64 efer) 


#endif



void kvm_enable_efer_bits(u64 mask)

{

       efer_reserved_bits &= ~mask;

}

EXPORT_SYMBOL_GPL(kvm_enable_efer_bits);





/*

 * Writes msr value into into the appropriate "register".

 * Returns 0 on success, non-0 otherwise.

include/asm-x86/kvm_host.h

+1 −0
Original line number Diff line number Diff line
@@ -430,6 +430,7 @@ void realmode_lmsw(struct kvm_vcpu *vcpu, unsigned long msw, 
unsigned long realmode_get_cr(struct kvm_vcpu *vcpu, int cr);

void realmode_set_cr(struct kvm_vcpu *vcpu, int cr, unsigned long value,

		     unsigned long *rflags);

void kvm_enable_efer_bits(u64);

int kvm_get_msr(struct kvm_vcpu *vcpu, u32 msr_index, u64 *data);

int kvm_set_msr(struct kvm_vcpu *vcpu, u32 msr_index, u64 data);