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 8/9] KVM: SVM: Add checks for IO instructions
Date: Wed, 24 Nov 2010 19:18:34 +0100 [thread overview]
Message-ID: <1290622715-8382-9-git-send-email-joerg.roedel@amd.com> (raw)
In-Reply-To: <1290622715-8382-1-git-send-email-joerg.roedel@amd.com>
This patch adds code to check for IOIO intercepts on
instructions decoded by the KVM instruction emulator.
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
---
arch/x86/kvm/svm.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 55 insertions(+), 0 deletions(-)
diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
index 2a30b5b..a2c513d 100644
--- a/arch/x86/kvm/svm.c
+++ b/arch/x86/kvm/svm.c
@@ -3668,6 +3668,47 @@ static void svm_check_group7(struct vmcb *vmcb, struct x86_emulate_ctxt *ctxt)
}
}
+static void svm_check_ioio(struct vmcb *vmcb, struct x86_emulate_ctxt *ctxt)
+{
+ struct decode_cache *c;
+ u32 bytes, seg;
+ u32 exit_info;
+
+ c = &ctxt->decode;
+ /* Encode Port */
+ exit_info = (c->regs[VCPU_REGS_RDX] & 0xffff) << 16;
+ seg = 0;
+
+ /* Encode Address Size */
+ exit_info |= (u32)c->ad_bytes << (SVM_IOIO_ASIZE_SHIFT - 1);
+
+ if (c->rep_prefix)
+ exit_info |= SVM_IOIO_REP_MASK;
+
+ if ((c->b & 0x06) == 0x06) {
+ /* OUT* Instruction */
+ bytes = c->dst.bytes;
+ } else {
+ /* IN* Instruction */
+ bytes = c->src.bytes;
+ exit_info |= SVM_IOIO_TYPE_MASK;
+ }
+
+ /* Encode Data Size */
+ bytes = min(bytes, 4u);
+ exit_info |= bytes << SVM_IOIO_SIZE_SHIFT;
+
+ /* Check for the string variants */
+ if ((c->b & 0xf0) == 0x60) {
+ exit_info |= SVM_IOIO_STR_MASK;
+ exit_info |= (seg & 0x07) << 10;
+ }
+
+ vmcb->control.exit_info_1 = exit_info;
+ vmcb->control.exit_info_2 = ctxt->eip;
+ vmcb->control.exit_code = SVM_EXIT_IOIO;
+}
+
static void svm_check_onebyte(struct vmcb *vmcb, struct x86_emulate_ctxt *ctxt)
{
struct decode_cache *c = &ctxt->decode;
@@ -3685,6 +3726,20 @@ static void svm_check_onebyte(struct vmcb *vmcb, struct x86_emulate_ctxt *ctxt)
case 0xcd: /* INTn */
vmcb->control.exit_code = SVM_EXIT_SWINT;
break;
+ case 0x6c: /* INS */
+ case 0x6d:
+ case 0xe4: /* IN */
+ case 0xe5:
+ case 0xec:
+ case 0xed:
+ case 0x6e: /* OUTS */
+ case 0x6f:
+ case 0xe6: /* OUT */
+ case 0xe7:
+ case 0xee:
+ case 0xef:
+ svm_check_ioio(vmcb, ctxt);
+ break;
case 0xcf: /* IRET */
vmcb->control.exit_code = SVM_EXIT_IRET;
break;
--
1.7.1
next prev parent reply other threads:[~2010-11-24 18:18 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 ` [PATCH 2/9] KVM: SVM: Add checks for CRx read and write intercepts Joerg Roedel
2010-11-24 18:18 ` [PATCH 3/9] KVM: SVM: Add checks for DRx " 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 ` Joerg Roedel [this message]
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-9-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