Implements MMIO emulation for lvx/stvx instructions
Subsystems (2)
v5 cover Implements MMIO emulation for lvx/stvx instructions
v5:
- Fixed the mask off of the effective address
v4:
- Changed KVM_MMIO_REG_VMX to 0xc0 because there are 64 VSX registers
v3:
- Added Reported-by in the commit message
v2:
- kvmppc_get_vsr_word_offset() moved back to its original place
- EA AND ~0xF, following ISA.
- fixed BE/LE cases
TESTS:
For testing purposes I wrote a small program that performs stvx/lvx using the program's virtual memory and using MMIO. Load/Store into virtual memory is the model I use to check if MMIO results are correct (because only MMIO is emulated by KVM).
Results:
HOST LE - GUEST BE
address: 0x100348500100x21436587bbbbaaaa4444555578563412io_address: 0x3fff89a200000x21436587bbbbaaaa4444555578563412
HOST LE - GUEST LE
address: 0x10033a200100x1234567855554444aaaabbbb87654321io_address: 0x3fffb53800000x1234567855554444aaaabbbb87654321
HOST BE - GUEST BE
address: 0x1002c4a00100x21436587bbbbaaaa4444555578563412io_address: 0x3ffface400000x21436587bbbbaaaa4444555578563412
HOST BR - GUEST LE
address: 0x100225e00100x1234567855554444aaaabbbb87654321io_address: 0x3fff7fcb00000x1234567855554444aaaabbbb87654321
This patch implements MMIO emulation for two instructions: lvx and stvx.
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 | 34 ++++++++ arch/powerpc/kvm/powerpc.c | 153 +++++++++++++++++++++++++++++++++- 5 files changed, 198 insertions(+), 1 deletion(-)
Signature · 1 line
2.14.3
PATCH v5 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: the quadword in storage addressed by the result of EA & 0xffff_ffff_ffff_fff0 is loaded into VRT.
stvx: the contents of VRS are stored into the quadword in storage addressed by the result of EA & 0xffff_ffff_ffff_fff0.
--- 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 | 34 ++++++++ arch/powerpc/kvm/powerpc.c | 153 +++++++++++++++++++++++++++++++++- 5 files changed, 198 insertions(+), 1 deletion(-)
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 0x00c0#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 +34 -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,27 @@ 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.vaddr_accessed &= ~0xFULL ; + 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.vaddr_accessed &= ~0xFULL ; + 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 +152 -1
190 lines not on this page · raw message
Signature · 1 line
2.14.3
Re: [PATCH v5 1/1] KVM: PPC: Book3S: Add MMIO emulation for VMX instructions
Quoted 146 lines · Jose Ricardo Ziviani
This patch provides the MMIO load/store vector indexed X-Form emulation.
Instructions implemented:
lvx: the quadword in storage addressed by the result of EA & 0xffff_ffff_ffff_fff0 is loaded into VRT.stvx: the contents of VRS are stored into the quadword in storage addressed by the result of EA & 0xffff_ffff_ffff_fff0.
Reported-by Gopesh Kumar Chaudhary <[email protected]>Reported-by Balamuruhan S <[email protected]>Signed-off-by Jose Ricardo Ziviani <[email protected]>--- 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 | 34 ++++++++ arch/powerpc/kvm/powerpc.c | 153 +++++++++++++++++++++++++++++++++- 5 files changed, 198 insertions(+), 1 deletion(-)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 0x00c0#define __KVM_HAVE_ARCH_WQP#define __KVM_HAVE_CREATE_DEVICEarch/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 53arch/powerpc/kvm/emulate_loadstore.c +34
-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,27 @@ 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.vaddr_accessed &= ~0xFULL ; + 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.vaddr_accessed &= ~0xFULL ; + 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 +1
-1@@ -832,7 +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 +#ifdef CONFIG_ALTIVEC static inline int kvmppc_get_vsr_dword_offset (int index) {int offset;
arch/powerpc/kvm/powerpc.c static inline int kvmppc_get_vsr_dword_offset(int index) · line 854
Quoted 7 lines
arch/powerpc/kvm/powerpc.c +2
-0@@ -848,7 +848,9 @@ static inline int kvmppc_get_vsr_dword_offset(int index) return offset; } +#endif /* CONFIG_ALTIVEC */ +#ifdef CONFIG_VSX static inline int kvmppc_get_vsr_word_offset (int index)
You make the dword version available with ALTIVEC && ~VSX, but in fact it's the word version that you use below. However, I don't think we actually want either of them (see below).
Quoted 18 lines
arch/powerpc/kvm/powerpc.c +12
-0{int offset;@@ -925,6 +927,31 @@ static inline void kvmppc_set_vsr_word(struct kvm_vcpu *vcpu, }#endif /* CONFIG_VSX */ +#ifdef CONFIG_ALTIVEC +static inline void kvmppc_set_vmx_dword (struct kvm_vcpu *vcpu, +u64 gpr) +{ +int index = vcpu->arch.io_gpr &KVM_MMIO_REG_MASK ; +u32 hi, lo; + +#ifdef __BIG_ENDIAN + hi = gpr >>32 ; + lo = gpr &0xffffffff ; +#else + lo = gpr >>32 ;
arch/powerpc/kvm/powerpc.c static inline void kvmppc_set_vsr_word(struct kvm_vcpu *vcpu, · line 951
Quoted 10 lines
arch/powerpc/kvm/powerpc.c +10
-0+ hi = gpr &0xffffffff ; +#endif + +if (vcpu->arch.mmio_vmx_copy_nums =1 ) { +VCPU_VSX_VR (vcpu, index).u[kvmppc_get_vsr_word_offset (2 )] = lo; +VCPU_VSX_VR (vcpu, index).u[kvmppc_get_vsr_word_offset (3 )] = hi; + }else if (vcpu->arch.mmio_vmx_copy_nums =2 ) { +VCPU_VSX_VR (vcpu, index).u[kvmppc_get_vsr_word_offset (0 )] = lo; +VCPU_VSX_VR (vcpu, index).u[kvmppc_get_vsr_word_offset (1 )] = hi; + }
Since what we're doing is a 16-byte load, the main thing we have to do here in handling a cross-endian situation is to swap the two 8-byte halves. The byte-swapping within each 8-byte half has already been handled more generically.
I suggest the following code. It is simpler and passes my test case.
static inline void kvmppc_set_vmx_dword(struct kvm_vcpu *vcpu,
u64 gpr)
{
int index = vcpu->arch.io_gpr & KVM_MMIO_REG_MASK;
u32 hi, lo;
u32 di;#ifdef __BIG_ENDIAN hi = gpr >> 32; lo = gpr & 0xffffffff; #else lo = gpr >> 32; hi = gpr & 0xffffffff;
#endif
di = 2 - vcpu->arch.mmio_vmx_copy_nums; /* doubleword index */ if (di > 1) return; if (vcpu->arch.mmio_host_swabbed) di = 1 - di; VCPU_VSX_VR(vcpu, index).u[di * 2] = hi; VCPU_VSX_VR(vcpu, index).u[di * 2 + 1] = lo; }
Quoted 14 lines
arch/powerpc/kvm/powerpc.c +14
-0+static inline int kvmppc_get_vmx_data (struct kvm_vcpu *vcpu,int rs,u64 *val) +{ +vector128 vrs =VCPU_VSX_VR (vcpu, rs); + +if (vcpu->arch.mmio_vmx_copy_nums =1 ) { +#ifdef __BIG_ENDIAN + *val = vrs.u[kvmppc_get_vsr_word_offset (3 )]; + *val = (*val <<32 ) | vrs.u[kvmppc_get_vsr_word_offset (2 )]; +#else + *val = vrs.u[kvmppc_get_vsr_word_offset (2 )]; + *val = (*val <<32 ) | vrs.u[kvmppc_get_vsr_word_offset (3 )]; +#endif +return 0 ; + }else if (vcpu->arch.mmio_vmx_copy_nums =2 ) {
arch/powerpc/kvm/powerpc.c static int kvmppc_emulate_mmio_vsx_loadstore(struct kvm_vcpu *vcpu, · line 1386
Quoted 10 lines
arch/powerpc/kvm/powerpc.c +10
-0+#ifdef __BIG_ENDIAN + *val = vrs.u[kvmppc_get_vsr_word_offset (1 )]; + *val = (*val <<32 ) | vrs.u[kvmppc_get_vsr_word_offset (0 )]; +#else + *val = vrs.u[kvmppc_get_vsr_word_offset (0 )]; + *val = (*val <<32 ) | vrs.u[kvmppc_get_vsr_word_offset (1 )]; +#endif +return 0 ; + } +return -1 ;
Once again the main thing is to swap the two halves. My suggested code is:
static inline int kvmppc_get_vmx_data(struct kvm_vcpu *vcpu, int rs, u64 *val)
{
vector128 vrs = VCPU_VSX_VR(vcpu, rs);
u32 di;
u64 w0, w1;
di = 2 - vcpu->arch.mmio_vmx_copy_nums; /* doubleword index */
if (di > 1)
return -1;
if (vcpu->arch.mmio_host_swabbed)
di = 1 - di;
w0 = vrs.u[di * 2];
w1 = vrs.u[di * 2 + 1];#ifdef __BIG_ENDIAN *val = (w0 << 32) | w1; #else *val = (w1 << 32) | w0; #endif return 0; }
Paul.
Quoted 14 lines · Jose Ricardo Ziviani
v5:
- Fixed the mask off of the effective addressv4:
- ChangedKVM_MMIO_REG_VMXto0xc0because there are 64 VSX registersv3:
- Added Reported-by in the commit messagev2:
-kvmppc_get_vsr_word_offset()moved back to its original place
- EA AND ~0xF, following ISA.
- fixed BE/LE cases
Quoted 6 lines
TESTS:
For testing purposes I wrote a small program that performs stvx/lvx using the program's virtual memory and using MMIO. Load/Store into virtual memory is the model I use to check if MMIO results are correct (because only MMIO is emulated by KVM).
I'd be interested to see your test program because in my testing it's still not right, unfortunately. Interestingly, it is right for the BE guest on LE host case. However, with a LE guest on a LE host the two halves are swapped, both for lvx and stvx:
error in lvx at byte 0
was: -> 62 69 70 77 7e 85 8c 93 2a 31 38 3f 46 4d 54 5b
ref: -> 2a 31 38 3f 46 4d 54 5b 62 69 70 77 7e 85 8c 93 error in stvx at byte 0
was: -> 49 50 57 5e 65 6c 73 7a 11 18 1f 26 2d 34 3b 42
ref: -> 11 18 1f 26 2d 34 3b 42 49 50 57 5e 65 6c 73 7a
The byte order within each 8-byte half is correct but the two halves are swapped. ("was" is what was in memory and "ref" is the correct value. For lvx it does lvx from emulated MMIO and stvx to ordinary memory, and for stvx it does lvx from ordinary memory and stvx to emulated MMIO. In both cases the checking is done with a byte by byte comparison.)
Paul.
Quoted 22 lines · Paul Mackerras
Quoted 14 lines · Jose Ricardo Ziviani
v5:
- Fixed the mask off of the effective addressv4:
- ChangedKVM_MMIO_REG_VMXto0xc0because there are 64 VSX registersv3:
- Added Reported-by in the commit messagev2:
-kvmppc_get_vsr_word_offset()moved back to its original place
- EA AND ~0xF, following ISA.
- fixed BE/LE casesQuoted 6 lines
TESTS:
For testing purposes I wrote a small program that performs stvx/lvx using the program's virtual memory and using MMIO. Load/Store into virtual memory is the model I use to check if MMIO results are correct (because only MMIO is emulated by KVM).
Quoted 4 lines
I'd be interested to see your test program because in my testing it's still not right, unfortunately. Interestingly, it is right for the BE guest on LE host case. However, with a LE guest on a LE host the two halves are swapped, both for lvx and stvx:
Absolutely, here it's: https://gist.github.com/jrziviani/a65e71c5d661bffa8afcd6710fedd520
It basically maps an IO region and also allocates some memory from the program's address space. Then I store to/load from both addresses and compare the results. Because only the mmio load/store are emulated, I
use the regular load/store as a model.
Quoted 8 lines
error in lvx at byte 0
was: -> 62 69 70 77 7e 85 8c 93 2a 31 38 3f 46 4d 54 5b
ref: -> 2a 31 38 3f 46 4d 54 5b 62 69 70 77 7e 85 8c 93 error in stvx at byte 0
was: -> 49 50 57 5e 65 6c 73 7a 11 18 1f 26 2d 34 3b 42
ref: -> 11 18 1f 26 2d 34 3b 42 49 50 57 5e 65 6c 73 7a
Quoted 6 lines
The byte order within each 8-byte half is correct but the two halves are swapped. ("was" is what was in memory and "ref" is the correct value. For lvx it does lvx from emulated MMIO and stvx to ordinary memory, and for stvx it does lvx from ordinary memory and stvx to emulated MMIO. In both cases the checking is done with a byte by byte comparison.)
The funny thing is that I still see it right in both cases, so I believe that my test case is incorrect. Example (host LE, guest LE):
==> VR0 after lvx
(gdb) p $vr0
{uint128 = 0x1234567855554444aaaabbbb87654321, v4_float = {
-1.72477726e-34, -3.03283305e-13, 1.46555735e+13, 5.69045661e-28},
v4_int32 = {-2023406815, -1431651397, 1431651396, 305419896}, v8_int16 = {
17185, -30875, -17477, -21846, 17476, 21845, 22136, 4660}, v16_int8 = {33,
67, 101, -121, -69, -69, -86, -86, 68, 68, 85, 85, 120, 86, 52, 18}}address: 0x100300100x1234567855554444aaaabbbb87654321
==> VR0 after lvx from MMIO
(gdb) p $vr0
$3 = {uint128 = 0x1234567855554444aaaabbbb87654321, v4_float = {
-1.72477726e-34, -3.03283305e-13, 1.46555735e+13, 5.69045661e-28},
v4_int32 = {-2023406815, -1431651397, 1431651396, 305419896}, v8_int16 = {
17185, -30875, -17477, -21846, 17476, 21845, 22136, 4660}, v16_int8 = {33,
67, 101, -121, -69, -69, -86, -86, 68, 68, 85, 85, 120, 86, 52, 18}}io_address: 0x3fffb7f700000x1234567855554444aaaabbbb87654321
I only see it wrong when I mess with copy order:
if (vcpu->arch.mmio_vmx_copy_nums = /*from 1 to */ 2) {
VCPU_VSX_VR(vcpu, index).u[kvmppc_get_vsr_word_offset(2)] = lo;
VCPU_VSX_VR(vcpu, index).u[kvmppc_get_vsr_word_offset(3)] = hi;
} else if (vcpu->arch.mmio_vmx_copy_nums = /*from 2 to */ 1) {
VCPU_VSX_VR(vcpu, index).u[kvmppc_get_vsr_word_offset(0)] = lo;
VCPU_VSX_VR(vcpu, index).u[kvmppc_get_vsr_word_offset(1)] = hi;
}then I get:
address: 0x1003b5300100x1234567855554444aaaabbbb87654321io_address: 0x3fff811a00000xaaaabbbb876543211234567855554444
Anyway, your suggestion works great and it's a way more elegant/easy to understand. I'll send the next version with it.
Thank you very much for your patience and hints that helped me to understand KVM better. :-)
Quoted 3 lines
Paul.