diff options
author | Joerg Roedel <joerg.roedel@amd.com> | 2007-07-18 19:51:36 +0300 |
---|---|---|
committer | Willy Tarreau <w@1wt.eu> | 2007-08-25 17:24:02 +0200 |
commit | d4d4eb0442422123ac0fb4a560af2ad481817397 (patch) | |
tree | 3eda70cc6af36bc2d7dc3948581e1445334b2154 /drivers | |
parent | c3338ef326869755751ae61897c5b475439f557d (diff) |
[PATCH] KVM: SVM: Reliably detect if SVM was disabled by BIOS
This patch adds an implementation to the svm is_disabled function to
detect reliably if the BIOS disabled the SVM feature in the CPU. This
fixes the issues with kernel panics when loading the kvm-amd module on
machines where SVM is available but disabled.
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
Signed-off-by: Avi Kivity <avi@qumranet.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Willy Tarreau <w@1wt.eu>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/kvm/svm.c | 6 | ||||
-rw-r--r-- | drivers/kvm/svm.h | 3 |
2 files changed, 9 insertions, 0 deletions
diff --git a/drivers/kvm/svm.c b/drivers/kvm/svm.c index c79df79307ed..1e90401b5668 100644 --- a/drivers/kvm/svm.c +++ b/drivers/kvm/svm.c @@ -1655,6 +1655,12 @@ static void svm_inject_page_fault(struct kvm_vcpu *vcpu, static int is_disabled(void) { + u64 vm_cr; + + rdmsrl(MSR_VM_CR, vm_cr); + if (vm_cr & (1 << SVM_VM_CR_SVM_DISABLE)) + return 1; + return 0; } diff --git a/drivers/kvm/svm.h b/drivers/kvm/svm.h index df731c3fb588..e8f034955646 100644 --- a/drivers/kvm/svm.h +++ b/drivers/kvm/svm.h @@ -172,8 +172,11 @@ struct __attribute__ ((__packed__)) vmcb { #define SVM_CPUID_FUNC 0x8000000a #define MSR_EFER_SVME_MASK (1ULL << 12) +#define MSR_VM_CR 0xc0010114 #define MSR_VM_HSAVE_PA 0xc0010117ULL +#define SVM_VM_CR_SVM_DISABLE 4 + #define SVM_SELECTOR_S_SHIFT 4 #define SVM_SELECTOR_DPL_SHIFT 5 #define SVM_SELECTOR_P_SHIFT 7 |