Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...

[linux-2.6] / arch / x86 / kvm / x86_emulate.c

diff --git a/arch/x86/kvm/x86_emulate.c b/arch/x86/kvm/x86_emulate.c
index 008db4dad7b2bfba33b68192f7adaa244ff7181f..932f216d890c343bc5ca4ebfd8a15e1955334969 100644 (file)
--- a/arch/x86/kvm/x86_emulate.c
+++ b/arch/x86/kvm/x86_emulate.c
@@ -275,12 +275,15 @@ static u16 group_table[] = {
        SrcMem | ModRM, 0, SrcMem | ModRM | Stack, 0,
        [Group7*8] =
        0, 0, ModRM | SrcMem, ModRM | SrcMem,
-       SrcNone | ModRM | DstMem, 0, SrcMem | ModRM, SrcMem | ModRM | ByteOp,
+       SrcNone | ModRM | DstMem | Mov, 0,
+       SrcMem16 | ModRM | Mov, SrcMem | ModRM | ByteOp,
 };
 
 static u16 group2_table[] = {
        [Group7*8] =
-       SrcNone | ModRM, 0, 0, 0, SrcNone | ModRM | DstMem, 0, SrcMem | ModRM, 0,
+       SrcNone | ModRM, 0, 0, 0,
+       SrcNone | ModRM | DstMem | Mov, 0,
+       SrcMem16 | ModRM | Mov, 0,
 };
 
 /* EFLAGS bit definitions. */
@@ -371,7 +374,7 @@ static u16 group2_table[] = {
 
 #define __emulate_2op(_op,_src,_dst,_eflags,_bx,_by,_wx,_wy,_lx,_ly,_qx,_qy) \
        do {                                                                 \
-               unsigned long _tmp;                                          \
+               unsigned long __tmp;                                         \
                switch ((_dst).bytes) {                                      \
                case 1:                                                      \
                        __asm__ __volatile__ (                               \
@@ -379,7 +382,7 @@ static u16 group2_table[] = {
                                _op"b %"_bx"3,%1; "                          \
                                _POST_EFLAGS("0", "4", "2")                  \
                                : "=m" (_eflags), "=m" ((_dst).val),         \
-                                 "=&r" (_tmp)                               \
+                                 "=&r" (__tmp)                              \
                                : _by ((_src).val), "i" (EFLAGS_MASK));      \
                        break;                                               \
                default:                                                     \
@@ -501,23 +504,19 @@ register_address(struct decode_cache *c, unsigned long base, unsigned long reg)
        return base + address_mask(c, reg);
 }
 
-#define register_address_increment(reg, inc)                            \
-       do {                                                            \
-               /* signed type ensures sign extension to long */        \
-               int _inc = (inc);                                       \
-               if (c->ad_bytes == sizeof(unsigned long))               \
-                       (reg) += _inc;                                  \
-               else                                                    \
-                       (reg) = ((reg) &                                \
-                                ~ad_mask(c)) | \
-                               (((reg) + _inc) &                       \
-                                ad_mask(c));   \
-       } while (0)
+static inline void
+register_address_increment(struct decode_cache *c, unsigned long *reg, int inc)
+{
+       if (c->ad_bytes == sizeof(unsigned long))
+               *reg += inc;
+       else
+               *reg = (*reg & ~ad_mask(c)) | ((*reg + inc) & ad_mask(c));
+}
 
-#define JMP_REL(rel)                                                   \
-       do {                                                            \
-               register_address_increment(c->eip, rel);                \
-       } while (0)
+static inline void jmp_rel(struct decode_cache *c, int rel)
+{
+       register_address_increment(c, &c->eip, rel);
+}
 
 static int do_fetch_insn_byte(struct x86_emulate_ctxt *ctxt,
                              struct x86_emulate_ops *ops,
@@ -678,8 +677,9 @@ static int decode_modrm(struct x86_emulate_ctxt *ctxt,
        c->use_modrm_ea = 1;
 
        if (c->modrm_mod == 3) {
-               c->modrm_val = *(unsigned long *)
-                       decode_register(c->modrm_rm, c->regs, c->d & ByteOp);
+               c->modrm_ptr = decode_register(c->modrm_rm,
+                                              c->regs, c->d & ByteOp);
+               c->modrm_val = *(unsigned long *)c->modrm_ptr;
                return rc;
        }
 
@@ -1005,6 +1005,8 @@ done_prefixes:
                 */
                if ((c->d & ModRM) && c->modrm_mod == 3) {
                        c->src.type = OP_REG;
+                       c->src.val = c->modrm_val;
+                       c->src.ptr = c->modrm_ptr;
                        break;
                }
                c->src.type = OP_MEM;
@@ -1048,6 +1050,8 @@ done_prefixes:
        case DstMem:
                if ((c->d & ModRM) && c->modrm_mod == 3) {
                        c->dst.type = OP_REG;
+                       c->dst.val = c->dst.orig_val = c->modrm_val;
+                       c->dst.ptr = c->modrm_ptr;
                        break;
                }
                c->dst.type = OP_MEM;
@@ -1065,7 +1069,7 @@ static inline void emulate_push(struct x86_emulate_ctxt *ctxt)
        c->dst.type  = OP_MEM;
        c->dst.bytes = c->op_bytes;
        c->dst.val = c->src.val;
-       register_address_increment(c->regs[VCPU_REGS_RSP], -c->op_bytes);
+       register_address_increment(c, &c->regs[VCPU_REGS_RSP], -c->op_bytes);
        c->dst.ptr = (void *) register_address(c, ctxt->ss_base,
                                               c->regs[VCPU_REGS_RSP]);
 }
@@ -1082,7 +1086,7 @@ static inline int emulate_grp1a(struct x86_emulate_ctxt *ctxt,
        if (rc != 0)
                return rc;
 
-       register_address_increment(c->regs[VCPU_REGS_RSP], c->dst.bytes);
+       register_address_increment(c, &c->regs[VCPU_REGS_RSP], c->dst.bytes);
 
        return 0;
 }
@@ -1395,7 +1399,7 @@ special_insn:
                c->dst.type  = OP_MEM;
                c->dst.bytes = c->op_bytes;
                c->dst.val = c->src.val;
-               register_address_increment(c->regs[VCPU_REGS_RSP],
+               register_address_increment(c, &c->regs[VCPU_REGS_RSP],
                                           -c->op_bytes);
                c->dst.ptr = (void *) register_address(
                        c, ctxt->ss_base, c->regs[VCPU_REGS_RSP]);
@@ -1407,7 +1411,7 @@ special_insn:
                        c->op_bytes, ctxt->vcpu)) != 0)
                        goto done;
 
-               register_address_increment(c->regs[VCPU_REGS_RSP],
+               register_address_increment(c, &c->regs[VCPU_REGS_RSP],
                                           c->op_bytes);
                c->dst.type = OP_NONE;  /* Disable writeback. */
                break;
@@ -1459,7 +1463,7 @@ special_insn:
                int rel = insn_fetch(s8, 1, c->eip);
 
                if (test_cc(c->b, ctxt->eflags))
-                       JMP_REL(rel);
+                       jmp_rel(c, rel);
                break;
        }
        case 0x80 ... 0x83:     /* Grp1 */
@@ -1511,7 +1515,7 @@ special_insn:
        case 0x88 ... 0x8b:     /* mov */
                goto mov;
        case 0x8d: /* lea r16/r32, m */
-               c->dst.val = c->modrm_val;
+               c->dst.val = c->modrm_ea;
                break;
        case 0x8f:              /* pop (sole member of Grp1a) */
                rc = emulate_grp1a(ctxt, ops);
@@ -1545,10 +1549,10 @@ special_insn:
                                        &c->dst.val,
                                        c->dst.bytes, ctxt->vcpu)) != 0)
                        goto done;
-               register_address_increment(c->regs[VCPU_REGS_RSI],
+               register_address_increment(c, &c->regs[VCPU_REGS_RSI],
                                       (ctxt->eflags & EFLG_DF) ? -c->dst.bytes
                                                           : c->dst.bytes);
-               register_address_increment(c->regs[VCPU_REGS_RDI],
+               register_address_increment(c, &c->regs[VCPU_REGS_RDI],
                                       (ctxt->eflags & EFLG_DF) ? -c->dst.bytes
                                                           : c->dst.bytes);
                break;
@@ -1580,10 +1584,10 @@ special_insn:
 
                emulate_2op_SrcV("cmp", c->src, c->dst, ctxt->eflags);
 
-               register_address_increment(c->regs[VCPU_REGS_RSI],
+               register_address_increment(c, &c->regs[VCPU_REGS_RSI],
                                       (ctxt->eflags & EFLG_DF) ? -c->src.bytes
                                                                  : c->src.bytes);
-               register_address_increment(c->regs[VCPU_REGS_RDI],
+               register_address_increment(c, &c->regs[VCPU_REGS_RDI],
                                       (ctxt->eflags & EFLG_DF) ? -c->dst.bytes
                                                                  : c->dst.bytes);
 
@@ -1595,7 +1599,7 @@ special_insn:
                                                   ctxt->es_base,
                                                   c->regs[VCPU_REGS_RDI]);
                c->dst.val = c->regs[VCPU_REGS_RAX];
-               register_address_increment(c->regs[VCPU_REGS_RDI],
+               register_address_increment(c, &c->regs[VCPU_REGS_RDI],
                                       (ctxt->eflags & EFLG_DF) ? -c->dst.bytes
                                                           : c->dst.bytes);
                break;
@@ -1611,7 +1615,7 @@ special_insn:
                                                 c->dst.bytes,
                                                 ctxt->vcpu)) != 0)
                        goto done;
-               register_address_increment(c->regs[VCPU_REGS_RSI],
+               register_address_increment(c, &c->regs[VCPU_REGS_RSI],
                                       (ctxt->eflags & EFLG_DF) ? -c->dst.bytes
                                                           : c->dst.bytes);
                break;
@@ -1650,14 +1654,14 @@ special_insn:
                        goto cannot_emulate;
                }
                c->src.val = (unsigned long) c->eip;
-               JMP_REL(rel);
+               jmp_rel(c, rel);
                c->op_bytes = c->ad_bytes;
                emulate_push(ctxt);
                break;
        }
        case 0xe9: /* jmp rel */
        case 0xeb: /* jmp rel short */
-               JMP_REL(c->src.val);
+               jmp_rel(c, c->src.val);
                c->dst.type = OP_NONE; /* Disable writeback. */
                break;
        case 0xf4:              /* hlt */
@@ -1723,7 +1727,10 @@ twobyte_insn:
                        if (rc)
                                goto done;
 
-                       kvm_emulate_hypercall(ctxt->vcpu);
+                       /* Let the processor re-execute the fixed hypercall */
+                       c->eip = ctxt->vcpu->arch.rip;
+                       /* Disable writeback. */
+                       c->dst.type = OP_NONE;
                        break;
                case 2: /* lgdt */
                        rc = read_descriptor(ctxt, ops, c->src.ptr,
@@ -1731,6 +1738,8 @@ twobyte_insn:
                        if (rc)
                                goto done;
                        realmode_lgdt(ctxt->vcpu, size, address);
+                       /* Disable writeback. */
+                       c->dst.type = OP_NONE;
                        break;
                case 3: /* lidt/vmmcall */
                        if (c->modrm_mod == 3 && c->modrm_rm == 1) {
@@ -1746,27 +1755,26 @@ twobyte_insn:
                                        goto done;
                                realmode_lidt(ctxt->vcpu, size, address);
                        }
+                       /* Disable writeback. */
+                       c->dst.type = OP_NONE;
                        break;
                case 4: /* smsw */
-                       if (c->modrm_mod != 3)
-                               goto cannot_emulate;
-                       *(u16 *)&c->regs[c->modrm_rm]
-                               = realmode_get_cr(ctxt->vcpu, 0);
+                       c->dst.bytes = 2;
+                       c->dst.val = realmode_get_cr(ctxt->vcpu, 0);
                        break;
                case 6: /* lmsw */
-                       if (c->modrm_mod != 3)
-                               goto cannot_emulate;
-                       realmode_lmsw(ctxt->vcpu, (u16)c->modrm_val,
-                                                 &ctxt->eflags);
+                       realmode_lmsw(ctxt->vcpu, (u16)c->src.val,
+                                     &ctxt->eflags);
+                       c->dst.type = OP_NONE;
                        break;
                case 7: /* invlpg*/
                        emulate_invlpg(ctxt->vcpu, memop);
+                       /* Disable writeback. */
+                       c->dst.type = OP_NONE;
                        break;
                default:
                        goto cannot_emulate;
                }
-               /* Disable writeback. */
-               c->dst.type = OP_NONE;
                break;
        case 0x06:
                emulate_clts(ctxt->vcpu);
@@ -1857,7 +1865,7 @@ twobyte_insn:
                        goto cannot_emulate;
                }
                if (test_cc(c->b, ctxt->eflags))
-                       JMP_REL(rel);
+                       jmp_rel(c, rel);
                c->dst.type = OP_NONE;
                break;
        }