Implements MMIO emulation for lvx/stvx instructions
Subsystems (2)
cover Implements MMIO emulation for lvx/stvx instructions
This patch implements MMIO emulation for two instructions: lvx and stvx.
NOTE: I'm resending copying now [email protected].
Thanks.
Jose Ricardo Ziviani (1):
KVM: PPC: Book3S: Add MMIO emulation for VMX instructions
arch/powerpc/include/asm/kvm_host.h | 2 + arch/powerpc/include/asm/kvm_ppc.h | 4 + arch/powerpc/include/asm/ppc-opcode.h | 6 ++ arch/powerpc/kvm/emulate_loadstore.c | 32 +++++++ arch/powerpc/kvm/powerpc.c | 162 ++++++++++++++++++++++++++++++---- 5 files changed, 189 insertions(+), 17 deletions(-)
Signature · 1 line
2.14.1
PATCH RESEND 1/1 KVM: PPC: Book3S: Add MMIO emulation for VMX instructions
This patch provides the MMIO load/store vector indexed X-Form emulation.
Instructions implemented: lvx, stvx
--- arch/powerpc/include/asm/kvm_host.h | 2 + arch/powerpc/include/asm/kvm_ppc.h | 4 + arch/powerpc/include/asm/ppc-opcode.h | 6 ++ arch/powerpc/kvm/emulate_loadstore.c | 32 +++++++ arch/powerpc/kvm/powerpc.c | 162 ++++++++++++++++++++++++++++++---- 5 files changed, 189 insertions(+), 17 deletions(-)
arch/powerpc/include/asm/kvm_host.h +2 -0
@@ -690,6 +690,7 @@ struct kvm_vcpu_arch {u8 mmio_vsx_offset;u8 mmio_vsx_copy_type;u8 mmio_vsx_tx_sx_enabled; +u8 mmio_vmx_copy_nums;u8 osi_needed;u8 osi_enabled;u8 papr_enabled;
@@ -800,6 +801,7 @@ struct kvm_vcpu_arch {#define KVM_MMIO_REG_QPR 0x0040#define KVM_MMIO_REG_FQPR 0x0060#define KVM_MMIO_REG_VSX 0x0080 +#define KVM_MMIO_REG_VMX 0x00a0#define __KVM_HAVE_ARCH_WQP#define __KVM_HAVE_CREATE_DEVICE
arch/powerpc/include/asm/kvm_ppc.h +4 -0
@@ -81,6 +81,10 @@ extern int kvmppc_handle_loads(struct kvm_run *run, struct kvm_vcpu *vcpu,extern int kvmppc_handle_vsx_load (struct kvm_run *run,struct kvm_vcpu *vcpu,unsigned int rt,unsigned int bytes,int is_default_endian,int mmio_sign_extend); +extern int kvmppc_handle_load128_by2x64 (struct kvm_run *run, +struct kvm_vcpu *vcpu,unsigned int rt,int is_default_endian); +extern int kvmppc_handle_store128_by2x64 (struct kvm_run *run, +struct kvm_vcpu *vcpu,unsigned int rs,int is_default_endian);extern int kvmppc_handle_store (struct kvm_run *run,struct kvm_vcpu *vcpu,u64 val,unsigned int bytes,int is_default_endian);
arch/powerpc/include/asm/ppc-opcode.h +6 -0
@@ -156,6 +156,12 @@#define OP_31_XOP_LFDX 599#define OP_31_XOP_LFDUX 631 +/* VMX Vector Load Instructions */ +#define OP_31_XOP_LVX 103 + +/* VMX Vector Store Instructions */ +#define OP_31_XOP_STVX 231 +#define OP_LWZ 32#define OP_STFS 52#define OP_STFSU 53
arch/powerpc/kvm/emulate_loadstore.c +32 -0
@@ -58,6 +58,18 @@ static bool kvmppc_check_vsx_disabled(struct kvm_vcpu *vcpu) }#endif /* CONFIG_VSX */ +#ifdef CONFIG_ALTIVEC +static bool kvmppc_check_altivec_disabled (struct kvm_vcpu *vcpu) +{ +if (!(kvmppc_get_msr (vcpu) &MSR_VEC )) { +kvmppc_core_queue_vec_unavail (vcpu); +return true; + } + +return false; +} +#endif /* CONFIG_ALTIVEC */ +/* * XXX to do: * lfiwax, lfiwzx
@@ -98,6 +110,7 @@ int kvmppc_emulate_loadstore(struct kvm_vcpu *vcpu) vcpu->arch.mmio_vsx_copy_type =KVMPPC_VSX_COPY_NONE ; vcpu->arch.mmio_sp64_extend =0 ; vcpu->arch.mmio_sign_extend =0 ; + vcpu->arch.mmio_vmx_copy_nums =0 ;switch (get_op (inst)) {case 31 :
@@ -459,6 +472,25 @@ int kvmppc_emulate_loadstore(struct kvm_vcpu *vcpu) rs, 4, 1);break ;#endif /* CONFIG_VSX */ + +#ifdef CONFIG_ALTIVEC +case OP_31_XOP_LVX : +if (kvmppc_check_altivec_disabled (vcpu)) +return EMULATE_DONE ; + vcpu->arch.mmio_vmx_copy_nums =2 ; + emulated =kvmppc_handle_load128_by2x64 (run, vcpu, +KVM_MMIO_REG_VMX |rt,1 ); +break ; + +case OP_31_XOP_STVX : +if (kvmppc_check_altivec_disabled (vcpu)) +return EMULATE_DONE ; + vcpu->arch.mmio_vmx_copy_nums =2 ; + emulated =kvmppc_handle_store128_by2x64 (run, vcpu, + rs,1 ); +break ; +#endif /* CONFIG_ALTIVEC */ +default : emulated =EMULATE_FAIL ;break ;
arch/powerpc/kvm/powerpc.c +145 -17
192 lines not on this page · raw message
Signature · 1 line
2.14.1
Re: [PATCH RESEND 1/1] KVM: PPC: Book3S: Add MMIO emulation for VMX instructions
Quoted 6 lines · Jose Ricardo Ziviani
This patch provides the MMIO load/store vector indexed X-Form emulation.
Instructions implemented: lvx, stvx
Signed-off-by Jose Ricardo Ziviani <[email protected]>
What testing has been done of this patch? In particular, what combinations of endianness of host and guest have been tested? For a cross-endian situation (endianness of guest different from host) you would need to load the two halves of the VMX register image in reversed order (note that lvx/stvx are different from lxvd2x/stxvd2x and lxvw4x/stxvw4x in this respect), and I don't see that being done.
Also, lvx/stvx mask off the bottom 4 bits of the EA, and I don't see that being done.
[snip]
Quoted 15 lines
arch/powerpc/kvm/powerpc.c +0
-7@@ -832,23 +832,7 @@ void kvm_arch_irq_bypass_del_producer(struct irq_bypass_consumer *cons, kvm->arch.kvm_ops->irq_bypass_del_producer (cons, prod); } -#ifdef CONFIG_VSX -static inline int kvmppc_get_vsr_dword_offset (int index) -{ -int offset; - -if ((index !=0 ) && (index !=1 )) -return -1 ;
arch/powerpc/kvm/powerpc.c void kvm_arch_irq_bypass_del_producer(struct irq_bypass_consumer *cons, · line 851
Quoted 10 lines
arch/powerpc/kvm/powerpc.c +0
-10- -#ifdef __BIG_ENDIAN - offset = index; -#else - offset =1 - index; -#endif - -return offset; -} -
Why does this function need to be moved down in the file?
Quoted 12 lines
arch/powerpc/kvm/powerpc.c +5
-0+#ifdef CONFIG_ALTIVEC static inline int kvmppc_get_vsr_word_offset (int index) {int offset;@@ -864,6 +848,40 @@ static inline int kvmppc_get_vsr_word_offset(int index)return offset; } +static inline void kvmppc_set_vmx_dword (struct kvm_vcpu *vcpu, +u64 gpr) +{ +int index = vcpu->arch.io_gpr &KVM_MMIO_REG_MASK ;
arch/powerpc/kvm/powerpc.c static inline int kvmppc_get_vsr_word_offset(int index) · line 864
Quoted 10 lines
arch/powerpc/kvm/powerpc.c +10
-0+u64 hi = gpr >>32 ; +u64 lo = gpr &0xffffffff ; + +if (vcpu->arch.mmio_vmx_copy_nums =1 ) { +VCPU_VSX_VR (vcpu, index).u[kvmppc_get_vsr_word_offset (2 )] = hi; +VCPU_VSX_VR (vcpu, index).u[kvmppc_get_vsr_word_offset (3 )] = lo; + }else if (vcpu->arch.mmio_vmx_copy_nums =2 ) { +VCPU_VSX_VR (vcpu, index).u[kvmppc_get_vsr_word_offset (0 )] = hi; +VCPU_VSX_VR (vcpu, index).u[kvmppc_get_vsr_word_offset (1 )] = lo; + }
This splitting of the value into hi/lo words looks to me like you're assuming a big-endian byte ordering. It looks like it will end up swapping the words in each half of the register on a little-endian host (regardless of the endianness of the guest).
Quoted 63 lines
arch/powerpc/kvm/powerpc.c +49
-0+} +#endif /* CONFIG_ALTIVEC */ + +#ifdef CONFIG_VSX +static inline int kvmppc_get_vsr_dword_offset (int index) +{ +int offset; + +if ((index !=0 ) && (index !=1 )) +return -1 ; + +#ifdef __BIG_ENDIAN + offset = index; +#else + offset =1 - index; +#endif + +return offset; +} +static inline void kvmppc_set_vsr_dword (struct kvm_vcpu *vcpu,u64 gpr) {@@ -1027,6 +1045,11 @@ static void kvmppc_complete_mmio_load(struct kvm_vcpu *vcpu, KVMPPC_VSX_COPY_DWORD_LOAD_DUMP)kvmppc_set_vsr_dword_dump (vcpu ,gpr );break ; +#endif +#ifdef CONFIG_ALTIVEC +case KVM_MMIO_REG_VMX : +kvmppc_set_vmx_dword (vcpu, gpr); +break ;#endif default :BUG ();@@ -1307,6 +1330,99 @@ static int kvmppc_emulate_mmio_vsx_loadstore(struct kvm_vcpu *vcpu, }#endif /* CONFIG_VSX */ +#ifdef CONFIG_ALTIVEC +/* handle quadword load access in two halves */ +int kvmppc_handle_load128_by2x64 (struct kvm_run *run,struct kvm_vcpu *vcpu, +unsigned int rt,int is_default_endian) +{ +enum emulation_result emulated =EMULATE_DONE ; + +while (vcpu->arch.mmio_vmx_copy_nums) { + emulated =__kvmppc_handle_load (run, vcpu, rt,8 , + is_default_endian,0 ); +if (emulated !=EMULATE_DONE ) +break ; + + vcpu->arch.mmio_vmx_copy_nums--; + } +return emulated; +} + +static inline int kvmppc_get_vmx_data (struct kvm_vcpu *vcpu,int rs,u64 *val) +{ + +if (vcpu->arch.mmio_vmx_copy_nums =1 ) { + *val =VCPU_VSX_VR (vcpu, rs).u[kvmppc_get_vsr_word_offset (2 )]; + *val = (*val << 32) | VCPU_VSX_VR(vcpu, rs).
arch/powerpc/kvm/powerpc.c static int kvmppc_emulate_mmio_vsx_loadstore(struct kvm_vcpu *vcpu, · line 1366
Quoted 10 lines
arch/powerpc/kvm/powerpc.c +10
-0+ u[kvmppc_get_vsr_word_offset (3 )]; +return 0 ; + }else if (vcpu->arch.mmio_vmx_copy_nums =2 ) { + *val =VCPU_VSX_VR (vcpu, rs).u[kvmppc_get_vsr_word_offset (0 )]; + *val = (*val <<32 ) |VCPU_VSX_VR (vcpu, rs). + u[kvmppc_get_vsr_word_offset (1 )]; +return 0 ; + } +return -1 ; +}
Once again, the way this puts two word values together to get a doubleword looks wrong for a little-endian host.
Paul.
Re: [PATCH RESEND 1/1] KVM: PPC: Book3S: Add MMIO emulation for VMX instructions
Quoted 6 lines · Paul Mackerras
Quoted 5 lines · Jose Ricardo Ziviani
This patch provides the MMIO load/store vector indexed X-Form emulation.
Instructions implemented: lvx, stvx
Quoted 8 lines
Quoted 1 line
Signed-off-by Jose Ricardo Ziviani <[email protected]>What testing has been done of this patch? In particular, what combinations of endianness of host and guest have been tested? For a cross-endian situation (endianness of guest different from host) you would need to load the two halves of the VMX register image in reversed order (note that lvx/stvx are different from lxvd2x/stxvd2x and lxvw4x/stxvw4x in this respect), and I don't see that being done.
Hello! Thank you for reviewing it.
Yes, I tested it with both in little endian mode. You're absolutely right, I'll review the cross-endian scenario that's not covered indeed.
Quoted 25 lines
Also, lvx/stvx mask off the bottom 4 bits of the EA, and I don't see that being done.
[snip]
Quoted 19 lines
arch/powerpc/kvm/powerpc.c +0
-11@@ -832,23 +832,7 @@ void kvm_arch_irq_bypass_del_producer(struct irq_bypass_consumer *cons, kvm->arch.kvm_ops->irq_bypass_del_producer (cons, prod); } -#ifdef CONFIG_VSX -static inline int kvmppc_get_vsr_dword_offset (int index) -{ -int offset; - -if ((index !=0 ) && (index !=1 )) -return -1 ; - -#ifdef __BIG_ENDIAN - offset = index; -#else
Quoted 8 lines
arch/powerpc/kvm/powerpc.c void kvm_arch_irq_bypass_del_producer(struct irq_bypass_consumer *cons, · line 851
Quoted 6 lines
arch/powerpc/kvm/powerpc.c +0
-6- offset =1 - index; -#endif - -return offset; -} -Why does this function need to be moved down in the file?
The main reason is that I need it too but I need it available with ALTIVEC(1) support, so I changed the guard to ALTIVEC and moved it down closer to other related functions under the same guard. But I can move it back if you prefer.
(1)AFAIK it's possible to have ALTIVEC enabled but VSX disabled, not the other way around.
Quoted 20 lines
Quoted 20 lines
arch/powerpc/kvm/powerpc.c +12
-0+#ifdef CONFIG_ALTIVEC static inline int kvmppc_get_vsr_word_offset (int index) {int offset;@@ -864,6 +848,40 @@ static inline int kvmppc_get_vsr_word_offset(int index)return offset; } +static inline void kvmppc_set_vmx_dword (struct kvm_vcpu *vcpu, +u64 gpr) +{ +int index = vcpu->arch.io_gpr &KVM_MMIO_REG_MASK ; +u64 hi = gpr >>32 ; +u64 lo = gpr &0xffffffff ; + +if (vcpu->arch.mmio_vmx_copy_nums =1 ) { +VCPU_VSX_VR (vcpu, index).u[kvmppc_get_vsr_word_offset (2 )] = hi; +VCPU_VSX_VR (vcpu, index).u[kvmppc_get_vsr_word_offset (3 )] = lo; + }else if (vcpu->arch.mmio_vmx_copy_nums =2 ) {
Quoted 8 lines
arch/powerpc/kvm/powerpc.c static inline int kvmppc_get_vsr_word_offset(int index) · line 864
Quoted 3 lines
arch/powerpc/kvm/powerpc.c +3
-0+VCPU_VSX_VR (vcpu, index).u[kvmppc_get_vsr_word_offset (0 )] = hi; +VCPU_VSX_VR (vcpu, index).u[kvmppc_get_vsr_word_offset (1 )] = lo; + }This splitting of the value into hi/lo words looks to me like you're assuming a big-endian byte ordering. It looks like it will end up swapping the words in each half of the register on a little-endian host (regardless of the endianness of the guest).
Yep! I focused on VCPU_VSX_VR code to fill the vector correctly but missed the 64-bit value splitting. I'll fix it and improve the testing, considering other endian scenario.
Quoted 69 lines
Quoted 69 lines
arch/powerpc/kvm/powerpc.c +54
-0+} +#endif /* CONFIG_ALTIVEC */ + +#ifdef CONFIG_VSX +static inline int kvmppc_get_vsr_dword_offset (int index) +{ +int offset; + +if ((index !=0 ) && (index !=1 )) +return -1 ; + +#ifdef __BIG_ENDIAN + offset = index; +#else + offset =1 - index; +#endif + +return offset; +} +static inline void kvmppc_set_vsr_dword (struct kvm_vcpu *vcpu,u64 gpr) {@@ -1027,6 +1045,11 @@ static void kvmppc_complete_mmio_load(struct kvm_vcpu *vcpu, KVMPPC_VSX_COPY_DWORD_LOAD_DUMP)kvmppc_set_vsr_dword_dump (vcpu ,gpr );break ; +#endif +#ifdef CONFIG_ALTIVEC +case KVM_MMIO_REG_VMX : +kvmppc_set_vmx_dword (vcpu, gpr); +break ;#endif default :BUG ();@@ -1307,6 +1330,99 @@ static int kvmppc_emulate_mmio_vsx_loadstore(struct kvm_vcpu *vcpu, }#endif /* CONFIG_VSX */ +#ifdef CONFIG_ALTIVEC +/* handle quadword load access in two halves */ +int kvmppc_handle_load128_by2x64 (struct kvm_run *run,struct kvm_vcpu *vcpu, +unsigned int rt,int is_default_endian) +{ +enum emulation_result emulated =EMULATE_DONE ; + +while (vcpu->arch.mmio_vmx_copy_nums) { + emulated =__kvmppc_handle_load (run, vcpu, rt,8 , + is_default_endian,0 ); +if (emulated !=EMULATE_DONE ) +break ; + + vcpu->arch.mmio_vmx_copy_nums--; + } +return emulated; +} + +static inline int kvmppc_get_vmx_data (struct kvm_vcpu *vcpu,int rs,u64 *val) +{ + +if (vcpu->arch.mmio_vmx_copy_nums =1 ) { + *val =VCPU_VSX_VR (vcpu, rs).u[kvmppc_get_vsr_word_offset (2 )]; + *val = (*val <<32 ) |VCPU_VSX_VR (vcpu, rs). + u[kvmppc_get_vsr_word_offset (3 )]; +return 0 ; + }else if (vcpu->arch.mmio_vmx_copy_nums =2 ) { + *val =VCPU_VSX_VR (vcpu, rs).u[kvmppc_get_vsr_word_offset (0 )]; + *val = (*val << 32) | VCPU_VSX_VR(vcpu, rs).
Quoted 8 lines
arch/powerpc/kvm/powerpc.c static int kvmppc_emulate_mmio_vsx_loadstore(struct kvm_vcpu *vcpu, · line 1366
Quoted 5 lines
arch/powerpc/kvm/powerpc.c +5
-0+ u[kvmppc_get_vsr_word_offset (1 )]; +return 0 ; + } +return -1 ; +}Once again, the way this puts two word values together to get a doubleword looks wrong for a little-endian host.
Got it. It's clear the mixed-endianess confusion. I'll fix it, improve the test cases and send a V2.
Thank you Paul!
Quoted 7 lines
Paul.
--
To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html