* [PATCH 1/2] KVM: x86 emulator: commit rflags as part of registers commit.
@ 2010-03-21 11:06 Gleb Natapov
2010-03-21 11:06 ` [PATCH 2/2] KVM: x86 emulator: add decoding of CMPXCHG8B dst operand Gleb Natapov
2010-03-21 11:09 ` [PATCH 1/2] KVM: x86 emulator: commit rflags as part of registers commit Gleb Natapov
0 siblings, 2 replies; 7+ messages in thread
From: Gleb Natapov @ 2010-03-21 11:06 UTC (permalink / raw)
To: aci, mtosatti; +Cc: kvm
Make sure that rflags is committed only after successful instruction
emulation.
Signed-off-by: Gleb Natapov <gleb@redhat.com>
---
arch/x86/include/asm/kvm_emulate.h | 1 +
arch/x86/kvm/emulate.c | 1 +
arch/x86/kvm/x86.c | 8 ++++++--
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/arch/x86/include/asm/kvm_emulate.h b/arch/x86/include/asm/kvm_emulate.h
index b5e12c5..a1319c8 100644
--- a/arch/x86/include/asm/kvm_emulate.h
+++ b/arch/x86/include/asm/kvm_emulate.h
@@ -136,6 +136,7 @@ struct x86_emulate_ops {
ulong (*get_cr)(int cr, struct kvm_vcpu *vcpu);
void (*set_cr)(int cr, ulong val, struct kvm_vcpu *vcpu);
int (*cpl)(struct kvm_vcpu *vcpu);
+ void (*set_rflags)(struct kvm_vcpu *vcpu, unsigned long rflags);
};
/* Type, address-of, and value of an instruction's operand. */
diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
index 266576c..c1aa983 100644
--- a/arch/x86/kvm/emulate.c
+++ b/arch/x86/kvm/emulate.c
@@ -2968,6 +2968,7 @@ writeback:
/* Commit shadow register state. */
memcpy(ctxt->vcpu->arch.regs, c->regs, sizeof c->regs);
kvm_rip_write(ctxt->vcpu, c->eip);
+ ops->set_rflags(ctxt->vcpu, ctxt->eflags);
done:
return (rc == X86EMUL_UNHANDLEABLE) ? -1 : 0;
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index bb9a24a..3fa70b3 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -3643,6 +3643,11 @@ static void emulator_set_segment_selector(u16 sel, int seg,
kvm_set_segment(vcpu, &kvm_seg, seg);
}
+static void emulator_set_rflags(struct kvm_vcpu *vcpu, unsigned long rflags)
+{
+ kvm_x86_ops->set_rflags(vcpu, rflags);
+}
+
static struct x86_emulate_ops emulate_ops = {
.read_std = kvm_read_guest_virt_system,
.write_std = kvm_write_guest_virt_system,
@@ -3660,6 +3665,7 @@ static struct x86_emulate_ops emulate_ops = {
.get_cr = emulator_get_cr,
.set_cr = emulator_set_cr,
.cpl = emulator_get_cpl,
+ .set_rflags = emulator_set_rflags,
};
static void cache_all_regs(struct kvm_vcpu *vcpu)
@@ -3780,8 +3786,6 @@ restart:
return EMULATE_DO_MMIO;
}
- kvm_x86_ops->set_rflags(vcpu, vcpu->arch.emulate_ctxt.eflags);
-
if (vcpu->mmio_is_write) {
vcpu->mmio_needed = 0;
return EMULATE_DO_MMIO;
--
1.6.5
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 2/2] KVM: x86 emulator: add decoding of CMPXCHG8B dst operand.
2010-03-21 11:06 [PATCH 1/2] KVM: x86 emulator: commit rflags as part of registers commit Gleb Natapov
@ 2010-03-21 11:06 ` Gleb Natapov
2010-03-21 11:09 ` [PATCH 1/2] KVM: x86 emulator: commit rflags as part of registers commit Gleb Natapov
1 sibling, 0 replies; 7+ messages in thread
From: Gleb Natapov @ 2010-03-21 11:06 UTC (permalink / raw)
To: aci, mtosatti; +Cc: kvm
Decode CMPXCHG8B destination operand in decoding stage. Fixes regression
introduced by "If LOCK prefix is used dest arg should be memory" commit.
This commit relies on dst operand be decoded at the beginning of an
instruction emulation.
Signed-off-by: Gleb Natapov <gleb@redhat.com>
---
arch/x86/kvm/emulate.c | 24 ++++++++++--------------
1 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
index c1aa983..904351e 100644
--- a/arch/x86/kvm/emulate.c
+++ b/arch/x86/kvm/emulate.c
@@ -52,6 +52,7 @@
#define DstMem (3<<1) /* Memory operand. */
#define DstAcc (4<<1) /* Destination Accumulator */
#define DstDI (5<<1) /* Destination is in ES:(E)DI */
+#define DstMem64 (6<<1) /* 64bit memory operand */
#define DstMask (7<<1)
/* Source operand type. */
#define SrcNone (0<<4) /* No source operand. */
@@ -360,7 +361,7 @@ static u32 group_table[] = {
DstMem | SrcImmByte | ModRM, DstMem | SrcImmByte | ModRM | Lock,
DstMem | SrcImmByte | ModRM | Lock, DstMem | SrcImmByte | ModRM | Lock,
[Group9*8] =
- 0, ImplicitOps | ModRM | Lock, 0, 0, 0, 0, 0, 0,
+ 0, DstMem64 | ModRM | Lock, 0, 0, 0, 0, 0, 0,
};
static u32 group2_table[] = {
@@ -1205,6 +1206,7 @@ done_prefixes:
c->twobyte && (c->b == 0xb6 || c->b == 0xb7));
break;
case DstMem:
+ case DstMem64:
if ((c->d & ModRM) && c->modrm_mod == 3) {
c->dst.bytes = (c->d & ByteOp) ? 1 : c->op_bytes;
c->dst.type = OP_REG;
@@ -1214,7 +1216,10 @@ done_prefixes:
}
c->dst.type = OP_MEM;
c->dst.ptr = (unsigned long *)c->modrm_ea;
- c->dst.bytes = (c->d & ByteOp) ? 1 : c->op_bytes;
+ if ((c->d & DstMask) == DstMem64)
+ c->dst.bytes = 8;
+ else
+ c->dst.bytes = (c->d & ByteOp) ? 1 : c->op_bytes;
c->dst.val = 0;
if (c->d & BitOp) {
unsigned long mask = ~(c->dst.bytes * 8 - 1);
@@ -1706,12 +1711,7 @@ static inline int emulate_grp9(struct x86_emulate_ctxt *ctxt,
struct x86_emulate_ops *ops)
{
struct decode_cache *c = &ctxt->decode;
- u64 old, new;
- int rc;
-
- rc = ops->read_emulated(c->modrm_ea, &old, 8, ctxt->vcpu);
- if (rc != X86EMUL_CONTINUE)
- return rc;
+ u64 old = c->dst.orig_val;
if (((u32) (old >> 0) != (u32) c->regs[VCPU_REGS_RAX]) ||
((u32) (old >> 32) != (u32) c->regs[VCPU_REGS_RDX])) {
@@ -1719,15 +1719,12 @@ static inline int emulate_grp9(struct x86_emulate_ctxt *ctxt,
c->regs[VCPU_REGS_RAX] = (u32) (old >> 0);
c->regs[VCPU_REGS_RDX] = (u32) (old >> 32);
ctxt->eflags &= ~EFLG_ZF;
-
} else {
- new = ((u64)c->regs[VCPU_REGS_RCX] << 32) |
+ c->dst.val = ((u64)c->regs[VCPU_REGS_RCX] << 32) |
(u32) c->regs[VCPU_REGS_RBX];
- rc = ops->cmpxchg_emulated(c->modrm_ea, &old, &new, 8, ctxt->vcpu);
- if (rc != X86EMUL_CONTINUE)
- return rc;
ctxt->eflags |= EFLG_ZF;
+ c->lock_prefix = 1;
}
return X86EMUL_CONTINUE;
}
@@ -3241,7 +3238,6 @@ twobyte_insn:
rc = emulate_grp9(ctxt, ops);
if (rc != X86EMUL_CONTINUE)
goto done;
- c->dst.type = OP_NONE;
break;
}
goto writeback;
--
1.6.5
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH 1/2] KVM: x86 emulator: commit rflags as part of registers commit.
2010-03-21 11:06 [PATCH 1/2] KVM: x86 emulator: commit rflags as part of registers commit Gleb Natapov
2010-03-21 11:06 ` [PATCH 2/2] KVM: x86 emulator: add decoding of CMPXCHG8B dst operand Gleb Natapov
@ 2010-03-21 11:09 ` Gleb Natapov
2010-03-21 14:32 ` Avi Kivity
1 sibling, 1 reply; 7+ messages in thread
From: Gleb Natapov @ 2010-03-21 11:09 UTC (permalink / raw)
To: mtosatti; +Cc: kvm
Wrong To: header. Ignore please.
On Sun, Mar 21, 2010 at 01:06:02PM +0200, Gleb Natapov wrote:
> Make sure that rflags is committed only after successful instruction
> emulation.
>
> Signed-off-by: Gleb Natapov <gleb@redhat.com>
> ---
> arch/x86/include/asm/kvm_emulate.h | 1 +
> arch/x86/kvm/emulate.c | 1 +
> arch/x86/kvm/x86.c | 8 ++++++--
> 3 files changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/arch/x86/include/asm/kvm_emulate.h b/arch/x86/include/asm/kvm_emulate.h
> index b5e12c5..a1319c8 100644
> --- a/arch/x86/include/asm/kvm_emulate.h
> +++ b/arch/x86/include/asm/kvm_emulate.h
> @@ -136,6 +136,7 @@ struct x86_emulate_ops {
> ulong (*get_cr)(int cr, struct kvm_vcpu *vcpu);
> void (*set_cr)(int cr, ulong val, struct kvm_vcpu *vcpu);
> int (*cpl)(struct kvm_vcpu *vcpu);
> + void (*set_rflags)(struct kvm_vcpu *vcpu, unsigned long rflags);
> };
>
> /* Type, address-of, and value of an instruction's operand. */
> diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
> index 266576c..c1aa983 100644
> --- a/arch/x86/kvm/emulate.c
> +++ b/arch/x86/kvm/emulate.c
> @@ -2968,6 +2968,7 @@ writeback:
> /* Commit shadow register state. */
> memcpy(ctxt->vcpu->arch.regs, c->regs, sizeof c->regs);
> kvm_rip_write(ctxt->vcpu, c->eip);
> + ops->set_rflags(ctxt->vcpu, ctxt->eflags);
>
> done:
> return (rc == X86EMUL_UNHANDLEABLE) ? -1 : 0;
> diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
> index bb9a24a..3fa70b3 100644
> --- a/arch/x86/kvm/x86.c
> +++ b/arch/x86/kvm/x86.c
> @@ -3643,6 +3643,11 @@ static void emulator_set_segment_selector(u16 sel, int seg,
> kvm_set_segment(vcpu, &kvm_seg, seg);
> }
>
> +static void emulator_set_rflags(struct kvm_vcpu *vcpu, unsigned long rflags)
> +{
> + kvm_x86_ops->set_rflags(vcpu, rflags);
> +}
> +
> static struct x86_emulate_ops emulate_ops = {
> .read_std = kvm_read_guest_virt_system,
> .write_std = kvm_write_guest_virt_system,
> @@ -3660,6 +3665,7 @@ static struct x86_emulate_ops emulate_ops = {
> .get_cr = emulator_get_cr,
> .set_cr = emulator_set_cr,
> .cpl = emulator_get_cpl,
> + .set_rflags = emulator_set_rflags,
> };
>
> static void cache_all_regs(struct kvm_vcpu *vcpu)
> @@ -3780,8 +3786,6 @@ restart:
> return EMULATE_DO_MMIO;
> }
>
> - kvm_x86_ops->set_rflags(vcpu, vcpu->arch.emulate_ctxt.eflags);
> -
> if (vcpu->mmio_is_write) {
> vcpu->mmio_needed = 0;
> return EMULATE_DO_MMIO;
> --
> 1.6.5
>
> --
> To unsubscribe from this list: send the line "unsubscribe kvm" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
Gleb.
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH 1/2] KVM: x86 emulator: commit rflags as part of registers commit.
2010-03-21 11:09 ` [PATCH 1/2] KVM: x86 emulator: commit rflags as part of registers commit Gleb Natapov
@ 2010-03-21 14:32 ` Avi Kivity
2010-03-21 14:35 ` Gleb Natapov
0 siblings, 1 reply; 7+ messages in thread
From: Avi Kivity @ 2010-03-21 14:32 UTC (permalink / raw)
To: Gleb Natapov; +Cc: mtosatti, kvm
On 03/21/2010 01:09 PM, Gleb Natapov wrote:
> Wrong To: header. Ignore please.
>
See sendemail.aliasesfile in 'git help send-email'.
--
error compiling committee.c: too many arguments to function
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/2] KVM: x86 emulator: commit rflags as part of registers commit.
2010-03-21 14:32 ` Avi Kivity
@ 2010-03-21 14:35 ` Gleb Natapov
2010-03-21 14:37 ` Avi Kivity
0 siblings, 1 reply; 7+ messages in thread
From: Gleb Natapov @ 2010-03-21 14:35 UTC (permalink / raw)
To: Avi Kivity; +Cc: mtosatti, kvm
On Sun, Mar 21, 2010 at 04:32:42PM +0200, Avi Kivity wrote:
> On 03/21/2010 01:09 PM, Gleb Natapov wrote:
> >Wrong To: header. Ignore please.
>
> See sendemail.aliasesfile in 'git help send-email'.
>
I use alisesfile, but unfortunately if alias is not found there git does
not complain, just pass it as is to sendmail and sendmail adds part
after @ by itself.
--
Gleb.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/2] KVM: x86 emulator: commit rflags as part of registers commit.
2010-03-21 14:35 ` Gleb Natapov
@ 2010-03-21 14:37 ` Avi Kivity
0 siblings, 0 replies; 7+ messages in thread
From: Avi Kivity @ 2010-03-21 14:37 UTC (permalink / raw)
To: Gleb Natapov; +Cc: mtosatti, kvm
On 03/21/2010 04:35 PM, Gleb Natapov wrote:
> On Sun, Mar 21, 2010 at 04:32:42PM +0200, Avi Kivity wrote:
>
>> On 03/21/2010 01:09 PM, Gleb Natapov wrote:
>>
>>> Wrong To: header. Ignore please.
>>>
>> See sendemail.aliasesfile in 'git help send-email'.
>>
>>
> I use alisesfile, but unfortunately if alias is not found there git does
> not complain, just pass it as is to sendmail and sendmail adds part
> after @ by itself.
>
Ah. Then don't use sendmail.
--
error compiling committee.c: too many arguments to function
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 1/2] KVM: x86 emulator: commit rflags as part of registers commit.
@ 2010-03-21 11:08 Gleb Natapov
0 siblings, 0 replies; 7+ messages in thread
From: Gleb Natapov @ 2010-03-21 11:08 UTC (permalink / raw)
To: avi, mtosatti; +Cc: kvm
Make sure that rflags is committed only after successful instruction
emulation.
Signed-off-by: Gleb Natapov <gleb@redhat.com>
---
arch/x86/include/asm/kvm_emulate.h | 1 +
arch/x86/kvm/emulate.c | 1 +
arch/x86/kvm/x86.c | 8 ++++++--
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/arch/x86/include/asm/kvm_emulate.h b/arch/x86/include/asm/kvm_emulate.h
index b5e12c5..a1319c8 100644
--- a/arch/x86/include/asm/kvm_emulate.h
+++ b/arch/x86/include/asm/kvm_emulate.h
@@ -136,6 +136,7 @@ struct x86_emulate_ops {
ulong (*get_cr)(int cr, struct kvm_vcpu *vcpu);
void (*set_cr)(int cr, ulong val, struct kvm_vcpu *vcpu);
int (*cpl)(struct kvm_vcpu *vcpu);
+ void (*set_rflags)(struct kvm_vcpu *vcpu, unsigned long rflags);
};
/* Type, address-of, and value of an instruction's operand. */
diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
index 266576c..c1aa983 100644
--- a/arch/x86/kvm/emulate.c
+++ b/arch/x86/kvm/emulate.c
@@ -2968,6 +2968,7 @@ writeback:
/* Commit shadow register state. */
memcpy(ctxt->vcpu->arch.regs, c->regs, sizeof c->regs);
kvm_rip_write(ctxt->vcpu, c->eip);
+ ops->set_rflags(ctxt->vcpu, ctxt->eflags);
done:
return (rc == X86EMUL_UNHANDLEABLE) ? -1 : 0;
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index bb9a24a..3fa70b3 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -3643,6 +3643,11 @@ static void emulator_set_segment_selector(u16 sel, int seg,
kvm_set_segment(vcpu, &kvm_seg, seg);
}
+static void emulator_set_rflags(struct kvm_vcpu *vcpu, unsigned long rflags)
+{
+ kvm_x86_ops->set_rflags(vcpu, rflags);
+}
+
static struct x86_emulate_ops emulate_ops = {
.read_std = kvm_read_guest_virt_system,
.write_std = kvm_write_guest_virt_system,
@@ -3660,6 +3665,7 @@ static struct x86_emulate_ops emulate_ops = {
.get_cr = emulator_get_cr,
.set_cr = emulator_set_cr,
.cpl = emulator_get_cpl,
+ .set_rflags = emulator_set_rflags,
};
static void cache_all_regs(struct kvm_vcpu *vcpu)
@@ -3780,8 +3786,6 @@ restart:
return EMULATE_DO_MMIO;
}
- kvm_x86_ops->set_rflags(vcpu, vcpu->arch.emulate_ctxt.eflags);
-
if (vcpu->mmio_is_write) {
vcpu->mmio_needed = 0;
return EMULATE_DO_MMIO;
--
1.6.5
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2010-03-21 14:37 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-03-21 11:06 [PATCH 1/2] KVM: x86 emulator: commit rflags as part of registers commit Gleb Natapov
2010-03-21 11:06 ` [PATCH 2/2] KVM: x86 emulator: add decoding of CMPXCHG8B dst operand Gleb Natapov
2010-03-21 11:09 ` [PATCH 1/2] KVM: x86 emulator: commit rflags as part of registers commit Gleb Natapov
2010-03-21 14:32 ` Avi Kivity
2010-03-21 14:35 ` Gleb Natapov
2010-03-21 14:37 ` Avi Kivity
-- strict thread matches above, loose matches on Subject: below --
2010-03-21 11:08 Gleb Natapov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox