On 03/28/2011 12:46 PM, Joerg Roedel wrote:
This patch add intercept checks into the KVM instruction
emulator to check for the 8 instructions that access the
descriptor table addresses.
+static struct opcode group6[] = {
+ DI(ModRM, sldt),
+ DI(ModRM, str),
+ DI(ModRM | Priv, lldt),
+ DI(ModRM | Priv, ltr),
+ N, N, N, N,
+};
+
static struct group_dual group7 = { {
- N, N, DI(ModRM | SrcMem | Priv, lgdt), DI(ModRM | SrcMem | Priv, lidt),
+ DI(ModRM | DstMem | Priv, sgdt), DI(ModRM | DstMem | Priv, sidt),
+ DI(ModRM | SrcMem | Priv, lgdt), DI(ModRM | SrcMem | Priv, lidt),
| Mov, to avoid RMW for SIDT, for example. Also need to indicate the
operand size correctly.
diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
index 381b038..485a09f 100644
--- a/arch/x86/kvm/svm.c
+++ b/arch/x86/kvm/svm.c
@@ -3871,6 +3871,10 @@ static void svm_fpu_deactivate(struct kvm_vcpu *vcpu)
#define POST_EX(exit) { .exit_code = (exit), \
.stage = X86_ICPT_POST_EXCEPT, \
.valid = true }
+#define POST_MEM(exit) { .exit_code = (exit), \
+ .stage = X86_ICPT_POST_MEMACCESS, \
+ .valid = true }
+
static struct __x86_intercept {
u32 exit_code;
@@ -3884,9 +3888,18 @@ static struct __x86_intercept {
[x86_intercept_smsw] = POST_EX(SVM_EXIT_READ_CR0),
[x86_intercept_dr_read] = POST_EX(SVM_EXIT_READ_DR0),
[x86_intercept_dr_write] = POST_EX(SVM_EXIT_WRITE_DR0),
+ [x86_intercept_sldt] = POST_MEM(SVM_EXIT_LDTR_READ),
+ [x86_intercept_str] = POST_MEM(SVM_EXIT_TR_READ),
+ [x86_intercept_lldt] = POST_MEM(SVM_EXIT_LDTR_WRITE),
+ [x86_intercept_ltr] = POST_MEM(SVM_EXIT_TR_WRITE),
+ [x86_intercept_sgdt] = POST_MEM(SVM_EXIT_GDTR_READ),
+ [x86_intercept_sidt] = POST_MEM(SVM_EXIT_IDTR_READ),
+ [x86_intercept_lgdt] = POST_MEM(SVM_EXIT_GDTR_WRITE),
+ [x86_intercept_lidt] = POST_MEM(SVM_EXIT_IDTR_WRITE),
};
Spec says POST_EX()?
#undef POST_EX
+#undef POST_MEM
static int svm_check_intercept(struct kvm_vcpu *vcpu,
struct x86_instruction_info *info,
--
error compiling committee.c: too many arguments to function
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
