* [PATCH] KVM: fix sil/dil/bpl/spl in the mod/rm fields
@ 2013-05-30 14:35 Paolo Bonzini
2013-06-02 18:12 ` Gleb Natapov
2013-06-03 8:28 ` Gleb Natapov
0 siblings, 2 replies; 6+ messages in thread
From: Paolo Bonzini @ 2013-05-30 14:35 UTC (permalink / raw)
To: linux-kernel; +Cc: gnatapov, kvm, stable
The x86-64 extended low-byte registers were fetched correctly from reg,
but not from mod/rm.
This fixes another bug in the boot of RHEL5.9 64-bit, but it is still
not enough.
Cc: gnatapov@redhat.com
Cc: kvm@vger.kernel.org
Cc: <stable@vger.kernel.org> # 3.9
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
arch/x86/kvm/emulate.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
index aa68106..028b34f 100644
--- a/arch/x86/kvm/emulate.c
+++ b/arch/x86/kvm/emulate.c
@@ -1239,9 +1239,12 @@ static int decode_modrm(struct x86_emulate_ctxt *ctxt,
ctxt->modrm_seg = VCPU_SREG_DS;
if (ctxt->modrm_mod == 3) {
+ int highbyte_regs = ctxt->rex_prefix == 0;
+
op->type = OP_REG;
op->bytes = (ctxt->d & ByteOp) ? 1 : ctxt->op_bytes;
- op->addr.reg = decode_register(ctxt, ctxt->modrm_rm, ctxt->d & ByteOp);
+ op->addr.reg = decode_register(ctxt, ctxt->modrm_rm,
+ highbyte_regs && (ctxt->d & ByteOp));
if (ctxt->d & Sse) {
op->type = OP_XMM;
op->bytes = 16;
--
1.8.1.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] KVM: fix sil/dil/bpl/spl in the mod/rm fields
2013-05-30 14:35 [PATCH] KVM: fix sil/dil/bpl/spl in the mod/rm fields Paolo Bonzini
@ 2013-06-02 18:12 ` Gleb Natapov
2013-06-03 6:27 ` Paolo Bonzini
2013-06-03 8:28 ` Gleb Natapov
1 sibling, 1 reply; 6+ messages in thread
From: Gleb Natapov @ 2013-06-02 18:12 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: linux-kernel, kvm, stable
On Thu, May 30, 2013 at 04:35:55PM +0200, Paolo Bonzini wrote:
> The x86-64 extended low-byte registers were fetched correctly from reg,
> but not from mod/rm.
>
> This fixes another bug in the boot of RHEL5.9 64-bit, but it is still
> not enough.
>
Did I missed unit test patch? :)
> Cc: gnatapov@redhat.com
> Cc: kvm@vger.kernel.org
> Cc: <stable@vger.kernel.org> # 3.9
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
> arch/x86/kvm/emulate.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
> index aa68106..028b34f 100644
> --- a/arch/x86/kvm/emulate.c
> +++ b/arch/x86/kvm/emulate.c
> @@ -1239,9 +1239,12 @@ static int decode_modrm(struct x86_emulate_ctxt *ctxt,
> ctxt->modrm_seg = VCPU_SREG_DS;
>
> if (ctxt->modrm_mod == 3) {
> + int highbyte_regs = ctxt->rex_prefix == 0;
> +
> op->type = OP_REG;
> op->bytes = (ctxt->d & ByteOp) ? 1 : ctxt->op_bytes;
> - op->addr.reg = decode_register(ctxt, ctxt->modrm_rm, ctxt->d & ByteOp);
> + op->addr.reg = decode_register(ctxt, ctxt->modrm_rm,
> + highbyte_regs && (ctxt->d & ByteOp));
> if (ctxt->d & Sse) {
> op->type = OP_XMM;
> op->bytes = 16;
> --
> 1.8.1.4
--
Gleb.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] KVM: fix sil/dil/bpl/spl in the mod/rm fields
2013-06-02 18:12 ` Gleb Natapov
@ 2013-06-03 6:27 ` Paolo Bonzini
2013-06-03 8:04 ` Gleb Natapov
0 siblings, 1 reply; 6+ messages in thread
From: Paolo Bonzini @ 2013-06-03 6:27 UTC (permalink / raw)
To: Gleb Natapov; +Cc: linux-kernel, kvm, stable
Il 02/06/2013 20:12, Gleb Natapov ha scritto:
> On Thu, May 30, 2013 at 04:35:55PM +0200, Paolo Bonzini wrote:
>> The x86-64 extended low-byte registers were fetched correctly from reg,
>> but not from mod/rm.
>>
>> This fixes another bug in the boot of RHEL5.9 64-bit, but it is still
>> not enough.
>>
> Did I missed unit test patch? :)
I wanted to ask the GSoC student to do it. If it doesn't come in a
couple of weeks, I'll send it.
Paolo
>> Cc: gnatapov@redhat.com
>> Cc: kvm@vger.kernel.org
>> Cc: <stable@vger.kernel.org> # 3.9
>> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
>> ---
>> arch/x86/kvm/emulate.c | 5 ++++-
>> 1 file changed, 4 insertions(+), 1 deletion(-)
>>
>> diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
>> index aa68106..028b34f 100644
>> --- a/arch/x86/kvm/emulate.c
>> +++ b/arch/x86/kvm/emulate.c
>> @@ -1239,9 +1239,12 @@ static int decode_modrm(struct x86_emulate_ctxt *ctxt,
>> ctxt->modrm_seg = VCPU_SREG_DS;
>>
>> if (ctxt->modrm_mod == 3) {
>> + int highbyte_regs = ctxt->rex_prefix == 0;
>> +
>> op->type = OP_REG;
>> op->bytes = (ctxt->d & ByteOp) ? 1 : ctxt->op_bytes;
>> - op->addr.reg = decode_register(ctxt, ctxt->modrm_rm, ctxt->d & ByteOp);
>> + op->addr.reg = decode_register(ctxt, ctxt->modrm_rm,
>> + highbyte_regs && (ctxt->d & ByteOp));
>> if (ctxt->d & Sse) {
>> op->type = OP_XMM;
>> op->bytes = 16;
>> --
>> 1.8.1.4
>
> --
> Gleb.
> --
> 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
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] KVM: fix sil/dil/bpl/spl in the mod/rm fields
2013-06-03 6:27 ` Paolo Bonzini
@ 2013-06-03 8:04 ` Gleb Natapov
2013-06-03 8:15 ` Paolo Bonzini
0 siblings, 1 reply; 6+ messages in thread
From: Gleb Natapov @ 2013-06-03 8:04 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: linux-kernel, kvm, stable
On Mon, Jun 03, 2013 at 08:27:57AM +0200, Paolo Bonzini wrote:
> Il 02/06/2013 20:12, Gleb Natapov ha scritto:
> > On Thu, May 30, 2013 at 04:35:55PM +0200, Paolo Bonzini wrote:
> >> The x86-64 extended low-byte registers were fetched correctly from reg,
> >> but not from mod/rm.
> >>
> >> This fixes another bug in the boot of RHEL5.9 64-bit, but it is still
> >> not enough.
> >>
> > Did I missed unit test patch? :)
>
> I wanted to ask the GSoC student to do it. If it doesn't come in a
> couple of weeks, I'll send it.
>
Which instruction you saw the bug happening with? It this 3.10 regression?
> Paolo
>
> >> Cc: gnatapov@redhat.com
Please use my other email :)
> >> Cc: kvm@vger.kernel.org
> >> Cc: <stable@vger.kernel.org> # 3.9
> >> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> >> ---
> >> arch/x86/kvm/emulate.c | 5 ++++-
> >> 1 file changed, 4 insertions(+), 1 deletion(-)
> >>
> >> diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
> >> index aa68106..028b34f 100644
> >> --- a/arch/x86/kvm/emulate.c
> >> +++ b/arch/x86/kvm/emulate.c
> >> @@ -1239,9 +1239,12 @@ static int decode_modrm(struct x86_emulate_ctxt *ctxt,
> >> ctxt->modrm_seg = VCPU_SREG_DS;
> >>
> >> if (ctxt->modrm_mod == 3) {
> >> + int highbyte_regs = ctxt->rex_prefix == 0;
> >> +
> >> op->type = OP_REG;
> >> op->bytes = (ctxt->d & ByteOp) ? 1 : ctxt->op_bytes;
> >> - op->addr.reg = decode_register(ctxt, ctxt->modrm_rm, ctxt->d & ByteOp);
> >> + op->addr.reg = decode_register(ctxt, ctxt->modrm_rm,
> >> + highbyte_regs && (ctxt->d & ByteOp));
> >> if (ctxt->d & Sse) {
> >> op->type = OP_XMM;
> >> op->bytes = 16;
> >> --
> >> 1.8.1.4
> >
> > --
> > Gleb.
> > --
> > 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] 6+ messages in thread
* Re: [PATCH] KVM: fix sil/dil/bpl/spl in the mod/rm fields
2013-06-03 8:04 ` Gleb Natapov
@ 2013-06-03 8:15 ` Paolo Bonzini
0 siblings, 0 replies; 6+ messages in thread
From: Paolo Bonzini @ 2013-06-03 8:15 UTC (permalink / raw)
To: Gleb Natapov; +Cc: linux-kernel, kvm, stable
Il 03/06/2013 10:04, Gleb Natapov ha scritto:
> On Mon, Jun 03, 2013 at 08:27:57AM +0200, Paolo Bonzini wrote:
>> Il 02/06/2013 20:12, Gleb Natapov ha scritto:
>>> On Thu, May 30, 2013 at 04:35:55PM +0200, Paolo Bonzini wrote:
>>>> The x86-64 extended low-byte registers were fetched correctly from reg,
>>>> but not from mod/rm.
>>>>
>>>> This fixes another bug in the boot of RHEL5.9 64-bit, but it is still
>>>> not enough.
>>>>
>>> Did I missed unit test patch? :)
>>
>> I wanted to ask the GSoC student to do it. If it doesn't come in a
>> couple of weeks, I'll send it.
>>
> Which instruction you saw the bug happening with? It this 3.10 regression?
cmp $0x1f, %bpl
Like the NOP, it is a regression introduced in the switch of
emulate_invalid_guest_state from 0 to 1.
Paolo
>
>> Paolo
>>
>>>> Cc: gnatapov@redhat.com
> Please use my other email :)
>
>>>> Cc: kvm@vger.kernel.org
>>>> Cc: <stable@vger.kernel.org> # 3.9
>>>> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
>>>> ---
>>>> arch/x86/kvm/emulate.c | 5 ++++-
>>>> 1 file changed, 4 insertions(+), 1 deletion(-)
>>>>
>>>> diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
>>>> index aa68106..028b34f 100644
>>>> --- a/arch/x86/kvm/emulate.c
>>>> +++ b/arch/x86/kvm/emulate.c
>>>> @@ -1239,9 +1239,12 @@ static int decode_modrm(struct x86_emulate_ctxt *ctxt,
>>>> ctxt->modrm_seg = VCPU_SREG_DS;
>>>>
>>>> if (ctxt->modrm_mod == 3) {
>>>> + int highbyte_regs = ctxt->rex_prefix == 0;
>>>> +
>>>> op->type = OP_REG;
>>>> op->bytes = (ctxt->d & ByteOp) ? 1 : ctxt->op_bytes;
>>>> - op->addr.reg = decode_register(ctxt, ctxt->modrm_rm, ctxt->d & ByteOp);
>>>> + op->addr.reg = decode_register(ctxt, ctxt->modrm_rm,
>>>> + highbyte_regs && (ctxt->d & ByteOp));
>>>> if (ctxt->d & Sse) {
>>>> op->type = OP_XMM;
>>>> op->bytes = 16;
>>>> --
>>>> 1.8.1.4
>>>
>>> --
>>> Gleb.
>>> --
>>> 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.
> --
> 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
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] KVM: fix sil/dil/bpl/spl in the mod/rm fields
2013-05-30 14:35 [PATCH] KVM: fix sil/dil/bpl/spl in the mod/rm fields Paolo Bonzini
2013-06-02 18:12 ` Gleb Natapov
@ 2013-06-03 8:28 ` Gleb Natapov
1 sibling, 0 replies; 6+ messages in thread
From: Gleb Natapov @ 2013-06-03 8:28 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: linux-kernel, kvm, stable
On Thu, May 30, 2013 at 04:35:55PM +0200, Paolo Bonzini wrote:
> The x86-64 extended low-byte registers were fetched correctly from reg,
> but not from mod/rm.
>
> This fixes another bug in the boot of RHEL5.9 64-bit, but it is still
> not enough.
>
> Cc: gnatapov@redhat.com
> Cc: kvm@vger.kernel.org
> Cc: <stable@vger.kernel.org> # 3.9
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Applied to master, thanks.
> ---
> arch/x86/kvm/emulate.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
> index aa68106..028b34f 100644
> --- a/arch/x86/kvm/emulate.c
> +++ b/arch/x86/kvm/emulate.c
> @@ -1239,9 +1239,12 @@ static int decode_modrm(struct x86_emulate_ctxt *ctxt,
> ctxt->modrm_seg = VCPU_SREG_DS;
>
> if (ctxt->modrm_mod == 3) {
> + int highbyte_regs = ctxt->rex_prefix == 0;
> +
> op->type = OP_REG;
> op->bytes = (ctxt->d & ByteOp) ? 1 : ctxt->op_bytes;
> - op->addr.reg = decode_register(ctxt, ctxt->modrm_rm, ctxt->d & ByteOp);
> + op->addr.reg = decode_register(ctxt, ctxt->modrm_rm,
> + highbyte_regs && (ctxt->d & ByteOp));
> if (ctxt->d & Sse) {
> op->type = OP_XMM;
> op->bytes = 16;
> --
> 1.8.1.4
--
Gleb.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-06-03 8:28 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-05-30 14:35 [PATCH] KVM: fix sil/dil/bpl/spl in the mod/rm fields Paolo Bonzini
2013-06-02 18:12 ` Gleb Natapov
2013-06-03 6:27 ` Paolo Bonzini
2013-06-03 8:04 ` Gleb Natapov
2013-06-03 8:15 ` Paolo Bonzini
2013-06-03 8:28 ` Gleb Natapov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).