| Message ID | 20190916135806.1269-19-david@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | s390x/tcg: mem_helper: Fault-safe handling | expand |
On 9/16/19 9:57 AM, David Hildenbrand wrote: > As we are moving between address spaces, we can use access_memmove_idx() > without checking for destructive overlaps (especially of real storage > locations): > "Each storage operand is processed left to right. The > storage-operand-consistency rules are the same as > for MOVE (MVC), except that when the operands > overlap in real storage, the use of the common real- > storage locations is not necessarily recognized." > > Signed-off-by: David Hildenbrand <david@redhat.com> > --- > target/s390x/mem_helper.c | 26 ++++++++++++-------------- > 1 file changed, 12 insertions(+), 14 deletions(-) Comment references access_memmove_idx. Reviewed-by: Richard Henderson <richard.henderson@linaro.org> r~
On 17.09.19 22:20, Richard Henderson wrote: > On 9/16/19 9:57 AM, David Hildenbrand wrote: >> As we are moving between address spaces, we can use access_memmove_idx() >> without checking for destructive overlaps (especially of real storage >> locations): >> "Each storage operand is processed left to right. The >> storage-operand-consistency rules are the same as >> for MOVE (MVC), except that when the operands >> overlap in real storage, the use of the common real- >> storage locations is not necessarily recognized." >> >> Signed-off-by: David Hildenbrand <david@redhat.com> >> --- >> target/s390x/mem_helper.c | 26 ++++++++++++-------------- >> 1 file changed, 12 insertions(+), 14 deletions(-) > > Comment references access_memmove_idx. Indeed, thanks! > > Reviewed-by: Richard Henderson <richard.henderson@linaro.org> > > > r~ >
diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c index e50cec9263..6b85f44e22 100644 --- a/target/s390x/mem_helper.c +++ b/target/s390x/mem_helper.c @@ -2086,8 +2086,9 @@ uint32_t HELPER(rrbe)(CPUS390XState *env, uint64_t r2) uint32_t HELPER(mvcs)(CPUS390XState *env, uint64_t l, uint64_t a1, uint64_t a2) { const uint8_t psw_as = (env->psw.mask & PSW_MASK_ASC) >> PSW_SHIFT_ASC; + S390Access srca, desta; uintptr_t ra = GETPC(); - int cc = 0, i; + int cc = 0; HELPER_LOG("%s: %16" PRIx64 " %16" PRIx64 " %16" PRIx64 "\n", __func__, l, a1, a2); @@ -2106,20 +2107,19 @@ uint32_t HELPER(mvcs)(CPUS390XState *env, uint64_t l, uint64_t a1, uint64_t a2) return cc; } - /* XXX replace w/ memcpy */ - for (i = 0; i < l; i++) { - uint8_t x = cpu_ldub_primary_ra(env, a2 + i, ra); - cpu_stb_secondary_ra(env, a1 + i, x, ra); - } - + /* TODO: Access key handling */ + srca = access_prepare(env, a2, l, MMU_DATA_LOAD, MMU_PRIMARY_IDX, ra); + desta = access_prepare(env, a1, l, MMU_DATA_STORE, MMU_SECONDARY_IDX, ra); + access_memmove(env, &desta, &srca, ra); return cc; } uint32_t HELPER(mvcp)(CPUS390XState *env, uint64_t l, uint64_t a1, uint64_t a2) { const uint8_t psw_as = (env->psw.mask & PSW_MASK_ASC) >> PSW_SHIFT_ASC; + S390Access srca, desta; uintptr_t ra = GETPC(); - int cc = 0, i; + int cc = 0; HELPER_LOG("%s: %16" PRIx64 " %16" PRIx64 " %16" PRIx64 "\n", __func__, l, a1, a2); @@ -2138,12 +2138,10 @@ uint32_t HELPER(mvcp)(CPUS390XState *env, uint64_t l, uint64_t a1, uint64_t a2) return cc; } - /* XXX replace w/ memcpy */ - for (i = 0; i < l; i++) { - uint8_t x = cpu_ldub_secondary_ra(env, a2 + i, ra); - cpu_stb_primary_ra(env, a1 + i, x, ra); - } - + /* TODO: Access key handling */ + srca = access_prepare(env, a2, l, MMU_DATA_LOAD, MMU_SECONDARY_IDX, ra); + desta = access_prepare(env, a1, l, MMU_DATA_STORE, MMU_PRIMARY_IDX, ra); + access_memmove(env, &desta, &srca, ra); return cc; }
As we are moving between address spaces, we can use access_memmove_idx() without checking for destructive overlaps (especially of real storage locations): "Each storage operand is processed left to right. The storage-operand-consistency rules are the same as for MOVE (MVC), except that when the operands overlap in real storage, the use of the common real- storage locations is not necessarily recognized." Signed-off-by: David Hildenbrand <david@redhat.com> --- target/s390x/mem_helper.c | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-)