[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 16/48] accel/tcg: Report unaligned atomics for user-only
From: |
Richard Henderson |
Subject: |
[PATCH v4 16/48] accel/tcg: Report unaligned atomics for user-only |
Date: |
Tue, 12 Oct 2021 19:45:35 -0700 |
Use the new cpu_loop_exit_sigbus for atomic_mmu_lookup, which
has access to complete alignment info from the TCGMemOpIdx arg.
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
accel/tcg/user-exec.c | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c
index 83ed76cef9..5dcd58c6d5 100644
--- a/accel/tcg/user-exec.c
+++ b/accel/tcg/user-exec.c
@@ -547,11 +547,22 @@ static void *atomic_mmu_lookup(CPUArchState *env,
target_ulong addr,
MemOpIdx oi, int size, int prot,
uintptr_t retaddr)
{
+ MemOp mop = get_memop(oi);
+ int a_bits = get_alignment_bits(mop);
+ void *ret;
+
+ /* Enforce guest required alignment. */
+ if (unlikely(addr & ((1 << a_bits) - 1))) {
+ MMUAccessType t = prot == PAGE_READ ? MMU_DATA_LOAD : MMU_DATA_STORE;
+ cpu_loop_exit_sigbus(env_cpu(env), addr, t, retaddr);
+ }
+
/* Enforce qemu required alignment. */
if (unlikely(addr & (size - 1))) {
cpu_loop_exit_atomic(env_cpu(env), retaddr);
}
- void *ret = g2h(env_cpu(env), addr);
+
+ ret = g2h(env_cpu(env), addr);
set_helper_retaddr(retaddr);
return ret;
}
--
2.25.1
- [PATCH v4 11/48] linux-user/hppa: Remove POWERPC_EXCP_ALIGN handling, (continued)
- [PATCH v4 11/48] linux-user/hppa: Remove POWERPC_EXCP_ALIGN handling, Richard Henderson, 2021/10/12
- [PATCH v4 12/48] target/sh4: Set fault address in superh_cpu_do_unaligned_access, Richard Henderson, 2021/10/12
- [PATCH v4 07/48] target/ppc: Move SPR_DSISR setting to powerpc_excp, Richard Henderson, 2021/10/12
- [PATCH v4 08/48] target/ppc: Set fault address in ppc_cpu_do_unaligned_access, Richard Henderson, 2021/10/12
- [PATCH v4 09/48] target/ppc: Restrict ppc_cpu_do_unaligned_access to sysemu, Richard Henderson, 2021/10/12
- [PATCH v4 10/48] target/s390x: Implement s390x_cpu_record_sigbus, Richard Henderson, 2021/10/12
- [PATCH v4 13/48] target/sparc: Remove DEBUG_UNALIGNED, Richard Henderson, 2021/10/12
- [PATCH v4 14/48] target/sparc: Split out build_sfsr, Richard Henderson, 2021/10/12
- [PATCH v4 15/48] target/sparc: Set fault address in sparc_cpu_do_unaligned_access, Richard Henderson, 2021/10/12
- [PATCH v4 16/48] accel/tcg: Report unaligned atomics for user-only,
Richard Henderson <=
- [PATCH v4 18/48] target/i386: Use MO_128 for 16 byte atomics, Richard Henderson, 2021/10/12
- [PATCH v4 17/48] target/arm: Use MO_128 for 16 byte atomics, Richard Henderson, 2021/10/12
- [PATCH v4 23/48] accel/tcg: Move cpu_atomic decls to exec/cpu_ldst.h, Richard Henderson, 2021/10/12
- [PATCH v4 24/48] target/mips: Use cpu_*_data_ra for msa load/store, Richard Henderson, 2021/10/12
- [PATCH v4 28/48] target/arm: Use cpu_*_mmu instead of helper_*_mmu, Richard Henderson, 2021/10/12
- [PATCH v4 19/48] target/ppc: Use MO_128 for 16 byte atomics, Richard Henderson, 2021/10/12
- [PATCH v4 21/48] target/hexagon: Implement cpu_mmu_index, Richard Henderson, 2021/10/12
- [PATCH v4 20/48] target/s390x: Use MO_128 for 16 byte atomics, Richard Henderson, 2021/10/12
- [PATCH v4 31/48] linux-user: Split out do_prctl and subroutines, Richard Henderson, 2021/10/12
- [PATCH v4 37/48] target/alpha: Implement prctl_unalign_sigbus, Richard Henderson, 2021/10/12