s390x: Fix vector register alignment
cover s390x: Fix vector register alignment
Fix the alignment of "vregs". While at it, use an uin64_t as data type.
David Hildenbrand (2):
s390x: Align vector registers to 16 bytes
s390x: Use uint64_t for vector registers
linux-user/s390x/signal.c | 4 +- target/s390x/arch_dump.c | 8 +-- target/s390x/cpu.h | 4 +- target/s390x/excp_helper.c | 6 +- target/s390x/gdbstub.c | 16 ++--- target/s390x/helper.c | 10 +-- target/s390x/kvm.c | 16 ++--- target/s390x/machine.c | 128 ++++++++++++++++++------------------- target/s390x/translate.c | 2 +- 9 files changed, 97 insertions(+), 97 deletions(-)
Signature · 1 line
2.20.1
PATCH 1/2 s390x: Align vector registers to 16 bytes
11e2bfef7990 ("tcg/i386: Use MOVDQA for TCG_TYPE_V128 load/store") revealed that the vregs are not aligned to 16 bytes. Align them to 16 bytes, to avoid segfault'ing on x86.
--- target/s390x/cpu.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
target/s390x/cpu.h +1 -1
@@ -66,7 +66,7 @@ struct CPUS390XState {* The floating point registers are part of the vector registers. * vregs[0][0] -> vregs[15][0] are 16 floating point registers */ -CPU_DoubleU vregs[32 ][2 ];/* vector registers */ + CPU_DoubleU vregs[32][2] QEMU_ALIGNED(16); /* vector registers */uint32_t aregs[16 ];/* access registers */ uint8_t riccb[64 ];/* runtime instrumentation control */ uint64_t gscb[4 ];/* guarded storage control */
Signature · 1 line
2.20.1
Re: [Qemu-devel] [PATCH v1 1/2] s390x: Align vector registers to 16 bytes
Quoted 8 lines · David Hildenbrand
11e2bfef7990("tcg/i386: Use MOVDQA forTCG_TYPE_V128load/store") revealed that the vregs are not aligned to 16 bytes. Align them to 16 bytes, to avoid segfault'ing on x86.Signed-off-by David Hildenbrand <[email protected]>--- target/s390x/cpu.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
r~
PATCH 2/2 s390x: Use uint64_t for vector registers
In reply to David HildenbrandCPU_DoubleU is primarily used to reinterpret between integer and floats. We don't really need this functionality. So let's just keep it simple and use an uint64_t.
--- linux-user/s390x/signal.c | 4 +- target/s390x/arch_dump.c | 8 +-- target/s390x/cpu.h | 4 +- target/s390x/excp_helper.c | 6 +- target/s390x/gdbstub.c | 16 ++--- target/s390x/helper.c | 10 +-- target/s390x/kvm.c | 16 ++--- target/s390x/machine.c | 128 ++++++++++++++++++------------------- target/s390x/translate.c | 2 +- 9 files changed, 97 insertions(+), 97 deletions(-)
linux-user/s390x/signal.c +2 -2
@@ -123,7 +123,7 @@ static void save_sigregs(CPUS390XState *env, target_sigregs *sregs)*/ //save_fp_regs(¤t->thread.fp_regs); FIXME for (i =0 ; i <16 ; i++) { -__put_user (get_freg (env, i)->ll, &sregs->fpregs.fprs[i]); +__put_user (*get_freg (env, i), &sregs->fpregs.fprs[i]); } }
@@ -254,7 +254,7 @@ restore_sigregs(CPUS390XState *env, target_sigregs *sc)__get_user (env->aregs[i], &sc->regs.acrs[i]); }for (i =0 ; i <16 ; i++) { -__get_user (get_freg (env, i)->ll, &sc->fpregs.fprs[i]); +__get_user (*get_freg (env, i), &sc->fpregs.fprs[i]); }return err;
target/s390x/arch_dump.c +4 -4
@@ -104,7 +104,7 @@ static void s390x_write_elf64_fpregset(Note *note, S390CPU *cpu, int id) note->hdr.n_type =cpu_to_be32 (NT_FPREGSET ); note->contents.fpregset.fpc =cpu_to_be32 (cpu->env.fpc);for (i =0 ; i <=15 ; i++) { - note->contents.fpregset.fprs[i] =cpu_to_be64 (get_freg (cs, i)->ll); + note->contents.fpregset.fprs[i] =cpu_to_be64 (*get_freg (cs, i)); } }
@@ -114,7 +114,7 @@ static void s390x_write_elf64_vregslo(Note *note, S390CPU *cpu, int id) note->hdr.n_type =cpu_to_be32 (NT_S390_VXRS_LOW );for (i =0 ; i <=15 ; i++) { - note->contents.vregslo.vregs[i] =cpu_to_be64 (cpu->env.vregs[i][1 ].ll); + note->contents.vregslo.vregs[i] =cpu_to_be64 (cpu->env.vregs[i][1 ]); } }
@@ -127,8 +127,8 @@ static void s390x_write_elf64_vregshi(Note *note, S390CPU *cpu, int id) note->hdr.n_type =cpu_to_be32 (NT_S390_VXRS_HIGH );for (i =0 ; i <=15 ; i++) { - temp_vregshi->vregs[i][0 ] =cpu_to_be64 (cpu->env.vregs[i +16 ][0 ].ll); - temp_vregshi->vregs[i][1 ] =cpu_to_be64 (cpu->env.vregs[i +16 ][1 ].ll); + temp_vregshi->vregs[i][0 ] =cpu_to_be64 (cpu->env.vregs[i +16 ][0 ]); + temp_vregshi->vregs[i][1 ] =cpu_to_be64 (cpu->env.vregs[i +16 ][1 ]); } }
target/s390x/cpu.h +2 -2
@@ -66,7 +66,7 @@ struct CPUS390XState {* The floating point registers are part of the vector registers. * vregs[0][0] -> vregs[15][0] are 16 floating point registers */ - CPU_DoubleU vregs[32][2] QEMU_ALIGNED(16); /* vector registers */ + uint64_t vregs[32][2] QEMU_ALIGNED(16); /* vector registers */uint32_t aregs[16 ];/* access registers */ uint8_t riccb[64 ];/* runtime instrumentation control */ uint64_t gscb[4 ];/* guarded storage control */
@@ -153,7 +153,7 @@ struct CPUS390XState { }; -static inline CPU_DoubleU *get_freg (CPUS390XState *cs,int nr) +static inline uint64_t *get_freg (CPUS390XState *cs,int nr) {return &cs->vregs[nr][0 ]; }
target/s390x/excp_helper.c +3 -3
@@ -390,8 +390,8 @@ static int mchk_store_vregs(CPUS390XState *env, uint64_t mcesao) }for (i =0 ; i <32 ; i++) { - sa->vregs[i][0 ] =cpu_to_be64 (env->vregs[i][0 ].ll); - sa->vregs[i][1 ] =cpu_to_be64 (env->vregs[i][1 ].ll); + sa->vregs[i][0 ] =cpu_to_be64 (env->vregs[i][0 ]); + sa->vregs[i][1 ] =cpu_to_be64 (env->vregs[i][1 ]); }cpu_physical_memory_unmap (sa, len,1 , len);
@@ -429,7 +429,7 @@ static void do_mchk_interrupt(CPUS390XState *env) lowcore->ar_access_id =1 ;for (i =0 ; i <16 ; i++) { - lowcore->floating_pt_save_area[i] =cpu_to_be64 (get_freg (env, i)->ll); + lowcore->floating_pt_save_area[i] =cpu_to_be64 (*get_freg (env, i)); lowcore->gpregs_save_area[i] =cpu_to_be64 (env->regs[i]); lowcore->access_regs_save_area[i] =cpu_to_be32 (env->aregs[i]); lowcore->cregs_save_area[i] =cpu_to_be64 (env->cregs[i]);
target/s390x/gdbstub.c +8 -8
@@ -116,7 +116,7 @@ static int cpu_read_fp_reg(CPUS390XState *env, uint8_t *mem_buf, int n)case S390_FPC_REGNUM :return gdb_get_reg32 (mem_buf, env->fpc); case S390_F0_REGNUM ... S390_F15_REGNUM: -return gdb_get_reg64 (mem_buf,get_freg (env, n -S390_F0_REGNUM )->ll); +return gdb_get_reg64 (mem_buf, *get_freg (env, n -S390_F0_REGNUM ));default :return 0 ; }
@@ -129,7 +129,7 @@ static int cpu_write_fp_reg(CPUS390XState *env, uint8_t *mem_buf, int n) env->fpc =ldl_p (mem_buf);return 4 ; case S390_F0_REGNUM ... S390_F15_REGNUM: -get_freg (env, n -S390_F0_REGNUM )->ll =ldtul_p (mem_buf); + *get_freg (env, n -S390_F0_REGNUM ) =ldtul_p (mem_buf);return 8 ;default :return 0 ;
@@ -150,11 +150,11 @@ static int cpu_read_vreg(CPUS390XState *env, uint8_t *mem_buf, int n)switch (n) { case S390_V0L_REGNUM ... S390_V15L_REGNUM: - ret =gdb_get_reg64 (mem_buf, env->vregs[n][1 ].ll); + ret =gdb_get_reg64 (mem_buf, env->vregs[n][1 ]);break ; case S390_V16_REGNUM ... S390_V31_REGNUM: - ret =gdb_get_reg64 (mem_buf, env->vregs[n][0 ].ll); - ret +=gdb_get_reg64 (mem_buf +8 , env->vregs[n][1 ].ll); + ret =gdb_get_reg64 (mem_buf, env->vregs[n][0 ]); + ret +=gdb_get_reg64 (mem_buf +8 , env->vregs[n][1 ]);break ;default : ret =0 ;
@@ -167,11 +167,11 @@ static int cpu_write_vreg(CPUS390XState *env, uint8_t *mem_buf, int n) {switch (n) { case S390_V0L_REGNUM ... S390_V15L_REGNUM: - env->vregs[n][1 ].ll =ldtul_p (mem_buf +8 ); + env->vregs[n][1 ] =ldtul_p (mem_buf +8 );return 8 ; case S390_V16_REGNUM ... S390_V31_REGNUM: - env->vregs[n][0 ].ll =ldtul_p (mem_buf); - env->vregs[n][1 ].ll =ldtul_p (mem_buf +8 ); + env->vregs[n][0 ] =ldtul_p (mem_buf); + env->vregs[n][1 ] =ldtul_p (mem_buf +8 );return 16 ;default :return 0 ;
target/s390x/helper.c +5 -5
@@ -249,7 +249,7 @@ int s390_store_status(S390CPU *cpu, hwaddr addr, bool store_arch)cpu_physical_memory_write (offsetof(LowCore , ar_access_id), &ar_id,1 ); }for (i =0 ; i <16 ; ++i) { - sa->fprs[i] =cpu_to_be64 (get_freg (&cpu->env, i)->ll); + sa->fprs[i] =cpu_to_be64 (*get_freg (&cpu->env, i)); }for (i =0 ; i <16 ; ++i) { sa->grs[i] =cpu_to_be64 (cpu->env.regs[i]);
@@ -299,8 +299,8 @@ int s390_store_adtl_status(S390CPU *cpu, hwaddr addr, hwaddr len)if (s390_has_feat (S390_FEAT_VECTOR )) {for (i =0 ; i <32 ; i++) { - sa->vregs[i][0 ] =cpu_to_be64 (cpu->env.vregs[i][0 ].ll); - sa->vregs[i][1 ] =cpu_to_be64 (cpu->env.vregs[i][1 ].ll); + sa->vregs[i][0 ] =cpu_to_be64 (cpu->env.vregs[i][0 ]); + sa->vregs[i][1 ] =cpu_to_be64 (cpu->env.vregs[i][1 ]); } }if (s390_has_feat (S390_FEAT_GUARDED_STORAGE ) && len >=ADTL_GS_MIN_SIZE ) {
@@ -341,13 +341,13 @@ void s390_cpu_dump_state(CPUState *cs, FILE *f, int flags)if (s390_has_feat (S390_FEAT_VECTOR )) {for (i =0 ; i <32 ; i++) {qemu_fprintf (f,"V%02d=%016" PRIx64"%016" PRIx64"%c" , - i, env->vregs[i][0 ].ll, env->vregs[i][1 ].ll, + i, env->vregs[i][0 ], env->vregs[i][1 ], i %2 ?'\n' :' ' ); } }else {for (i =0 ; i <16 ; i++) {qemu_fprintf (f,"F%02d=%016" PRIx64"%c" , - i,get_freg (env, i)->ll, + i, *get_freg (env, i), (i %4 ) ==3 ?'\n' :' ' ); } }
target/s390x/kvm.c +8 -8
@@ -418,21 +418,21 @@ int kvm_arch_put_registers(CPUState *cs, int level)if (can_sync_regs (cs,KVM_SYNC_VRS )) {for (i =0 ; i <32 ; i++) { - cs->kvm_run->s.regs.vrs[i][0 ] = env->vregs[i][0 ].ll; - cs->kvm_run->s.regs.vrs[i][1 ] = env->vregs[i][1 ].ll; + cs->kvm_run->s.regs.vrs[i][0 ] = env->vregs[i][0 ]; + cs->kvm_run->s.regs.vrs[i][1 ] = env->vregs[i][1 ]; } cs->kvm_run->s.regs.fpc = env->fpc; cs->kvm_run->kvm_dirty_regs |=KVM_SYNC_VRS ; }else if (can_sync_regs (cs,KVM_SYNC_FPRS )) {for (i =0 ; i <16 ; i++) { - cs->kvm_run->s.regs.fprs[i] =get_freg (env, i)->ll; + cs->kvm_run->s.regs.fprs[i] = *get_freg (env, i); } cs->kvm_run->s.regs.fpc = env->fpc; cs->kvm_run->kvm_dirty_regs |=KVM_SYNC_FPRS ; }else {/* Floating point */ for (i =0 ; i <16 ; i++) { - fpu.fprs[i] =get_freg (env, i)->ll; + fpu.fprs[i] = *get_freg (env, i); } fpu.fpc = env->fpc;
@@ -586,13 +586,13 @@ int kvm_arch_get_registers(CPUState *cs)/* Floating point and vector registers */ if (can_sync_regs (cs,KVM_SYNC_VRS )) {for (i =0 ; i <32 ; i++) { - env->vregs[i][0 ].ll = cs->kvm_run->s.regs.vrs[i][0 ]; - env->vregs[i][1 ].ll = cs->kvm_run->s.regs.vrs[i][1 ]; + env->vregs[i][0 ] = cs->kvm_run->s.regs.vrs[i][0 ]; + env->vregs[i][1 ] = cs->kvm_run->s.regs.vrs[i][1 ]; } env->fpc = cs->kvm_run->s.regs.fpc; }else if (can_sync_regs (cs,KVM_SYNC_FPRS )) {for (i =0 ; i <16 ; i++) { -get_freg (env, i)->ll = cs->kvm_run->s.regs.fprs[i]; +get_freg (env, i) = cs->kvm_run->s.regs.fprs[i]; } env->fpc = cs->kvm_run->s.regs.fpc; }else {
@@ -601,7 +601,7 @@ int kvm_arch_get_registers(CPUState *cs)return r; }for (i =0 ; i <16 ; i++) { -get_freg (env, i)->ll = fpu.fprs[i]; +get_freg (env, i) = fpu.fprs[i]; } env->fpc = fpu.fpc; }
target/s390x/machine.c +64 -64
140 lines not on this page · raw message
target/s390x/translate.c +1 -1
@@ -149,7 +149,7 @@ void s390x_translate_init(void)static inline int vec_full_reg_offset (uint8_t reg) {g_assert (reg <32 ); - return offsetof(CPUS390XState, vregs[reg][0].d); + return offsetof(CPUS390XState, vregs[reg][0]); }static inline int vec_reg_offset (uint8_t reg,uint8_t enr,TCGMemOp es)
Signature · 1 line
2.20.1
Re: [Qemu-devel] [PATCH v1 2/2] s390x: Use uint64_t for vector registers
Quoted 5 lines · On Wed, 29 May 2019 09:27:26 +0200 David Hildenbrand <[email protected]> wrote:
CPU_DoubleUis primarily used to reinterpret between integer and floats. We don't really need this functionality. So let's just keep it simple and use anuint64_t.Signed-off-by David Hildenbrand <[email protected]>
Quoted 11 lines
--- linux-user/s390x/signal.c | 4 +- target/s390x/arch_dump.c | 8 +-- target/s390x/cpu.h | 4 +- target/s390x/excp_helper.c | 6 +- target/s390x/gdbstub.c | 16 ++--- target/s390x/helper.c | 10 +-- target/s390x/kvm.c | 16 ++--- target/s390x/machine.c | 128 ++++++++++++++++++------------------- target/s390x/translate.c | 2 +- 9 files changed, 97 insertions(+), 97 deletions(-)
Indeed, we only ever accessed them via ->ll anyway.
(Migration looks unaffected as well.)
Re: [Qemu-devel] [PATCH v1 2/2] s390x: Use uint64_t for vector registers
In reply to David HildenbrandQuoted 5 lines · David Hildenbrand
CPU_DoubleUis primarily used to reinterpret between integer and floats. We don't really need this functionality. So let's just keep it simple and use anuint64_t.Signed-off-by David Hildenbrand <[email protected]>
Quoted 11 lines
--- linux-user/s390x/signal.c | 4 +- target/s390x/arch_dump.c | 8 +-- target/s390x/cpu.h | 4 +- target/s390x/excp_helper.c | 6 +- target/s390x/gdbstub.c | 16 ++--- target/s390x/helper.c | 10 +-- target/s390x/kvm.c | 16 ++--- target/s390x/machine.c | 128 ++++++++++++++++++------------------- target/s390x/translate.c | 2 +- 9 files changed, 97 insertions(+), 97 deletions(-)
r~