KVM: emulator: check rex prefix inside decode_register()
PATCH 1/3 KVM: emulator: check rex prefix inside decode_register()
All decode_register() callers check if instruction has rex prefix to properly decode one byte operand. It make sense to move the check inside.
--- arch/x86/kvm/emulate.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-)
arch/x86/kvm/emulate.c +7 -11
@@ -785,9 +785,10 @@ static int do_insn_fetch(struct x86_emulate_ctxt *ctxt,* @highbyte_regs specifies whether to decode AH,CH,DH,BH. */ static void *decode_register (struct x86_emulate_ctxt *ctxt,u8 modrm_reg, -int highbyte_regs) +int byteop) {void *p; +int highbyte_regs = (ctxt->rex_prefix ==0 ) && byteop;if (highbyte_regs && modrm_reg >=4 && modrm_reg <8 ) p = (unsigned char *)reg_rmw (ctxt, modrm_reg &3 ) +1 ;
@@ -1024,7 +1025,6 @@ static void decode_register_operand(struct x86_emulate_ctxt *ctxt, struct operand *op) {unsigned reg = ctxt->modrm_reg; -int highbyte_regs = ctxt->rex_prefix ==0 ;if (!(ctxt->d & ModRM)) reg = (ctxt->b &7 ) | ((ctxt->rex_prefix &1 ) <<3 );
@@ -1046,10 +1046,10 @@ static void decode_register_operand(struct x86_emulate_ctxt *ctxt, op->type =OP_REG ;if (ctxt->d & ByteOp) { - op->addr.reg =decode_register (ctxt, reg, highbyte_regs); + op->addr.reg =decode_register (ctxt, reg, true); op->bytes =1 ; }else { - op->addr.reg =decode_register (ctxt, reg,0 ); + op->addr.reg =decode_register (ctxt, reg, false); op->bytes = ctxt->op_bytes; }fetch_register_operand (op);
@@ -1082,12 +1082,10 @@ 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, - highbyte_regs && (ctxt->d & ByteOp)); + ctxt->d & ByteOp);if (ctxt->d & Sse) { op->type =OP_XMM ; op->bytes =16 ;
@@ -4117,10 +4115,8 @@ static int decode_operand(struct x86_emulate_ctxt *ctxt, struct operand *op,case OpMem8: ctxt->memop.bytes =1 ;if (ctxt->memop.type ==OP_REG ) { -int highbyte_regs = ctxt->rex_prefix ==0 ; - - ctxt->memop.addr.reg =decode_register (ctxt, ctxt->modrm_rm, - highbyte_regs); + ctxt->memop.addr.reg =decode_register (ctxt, + ctxt->modrm_rm, true);fetch_register_operand (&ctxt->memop); } goto mem_common;
Signature · 1 line
1.8.4.rc3
PATCH 2/3 KVM: emulator: cleanup decode_register_operand() a bit
Make code shorter.
--- arch/x86/kvm/emulate.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)
arch/x86/kvm/emulate.c +3 -7
@@ -1045,13 +1045,9 @@ static void decode_register_operand(struct x86_emulate_ctxt *ctxt, } op->type =OP_REG ; -if (ctxt->d & ByteOp) { - op->addr.reg =decode_register (ctxt, reg, true); - op->bytes =1 ; - }else { - op->addr.reg =decode_register (ctxt, reg, false); - op->bytes = ctxt->op_bytes; - } + op->bytes = (ctxt->d & ByteOp) ?1 : ctxt->op_bytes; + op->addr.reg =decode_register (ctxt, reg, ctxt->d & ByteOp); +fetch_register_operand (op); op->orig_val = op->val; }
Signature · 1 line
1.8.4.rc3
Re: [PATCH 2/3] KVM: emulator: cleanup decode_register_operand() a bit
Il 04/11/2013 14:52, Gleb Natapov ha scritto:
Quoted 19 lines
Make code shorter.
Signed-off-by Gleb Natapov <[email protected]>--- arch/x86/kvm/emulate.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)arch/x86/kvm/emulate.c +0
-3@@ -1045,13 +1045,9 @@ static void decode_register_operand(struct x86_emulate_ctxt *ctxt, } op->type =OP_REG ; -if (ctxt->d & ByteOp) { - op->addr.reg =decode_register (ctxt, reg, true); - op->bytes =1 ;
arch/x86/kvm/emulate.c static void decode_register_operand(struct x86_emulate_ctxt *ctxt, · line 1053
Quoted 10 lines
arch/x86/kvm/emulate.c +3
-4- }else { - op->addr.reg =decode_register (ctxt, reg, false); - op->bytes = ctxt->op_bytes; - } + op->bytes = (ctxt->d & ByteOp) ?1 : ctxt->op_bytes; + op->addr.reg =decode_register (ctxt, reg, ctxt->d & ByteOp); +fetch_register_operand (op); op->orig_val = op->val; }
Not sure I prefer the new code, but beauty is in the eye of the beholder. :)
PATCH 3/3 KVM: x86: trace cpuid emulation when called from emulator
In reply to Gleb NatapovCurrently cpuid emulation is traced only when executed by intercept. Move trace point so that emulator invocation is traced too.
--- arch/x86/kvm/cpuid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kvm/cpuid.c +1 -1
@@ -756,6 +756,7 @@ void kvm_cpuid(struct kvm_vcpu *vcpu, u32 *eax, u32 *ebx, u32 *ecx, u32 *edx) *edx = best->edx; }else *eax = *ebx = *ecx = *edx =0 ; +trace_kvm_cpuid (function, *eax, *ebx, *ecx, *edx); }EXPORT_SYMBOL_GPL (kvm_cpuid);
@@ -771,6 +772,5 @@ void kvm_emulate_cpuid(struct kvm_vcpu *vcpu)kvm_register_write (vcpu,VCPU_REGS_RCX , ecx);kvm_register_write (vcpu,VCPU_REGS_RDX , edx); kvm_x86_ops->skip_emulated_instruction (vcpu); -trace_kvm_cpuid (function, eax, ebx, ecx, edx); }EXPORT_SYMBOL_GPL (kvm_emulate_cpuid);
Signature · 1 line
1.8.4.rc3
Re: [PATCH 3/3] KVM: x86: trace cpuid emulation when called from emulator
Il 04/11/2013 14:52, Gleb Natapov ha scritto:
Quoted 22 lines
Currently cpuid emulation is traced only when executed by intercept. Move trace point so that emulator invocation is traced too.
Signed-off-by Gleb Natapov <[email protected]>--- arch/x86/kvm/cpuid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)arch/x86/kvm/cpuid.c +1
-0@@ -756,6 +756,7 @@ void kvm_cpuid(struct kvm_vcpu *vcpu, u32 *eax, u32 *ebx, u32 *ecx, u32 *edx) *edx = best->edx; }else *eax = *ebx = *ecx = *edx =0 ; +trace_kvm_cpuid (function, *eax, *ebx, *ecx, *edx); }EXPORT_SYMBOL_GPL (kvm_cpuid);
arch/x86/kvm/cpuid.c void kvm_emulate_cpuid(struct kvm_vcpu *vcpu) · line 776
Quoted 6 lines
arch/x86/kvm/cpuid.c +0
-1@@ -771,6 +772,5 @@ void kvm_emulate_cpuid(struct kvm_vcpu *vcpu)kvm_register_write (vcpu,VCPU_REGS_RCX , ecx);kvm_register_write (vcpu,VCPU_REGS_RDX , edx); kvm_x86_ops->skip_emulated_instruction (vcpu); -trace_kvm_cpuid (function, eax, ebx, ecx, edx); }EXPORT_SYMBOL_GPL (kvm_emulate_cpuid);
Il 04/11/2013 14:52, Gleb Natapov ha scritto:
Quoted 5 lines
All
decode_register()callers check if instruction has rex prefix to properly decode one byte operand. It make sense to move the check inside.Signed-off-by Gleb Natapov <[email protected]>
I guess you'd like to use Linus's extra week and get it in 3.13?
Paolo
Quoted 69 lines
--- arch/x86/kvm/emulate.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-)arch/x86/kvm/emulate.c +7
-11@@ -785,9 +785,10 @@ static int do_insn_fetch(struct x86_emulate_ctxt *ctxt,* @highbyte_regs specifies whether to decode AH,CH,DH,BH. */ static void *decode_register (struct x86_emulate_ctxt *ctxt,u8 modrm_reg, -int highbyte_regs) +int byteop) {void *p; +int highbyte_regs = (ctxt->rex_prefix ==0 ) && byteop;if (highbyte_regs && modrm_reg >=4 && modrm_reg <8 ) p = (unsigned char *)reg_rmw (ctxt, modrm_reg &3 ) +1 ;@@ -1024,7 +1025,6 @@ static void decode_register_operand(struct x86_emulate_ctxt *ctxt, struct operand *op) {unsigned reg = ctxt->modrm_reg; -int highbyte_regs = ctxt->rex_prefix ==0 ;if (!(ctxt->d & ModRM)) reg = (ctxt->b &7 ) | ((ctxt->rex_prefix &1 ) <<3 );@@ -1046,10 +1046,10 @@ static void decode_register_operand(struct x86_emulate_ctxt *ctxt, op->type =OP_REG ;if (ctxt->d & ByteOp) { - op->addr.reg =decode_register (ctxt, reg, highbyte_regs); + op->addr.reg =decode_register (ctxt, reg, true); op->bytes =1 ; }else { - op->addr.reg =decode_register (ctxt, reg,0 ); + op->addr.reg =decode_register (ctxt, reg, false); op->bytes = ctxt->op_bytes; }fetch_register_operand (op);@@ -1082,12 +1082,10 @@ 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, - highbyte_regs && (ctxt->d & ByteOp)); + ctxt->d & ByteOp);if (ctxt->d & Sse) { op->type =OP_XMM ; op->bytes =16 ;@@ -4117,10 +4115,8 @@ static int decode_operand(struct x86_emulate_ctxt *ctxt, struct operand *op,case OpMem8: ctxt->memop.bytes =1 ;if (ctxt->memop.type ==OP_REG ) { -int highbyte_regs = ctxt->rex_prefix ==0 ; - - ctxt->memop.addr.reg =decode_register (ctxt, ctxt->modrm_rm, - highbyte_regs); + ctxt->memop.addr.reg =decode_register (ctxt, + ctxt->modrm_rm, true);fetch_register_operand (&ctxt->memop); } goto mem_common;
Quoted 11 lines · Paolo Bonzini
Il 04/11/2013 14:52, Gleb Natapov ha scritto:
Quoted 5 lines
All
decode_register()callers check if instruction has rex prefix to properly decode one byte operand. It make sense to move the check inside.Signed-off-by Gleb Natapov <[email protected]>Reviewed-by Paolo Bonzini <[email protected]>I guess you'd like to use Linus's extra week and get it in 3.13?
Yes, nothing serious here.
Quoted 63 lines
Paolo
Quoted 61 lines
--- arch/x86/kvm/emulate.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-)arch/x86/kvm/emulate.c +5
-9@@ -785,9 +785,10 @@ static int do_insn_fetch(struct x86_emulate_ctxt *ctxt,* @highbyte_regs specifies whether to decode AH,CH,DH,BH. */ static void *decode_register (struct x86_emulate_ctxt *ctxt,u8 modrm_reg, -int highbyte_regs) +int byteop) {void *p; +int highbyte_regs = (ctxt->rex_prefix ==0 ) && byteop;if (highbyte_regs && modrm_reg >=4 && modrm_reg <8 ) p = (unsigned char *)reg_rmw (ctxt, modrm_reg &3 ) +1 ;@@ -1024,7 +1025,6 @@ static void decode_register_operand(struct x86_emulate_ctxt *ctxt, struct operand *op) {unsigned reg = ctxt->modrm_reg; -int highbyte_regs = ctxt->rex_prefix ==0 ;if (!(ctxt->d & ModRM)) reg = (ctxt->b &7 ) | ((ctxt->rex_prefix &1 ) <<3 );@@ -1046,10 +1046,10 @@ static void decode_register_operand(struct x86_emulate_ctxt *ctxt, op->type =OP_REG ;if (ctxt->d & ByteOp) { - op->addr.reg =decode_register (ctxt, reg, highbyte_regs); + op->addr.reg =decode_register (ctxt, reg, true); op->bytes =1 ; }else { - op->addr.reg =decode_register (ctxt, reg,0 ); + op->addr.reg =decode_register (ctxt, reg, false); op->bytes = ctxt->op_bytes; }fetch_register_operand (op);@@ -1082,12 +1082,10 @@ 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, - highbyte_regs && (ctxt->d & ByteOp)); + ctxt->d & ByteOp);if (ctxt->d & Sse) { op->type =OP_XMM ; op->bytes =16 ;@@ -4117,10 +4115,8 @@ static int decode_operand(struct x86_emulate_ctxt *ctxt, struct operand *op,case OpMem8: ctxt->memop.bytes =1 ;if (ctxt->memop.type ==OP_REG ) { -int highbyte_regs = ctxt->rex_prefix ==0 ; -
Quoted 8 lines
arch/x86/kvm/emulate.c static int decode_operand(struct x86_emulate_ctxt *ctxt, struct operand *op, · line 4122
Quoted 8 lines
arch/x86/kvm/emulate.c +2
-2- ctxt->memop.addr.reg =decode_register (ctxt, ctxt->modrm_rm, - highbyte_regs); + ctxt->memop.addr.reg =decode_register (ctxt, + ctxt->modrm_rm, true);fetch_register_operand (&ctxt->memop); } goto mem_common;
--
Gleb.