Add decoding of 16bit second immediate argument.
PATCH v2 1/10 Add decoding of 16bit second immediate argument.
Such as segment number in lcall/ljmp
---
arch/x86/kvm/x86_emulate.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-)
arch/x86/kvm/x86_emulate.c +7 -0
@@ -76,6 +76,7 @@#define Src2CL (1<<29)#define Src2ImmByte (2<<29)#define Src2One (3<<29) +#define Src2Imm16 (4<<29)#define Src2Mask (7<<29)enum {
@@ -1072,6 +1073,12 @@ done_prefixes: c->src2.bytes =1 ; c->src2.val =insn_fetch (u8,1 , c->eip);break ; +case Src2Imm16: + c->src2.type =OP_IMM ; + c->src2.ptr = (unsigned long *)c->eip; + c->src2.bytes =2 ; + c->src2.val =insn_fetch (u16,2 , c->eip); +break ;case Src2One: c->src2.bytes =1 ; c->src2.val =1 ;
PATCH v2 2/10 Add lcall decoding.
No emulation yet.
---
arch/x86/kvm/x86_emulate.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
arch/x86/kvm/x86_emulate.c +2 -1
@@ -154,7 +154,8 @@ static u32 opcode_table[256] = {/* 0x90 - 0x97 */ DstReg, DstReg, DstReg, DstReg, DstReg, DstReg, DstReg, DstReg,/* 0x98 - 0x9F */ -0 ,0 ,0 ,0 , ImplicitOps | Stack, ImplicitOps | Stack,0 ,0 , +0 ,0 , SrcImm | Src2Imm16 | ImplicitOps,0 , + ImplicitOps | Stack, ImplicitOps | Stack,0 ,0 ,/* 0xA0 - 0xA7 */ ByteOp | DstReg | SrcMem | Mov | MemAbs, DstReg | SrcMem | Mov | MemAbs, ByteOp | DstMem | SrcReg | Mov | MemAbs, DstMem | SrcReg | Mov | MemAbs,
PATCH v2 3/10 Complete ljmp decoding at decode stage.
In reply to Gleb Natapov---
arch/x86/kvm/x86_emulate.c | 25 +++++-------------------- 1 files changed, 5 insertions(+), 20 deletions(-)
arch/x86/kvm/x86_emulate.c +5 -20
@@ -193,7 +193,7 @@ static u32 opcode_table[256] = { SrcNone | ByteOp | ImplicitOps, SrcNone | ImplicitOps,/* 0xE8 - 0xEF */ ImplicitOps | Stack, SrcImm | ImplicitOps, - ImplicitOps, SrcImmByte | ImplicitOps, + SrcImm | Src2Imm16 | ImplicitOps, SrcImmByte | ImplicitOps, SrcNone | ByteOp | ImplicitOps, SrcNone | ImplicitOps, SrcNone | ByteOp | ImplicitOps, SrcNone | ImplicitOps,/* 0xF0 - 0xF7 */
@@ -1805,30 +1805,15 @@ special_insn: }case 0xe9 :/* jmp rel */ goto jmp; -case 0xea :/* jmp far */ { -uint32_t eip; -uint16_t sel; - -switch (c->op_bytes) { -case 2 : - eip =insn_fetch (u16,2 , c->eip); -break ; -case 4 : - eip =insn_fetch (u32,4 , c->eip); -break ; -default : -DPRINTF ("jmp far: Invalid op_bytes\n" ); - goto cannot_emulate; - } - sel =insn_fetch (u16,2 , c->eip); -if (kvm_load_segment_descriptor (ctxt->vcpu, sel,9 ,VCPU_SREG_CS ) <0 ) { +case 0xea :/* jmp far */ +if (kvm_load_segment_descriptor (ctxt->vcpu, c->src2.val,9 , +VCPU_SREG_CS ) <0 ) {DPRINTF ("jmp far: Failed to load CS descriptor\n" ); goto cannot_emulate; } - c->eip = eip; + c->eip = c->src.val;break ; - }case 0xeb : jmp:/* jmp rel short */ jmp_rel (c, c->src.val);
PATCH v2 4/10 Complete short/near jcc decoding in decode stage.
In reply to Gleb Natapov---
arch/x86/kvm/x86_emulate.c | 50 ++++++++++++++++---------------------------- 1 files changed, 18 insertions(+), 32 deletions(-)
arch/x86/kvm/x86_emulate.c +18 -32
@@ -136,11 +136,15 @@ static u32 opcode_table[256] = { SrcNone | ByteOp | ImplicitOps, SrcNone | ImplicitOps,/* insb, insw/insd */ SrcNone | ByteOp | ImplicitOps, SrcNone | ImplicitOps,/* outsb, outsw/outsd */ /* 0x70 - 0x77 */ - ImplicitOps, ImplicitOps, ImplicitOps, ImplicitOps, - ImplicitOps, ImplicitOps, ImplicitOps, ImplicitOps, + ImplicitOps | SrcImmByte, ImplicitOps | SrcImmByte, + ImplicitOps | SrcImmByte, ImplicitOps | SrcImmByte, + ImplicitOps | SrcImmByte, ImplicitOps | SrcImmByte, + ImplicitOps | SrcImmByte, ImplicitOps | SrcImmByte,/* 0x78 - 0x7F */ - ImplicitOps, ImplicitOps, ImplicitOps, ImplicitOps, - ImplicitOps, ImplicitOps, ImplicitOps, ImplicitOps, + ImplicitOps | SrcImmByte, ImplicitOps | SrcImmByte, + ImplicitOps | SrcImmByte, ImplicitOps | SrcImmByte, + ImplicitOps | SrcImmByte, ImplicitOps | SrcImmByte, + ImplicitOps | SrcImmByte, ImplicitOps | SrcImmByte,/* 0x80 - 0x87 */ Group | Group1_80, Group | Group1_81, Group | Group1_82, Group | Group1_83,
@@ -232,10 +236,12 @@ static u32 twobyte_table[256] = {/* 0x70 - 0x7F */ 0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,/* 0x80 - 0x8F */ - ImplicitOps, ImplicitOps, ImplicitOps, ImplicitOps, - ImplicitOps, ImplicitOps, ImplicitOps, ImplicitOps, - ImplicitOps, ImplicitOps, ImplicitOps, ImplicitOps, - ImplicitOps, ImplicitOps, ImplicitOps, ImplicitOps, + SrcImm | ImplicitOps, SrcImm | ImplicitOps, SrcImm | ImplicitOps, + SrcImm | ImplicitOps, SrcImm | ImplicitOps, SrcImm | ImplicitOps, + SrcImm | ImplicitOps, SrcImm | ImplicitOps, SrcImm | ImplicitOps, + SrcImm | ImplicitOps, SrcImm | ImplicitOps, SrcImm | ImplicitOps, + SrcImm | ImplicitOps, SrcImm | ImplicitOps, SrcImm | ImplicitOps, + SrcImm | ImplicitOps,/* 0x90 - 0x9F */ 0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 , /* 0xA0 - 0xA7 */
@@ -1539,13 +1545,10 @@ special_insn:return -1 ; }return 0 ; - case 0x70 ... 0x7f: /* jcc (short) */ { -int rel =insn_fetch (s8,1 , c->eip); - + case 0x70 ... 0x7f: /* jcc (short) */if (test_cc (c->b, ctxt->eflags)) -jmp_rel (c, rel); +jmp_rel (c, c->src.val);break ; - } case 0x80 ... 0x83: /* Grp1 */switch (c->modrm_reg) {case 0 :
@@ -2031,28 +2034,11 @@ twobyte_insn:if (!test_cc (c->b, ctxt->eflags)) c->dst.type =OP_NONE ;/* no writeback */ break ; - case 0x80 ... 0x8f: /* jnz rel, etc*/ { -long int rel; - -switch (c->op_bytes) { -case 2 : - rel =insn_fetch (s16,2 , c->eip); -break ; -case 4 : - rel =insn_fetch (s32,4 , c->eip); -break ; -case 8 : - rel =insn_fetch (s64,8 , c->eip); -break ; -default : -DPRINTF ("jnz: Invalid op_bytes\n" ); - goto cannot_emulate; - } + case 0x80 ... 0x8f: /* jnz rel, etc*/if (test_cc (c->b, ctxt->eflags)) -jmp_rel (c, rel); +jmp_rel (c, c->src.val); c->dst.type =OP_NONE ;break ; - }case 0xa3 : bt:/* bt */ c->dst.type =OP_NONE ;
PATCH v2 5/10 Complete decoding of call near in decode stage.
In reply to Gleb Natapov---
arch/x86/kvm/x86_emulate.c | 15 ++------------- 1 files changed, 2 insertions(+), 13 deletions(-)
arch/x86/kvm/x86_emulate.c +2 -13
@@ -196,7 +196,7 @@ static u32 opcode_table[256] = { SrcNone | ByteOp | ImplicitOps, SrcNone | ImplicitOps, SrcNone | ByteOp | ImplicitOps, SrcNone | ImplicitOps,/* 0xE8 - 0xEF */ - ImplicitOps | Stack, SrcImm | ImplicitOps, + SrcImm | ImplicitOps | Stack, SrcImm | ImplicitOps, SrcImm | Src2Imm16 | ImplicitOps, SrcImmByte | ImplicitOps, SrcNone | ByteOp | ImplicitOps, SrcNone | ImplicitOps, SrcNone | ByteOp | ImplicitOps, SrcNone | ImplicitOps,
@@ -1789,18 +1789,7 @@ special_insn: io_dir_in =0 ; goto do_io;case 0xe8 :/* call (near) */ { -long int rel; -switch (c->op_bytes) { -case 2 : - rel =insn_fetch (s16,2 , c->eip); -break ; -case 4 : - rel =insn_fetch (s32,4 , c->eip); -break ; -default : -DPRINTF ("Call: Invalid op_bytes\n" ); - goto cannot_emulate; - } +long int rel = c->src.val; c->src.val = (unsigned long ) c->eip;jmp_rel (c, rel);emulate_push (ctxt);
PATCH v2 6/10 Add unsigned byte immediate decode.
In reply to Gleb NatapovExtend "Source operand type" opcode description field to 4 bites to accommodate new option.
---
arch/x86/kvm/x86_emulate.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-)
arch/x86/kvm/x86_emulate.c +11 -6
@@ -59,13 +59,14 @@#define SrcImm (5<<4)/* Immediate operand. */ #define SrcImmByte (6<<4)/* 8-bit sign-extended immediate operand. */ #define SrcOne (7<<4)/* Implied '1' */ -#define SrcMask (7<<4) +#define SrcImmUByte (8<<4)/* 8-bit unsigned immediate operand. */ +#define SrcMask (0xf<<4)/* Generic ModRM decode. */ -#define ModRM (1<<7) +#define ModRM (1<<8)/* Destination is only written; never read. */ -#define Mov (1<<8) -#define BitOp (1<<9) -#define MemAbs (1<<10)/* Memory operand is absolute displacement */ +#define Mov (1<<9) +#define BitOp (1<<10) +#define MemAbs (1<<11)/* Memory operand is absolute displacement */ #define String (1<<12)/* String instruction (rep capable) */ #define Stack (1<<13)/* Stack instruction (push/pop) */ #define Group (1<<14)/* Bits 3:5 of modrm byte extend opcode */
@@ -1052,10 +1053,14 @@ done_prefixes: }break ;case SrcImmByte: +case SrcImmUByte: c->src.type =OP_IMM ; c->src.ptr = (unsigned long *)c->eip; c->src.bytes =1 ; - c->src.val =insn_fetch (s8,1 , c->eip); +if ((c->d & SrcMask) == SrcImmByte) + c->src.val =insn_fetch (s8,1 , c->eip); +else + c->src.val =insn_fetch (u8,1 , c->eip);break ;case SrcOne: c->src.bytes =1 ;
PATCH v2 7/10 Completely decode in/out at decoding stage.
In reply to Gleb Natapov---
arch/x86/kvm/x86_emulate.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-)
arch/x86/kvm/x86_emulate.c +6 -4
@@ -194,8 +194,10 @@ static u32 opcode_table[256] = {0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,/* 0xE0 - 0xE7 */ 0 ,0 ,0 ,0 , - SrcNone | ByteOp | ImplicitOps, SrcNone | ImplicitOps, - SrcNone | ByteOp | ImplicitOps, SrcNone | ImplicitOps, + SrcNone | ByteOp | SrcImmUByte | ImplicitOps, + SrcNone | SrcImmUByte | ImplicitOps, + SrcNone | ByteOp | SrcImmUByte | ImplicitOps, + SrcNone | SrcImmUByte | ImplicitOps,/* 0xE8 - 0xEF */ SrcImm | ImplicitOps | Stack, SrcImm | ImplicitOps, SrcImm | Src2Imm16 | ImplicitOps, SrcImmByte | ImplicitOps,
@@ -1785,12 +1787,12 @@ special_insn:break ;case 0xe4 :/* inb */ case 0xe5 :/* in */ - port =insn_fetch (u8,1 , c->eip); + port = c->src.val; io_dir_in =1 ; goto do_io;case 0xe6 :/* outb */ case 0xe7 :/* out */ - port =insn_fetch (u8,1 , c->eip); + port = c->src.val; io_dir_in =0 ; goto do_io;case 0xe8 :/* call (near) */ {
PATCH v2 8/10 Decode soft interrupt instructions.
In reply to Gleb NatapovDo not emulate them yet.
---
arch/x86/kvm/x86_emulate.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
arch/x86/kvm/x86_emulate.c +2 -1
@@ -185,7 +185,8 @@ static u32 opcode_table[256] = {0 , ImplicitOps | Stack,0 ,0 , ByteOp | DstMem | SrcImm | ModRM | Mov, DstMem | SrcImm | ModRM | Mov,/* 0xC8 - 0xCF */ -0 ,0 ,0 , ImplicitOps | Stack,0 ,0 ,0 ,0 , +0 ,0 ,0 , ImplicitOps | Stack, ImplicitOps, ImplicitOps | SrcImmByte, + ImplicitOps, ImplicitOps,/* 0xD0 - 0xD7 */ ByteOp | DstMem | SrcImplicit | ModRM, DstMem | SrcImplicit | ModRM, ByteOp | DstMem | SrcImplicit | ModRM, DstMem | SrcImplicit | ModRM,
PATCH v2 9/10 Add new mode of instruction emulation: skip.
In reply to Gleb NatapovIn the new mode instruction is decoded, but not executed. The EIP is moved to point after the instruction.
---
arch/x86/include/asm/kvm_host.h | 1 + arch/x86/kvm/x86.c | 5 +++++ 2 files changed, 6 insertions(+), 0 deletions(-)
arch/x86/include/asm/kvm_host.h +1 -0
@@ -565,6 +565,7 @@ enum emulation_result {#define EMULTYPE_NO_DECODE (1 << 0)#define EMULTYPE_TRAP_UD (1 << 1) +#define EMULTYPE_SKIP (1 << 2)int emulate_instruction (struct kvm_vcpu *vcpu,struct kvm_run *run,unsigned long cr2,u16 error_code,int emulation_type);void kvm_report_emulation_failure (struct kvm_vcpu *cvpu,const char *context);
arch/x86/kvm/x86.c +5 -0
@@ -2412,6 +2412,11 @@ int emulate_instruction(struct kvm_vcpu *vcpu, } } +if (emulation_type &EMULTYPE_SKIP ) { +kvm_rip_write (vcpu, vcpu->arch.emulate_ctxt.decode.eip); +return EMULATE_DONE ; + } + r =x86_emulate_insn (&vcpu->arch.emulate_ctxt, &emulate_ops);if (vcpu->arch.pio.string)
PATCH v2 10/10 Skip instruction on a task switch only when appropriate.
In reply to Gleb NatapovIf a task switch was initiated because off a task gate in IDT and IDT was accessed because of an external even the instruction should not be skipped.
---
arch/x86/kvm/svm.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-)
arch/x86/kvm/svm.c +9 -2
@@ -1826,6 +1826,7 @@ static int task_switch_interception(struct vcpu_svm *svm,int reason;int int_type = svm->vmcb->control.exit_int_info &SVM_EXITINTINFO_TYPE_MASK ; +int int_vec = svm->vmcb->control.exit_int_info &SVM_EVTINJ_VEC_MASK ; tss_selector = (u16 )svm->vmcb->control.exit_info_1;
@@ -1841,8 +1842,14 @@ static int task_switch_interception(struct vcpu_svm *svm, reason =TASK_SWITCH_CALL ; -if (reason !=TASK_SWITCH_GATE || int_type ==SVM_EXITINTINFO_TYPE_SOFT ) -skip_emulated_instruction (&svm->vcpu); +if (reason !=TASK_SWITCH_GATE || + int_type ==SVM_EXITINTINFO_TYPE_SOFT || + (int_type ==SVM_EXITINTINFO_TYPE_EXEPT && + (int_vec ==OF_VECTOR || int_vec ==BP_VECTOR ))) { +if (emulate_instruction (&svm->vcpu, kvm_run,0 ,0 , +EMULTYPE_SKIP ) !=EMULATE_DONE ) +return 0 ; + }return kvm_task_switch (&svm->vcpu, tss_selector, reason); }