From: Avi Kivity <avi@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: kvm@vger.kernel.org, Mohammed Gamal <m.gamal005@gmail.com>
Subject: [PATCH 05/25] KVM: x86 emulator: Add in/out instructions (opcodes 0xe4-0xe7, 0xec-0xef)
Date: Sun, 28 Sep 2008 18:44:41 +0300 [thread overview]
Message-ID: <1222616701-1206-6-git-send-email-avi@redhat.com> (raw)
In-Reply-To: <1222616701-1206-1-git-send-email-avi@redhat.com>
From: Mohammed Gamal <m.gamal005@gmail.com>
The patch adds in/out instructions to the x86 emulator.
The instruction was encountered while running the BIOS while using
the invalid guest state emulation patch.
Signed-off-by: Mohammed Gamal <m.gamal005@gmail.com>
Signed-off-by: Avi Kivity <avi@qumranet.com>
---
arch/x86/kvm/x86_emulate.c | 35 +++++++++++++++++++++++++++++++++--
1 files changed, 33 insertions(+), 2 deletions(-)
diff --git a/arch/x86/kvm/x86_emulate.c b/arch/x86/kvm/x86_emulate.c
index 944f1f4..3ac2f14 100644
--- a/arch/x86/kvm/x86_emulate.c
+++ b/arch/x86/kvm/x86_emulate.c
@@ -177,11 +177,14 @@ static u16 opcode_table[256] = {
/* 0xD8 - 0xDF */
0, 0, 0, 0, 0, 0, 0, 0,
/* 0xE0 - 0xE7 */
- 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0,
+ SrcNone | ByteOp | ImplicitOps, SrcNone | ImplicitOps,
+ SrcNone | ByteOp | ImplicitOps, SrcNone | ImplicitOps,
/* 0xE8 - 0xEF */
ImplicitOps | Stack, SrcImm | ImplicitOps,
ImplicitOps, SrcImmByte | ImplicitOps,
- 0, 0, 0, 0,
+ SrcNone | ByteOp | ImplicitOps, SrcNone | ImplicitOps,
+ SrcNone | ByteOp | ImplicitOps, SrcNone | ImplicitOps,
/* 0xF0 - 0xF7 */
0, 0, 0, 0,
ImplicitOps, ImplicitOps, Group | Group3_Byte, Group | Group3,
@@ -1259,6 +1262,8 @@ x86_emulate_insn(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops)
u64 msr_data;
unsigned long saved_eip = 0;
struct decode_cache *c = &ctxt->decode;
+ unsigned int port;
+ int io_dir_in;
int rc = 0;
/* Shadow copy of register state. Committed on successful emulation.
@@ -1687,6 +1692,16 @@ special_insn:
c->src.val = c->regs[VCPU_REGS_RCX];
emulate_grp2(ctxt);
break;
+ case 0xe4: /* inb */
+ case 0xe5: /* in */
+ port = insn_fetch(u8, 1, c->eip);
+ io_dir_in = 1;
+ goto do_io;
+ case 0xe6: /* outb */
+ case 0xe7: /* out */
+ port = insn_fetch(u8, 1, c->eip);
+ io_dir_in = 0;
+ goto do_io;
case 0xe8: /* call (near) */ {
long int rel;
switch (c->op_bytes) {
@@ -1737,6 +1752,22 @@ special_insn:
jmp_rel(c, c->src.val);
c->dst.type = OP_NONE; /* Disable writeback. */
break;
+ case 0xec: /* in al,dx */
+ case 0xed: /* in (e/r)ax,dx */
+ port = c->regs[VCPU_REGS_RDX];
+ io_dir_in = 1;
+ goto do_io;
+ case 0xee: /* out al,dx */
+ case 0xef: /* out (e/r)ax,dx */
+ port = c->regs[VCPU_REGS_RDX];
+ io_dir_in = 0;
+ do_io: if (kvm_emulate_pio(ctxt->vcpu, NULL, io_dir_in,
+ (c->d & ByteOp) ? 1 : c->op_bytes,
+ port) != 0) {
+ c->eip = saved_eip;
+ goto cannot_emulate;
+ }
+ return 0;
case 0xf4: /* hlt */
ctxt->vcpu->arch.halt_request = 1;
break;
--
1.6.0.1
next prev parent reply other threads:[~2008-09-28 15:47 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-28 15:44 [PATCH 00/25] KVM Updates for 2.6.28 merge window (part 3 of 3) Avi Kivity
2008-09-28 15:44 ` [PATCH 01/25] KVM: x86 emulator: Add std and cld instructions (opcodes 0xfc-0xfd) Avi Kivity
2008-09-28 15:44 ` [PATCH 02/25] KVM: ia64: Implement kvm_arch_vcpu_ioctl_{set,get}_mpstate Avi Kivity
2008-09-28 15:44 ` [PATCH 03/25] KVM: MMU: Modify kvm_shadow_walk.entry to accept u64 addr Avi Kivity
2008-09-28 15:44 ` [PATCH 04/25] KVM: Add statistics for guest irq injections Avi Kivity
2008-09-28 15:44 ` Avi Kivity [this message]
2008-09-28 15:44 ` [PATCH 06/25] KVM: x86: do not execute halted vcpus Avi Kivity
2008-09-28 15:44 ` [PATCH 07/25] KVM: x86 emulator: Add call near absolute instruction (opcode 0xff/2) Avi Kivity
2008-09-28 15:44 ` [PATCH 08/25] KVM: x86: unhalt vcpu0 on reset Avi Kivity
2008-09-28 15:44 ` [PATCH 09/25] KVM: ppc: kvmppc_44x_shadow_release() does not require mmap_sem to be locked Avi Kivity
2008-09-28 15:44 ` [PATCH 10/25] KVM: VMX: Cleanup stalled INTR_INFO read Avi Kivity
2008-09-28 15:44 ` [PATCH 11/25] KVM: x86 emulator: fix jmp r/m64 instruction Avi Kivity
2008-09-28 15:44 ` [PATCH 12/25] add MAINTAINERS entry for the KVM AMD module Avi Kivity
2008-09-28 15:44 ` [PATCH 13/25] x86: Move VMX MSRs to msr-index.h Avi Kivity
2008-09-28 15:44 ` [PATCH 14/25] KVM: VMX: Rename IA32_FEATURE_CONTROL bits Avi Kivity
2008-09-28 15:44 ` [PATCH 15/25] x86: Move FEATURE_CONTROL bits to msr-index.h Avi Kivity
2008-09-28 15:44 ` [PATCH 16/25] KVM: x86 emulator: Add DstAcc operand type Avi Kivity
2008-09-28 15:44 ` [PATCH 17/25] KVM: x86 emulator: Add cmp al, imm and cmp ax, imm instructions (ocodes 3c, 3d) Avi Kivity
2008-09-28 15:44 ` [PATCH 18/25] KVM: x86 emulator: Use DstAcc for 'and' Avi Kivity
2008-09-28 15:44 ` [PATCH 19/25] VT-d: Changes to support KVM Avi Kivity
2008-09-28 15:44 ` [PATCH 20/25] KVM: Device Assignment with VT-d Avi Kivity
2008-09-28 15:44 ` [PATCH 21/25] KVM: Device Assignment: Free device structures if IRQ allocation fails Avi Kivity
2008-09-28 15:44 ` [PATCH 22/25] KVM: opencode gfn_to_page in kvm_vm_fault Avi Kivity
2008-09-28 15:44 ` [PATCH 23/25] KVM: switch to get_user_pages_fast Avi Kivity
2008-09-28 15:45 ` [PATCH 24/25] KVM: x86.c make kvm_load_realmode_segment static Avi Kivity
2008-09-28 15:45 ` [PATCH 25/25] MAINTAINERS: Update Avi Kivity's email address 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=1222616701-1206-6-git-send-email-avi@redhat.com \
--to=avi@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=m.gamal005@gmail.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
Powered by JetHome