From: Joerg Roedel <joerg.roedel@amd.com>
To: Avi Kivity <avi@redhat.com>, Marcelo Tosatti <mtosatti@redhat.com>
Cc: <kvm@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
Joerg Roedel <joerg.roedel@amd.com>
Subject: [PATCH 2/9] KVM: SVM: Add checks for CRx read and write intercepts
Date: Wed, 24 Nov 2010 19:18:28 +0100 [thread overview]
Message-ID: <1290622715-8382-3-git-send-email-joerg.roedel@amd.com> (raw)
In-Reply-To: <1290622715-8382-1-git-send-email-joerg.roedel@amd.com>
This patch add code to check for any CRx read, write, and
the selective-cr0 intercepts for instructions emulated in
software by KVM.
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
---
arch/x86/kvm/svm.c | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 72 insertions(+), 1 deletions(-)
diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
index d1721c2..29f0491 100644
--- a/arch/x86/kvm/svm.c
+++ b/arch/x86/kvm/svm.c
@@ -3622,7 +3622,78 @@ static void svm_fpu_deactivate(struct kvm_vcpu *vcpu)
static int svm_insn_intercepted(struct kvm_vcpu *vcpu,
struct x86_emulate_ctxt *ctxt)
{
- return X86EMUL_CONTINUE;
+ struct decode_cache *c = &ctxt->decode;
+ struct vcpu_svm *svm = to_svm(vcpu);
+ struct vmcb *vmcb = svm->vmcb;
+ int vmexit, ret;
+
+ if (!is_nested(svm))
+ return X86EMUL_CONTINUE;
+
+ ret = X86EMUL_CONTINUE;
+
+ if (!c->twobyte)
+ goto out;
+
+ switch (c->b) {
+ case 0x01:
+ /* 0x0f 0x01 and modrm_mod == 3 encodes special instructions */
+ if (c->modrm_mod == 3)
+ break;
+
+ switch (c->modrm_reg) {
+ case 0x04: /* SMSW */
+ vmcb->control.exit_code = SVM_EXIT_READ_CR0;
+ break;
+ case 0x06: { /* LMSW */
+ u64 cr0, val;
+
+ vmcb->control.exit_code = SVM_EXIT_WRITE_CR0;
+
+ if (svm->nested.intercept_cr_write & INTERCEPT_CR0_MASK)
+ break;
+
+ /* check for selective-cr0 special case */
+ cr0 = vcpu->arch.cr0 & ~SVM_CR0_SELECTIVE_MASK & 0xf;
+ val = c->src.val & ~SVM_CR0_SELECTIVE_MASK & 0xf;
+
+ if (cr0 ^ val)
+ vmcb->control.exit_code = SVM_EXIT_CR0_SEL_WRITE;
+
+ break;
+ }
+ }
+ case 0x06: /* CLTS */
+ vmcb->control.exit_code = SVM_EXIT_WRITE_CR0;
+ break;
+ case 0x20: /* CR read */
+ vmcb->control.exit_code = SVM_EXIT_READ_CR0 + c->modrm_reg;
+ break;
+ case 0x22: /* CR write */
+ vmcb->control.exit_code = SVM_EXIT_WRITE_CR0 + c->modrm_reg;
+ if (c->modrm_reg == 0 &&
+ !(svm->nested.intercept_cr_write & INTERCEPT_CR0_MASK)) {
+ /* check for selective-cr0 special case */
+ u64 cr0, val;
+
+ cr0 = vcpu->arch.cr0 & ~SVM_CR0_SELECTIVE_MASK;
+ val = c->src.val & ~SVM_CR0_SELECTIVE_MASK;
+
+ if (cr0 ^ val)
+ vmcb->control.exit_code = SVM_EXIT_CR0_SEL_WRITE;
+ }
+ break;
+ }
+
+ vmcb->control.next_rip = ctxt->eip;
+ vmexit = nested_svm_exit_handled(svm);
+
+ ret = (vmexit == NESTED_EXIT_DONE) ? X86EMUL_INTERCEPTED
+ : X86EMUL_CONTINUE;
+
+out:
+
+ return ret;
}
static struct kvm_x86_ops svm_x86_ops = {
--
1.7.1
next prev parent reply other threads:[~2010-11-24 18:34 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-24 18:18 [PATCH 0/9] KVM: Make the instruction emulator aware of Nested Virtualization Joerg Roedel
2010-11-24 18:18 ` [PATCH 1/9] KVM: Add infrastructure to emulate instruction intercepts Joerg Roedel
2010-11-24 18:18 ` Joerg Roedel [this message]
2010-11-24 18:18 ` [PATCH 3/9] KVM: SVM: Add checks for DRx read and write intercepts Joerg Roedel
2010-11-24 18:18 ` [PATCH 4/9] KVM: SVM: Add intercept checks for descriptor table accesses Joerg Roedel
2010-11-24 18:18 ` [PATCH 5/9] KVM: SVM: Add checks for all group 7 instructions Joerg Roedel
2010-11-24 18:18 ` [PATCH 6/9] KVM: SVM: Add intercept checks for remaining twobyte instructions Joerg Roedel
2010-11-24 18:18 ` [PATCH 7/9] KVM: SVM: Add intercept checks for one-byte instructions Joerg Roedel
2010-11-24 18:18 ` [PATCH 8/9] KVM: SVM: Add checks for IO instructions Joerg Roedel
2010-11-24 18:18 ` [PATCH 9/9] KVM: SVM: Remove nested sel_cr0_write handling code Joerg Roedel
2010-11-24 19:13 ` [PATCH 0/9] KVM: Make the instruction emulator aware of Nested Virtualization Avi Kivity
2010-11-25 11:46 ` Roedel, Joerg
2010-11-25 13:13 ` Roedel, Joerg
2010-11-25 15:17 ` Avi Kivity
2010-11-25 16:23 ` Roedel, Joerg
2010-11-29 17:23 ` Valdis.Kletnieks
2010-11-29 18:32 ` Joerg Roedel
2010-11-29 20:01 ` Valdis.Kletnieks
2010-11-30 8:47 ` Roedel, Joerg
2010-11-25 15:15 ` Avi Kivity
2010-11-25 18:21 ` Roedel, Joerg
2010-11-26 8:28 ` Avi Kivity
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1290622715-8382-3-git-send-email-joerg.roedel@amd.com \
--to=joerg.roedel@amd.com \
--cc=avi@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mtosatti@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox