[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v5 58/67] accel/tcg: Report unaligned atomics for user-only
From: |
Richard Henderson |
Subject: |
[PATCH v5 58/67] accel/tcg: Report unaligned atomics for user-only |
Date: |
Thu, 14 Oct 2021 21:10:44 -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 5646f8e527..92cbffd7c6 100644
--- a/accel/tcg/user-exec.c
+++ b/accel/tcg/user-exec.c
@@ -476,11 +476,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 v5 47/67] linux-user/hppa: Remove EXCP_UNALIGN handling, (continued)
- [PATCH v5 47/67] linux-user/hppa: Remove EXCP_UNALIGN handling, Richard Henderson, 2021/10/15
- [PATCH v5 50/67] target/ppc: Set fault address in ppc_cpu_do_unaligned_access, Richard Henderson, 2021/10/15
- [PATCH v5 53/67] linux-user/hppa: Remove POWERPC_EXCP_ALIGN handling, Richard Henderson, 2021/10/15
- [PATCH v5 54/67] target/sh4: Set fault address in superh_cpu_do_unaligned_access, Richard Henderson, 2021/10/15
- [PATCH v5 57/67] target/sparc: Set fault address in sparc_cpu_do_unaligned_access, Richard Henderson, 2021/10/15
- [PATCH v5 55/67] target/sparc: Remove DEBUG_UNALIGNED, Richard Henderson, 2021/10/15
- [PATCH v5 60/67] tcg: Add helper_unaligned_{ld, st} for user-only sigbus, Richard Henderson, 2021/10/15
- [PATCH v5 58/67] accel/tcg: Report unaligned atomics for user-only,
Richard Henderson <=
- [PATCH v5 61/67] linux-user: Handle BUS_ADRALN in host_signal_handler, Richard Henderson, 2021/10/15
- [PATCH v5 64/67] linux-user: Add code for PR_GET/SET_UNALIGN, Richard Henderson, 2021/10/15
- [PATCH v5 67/67] target/sh4: Implement prctl_unalign_sigbus, Richard Henderson, 2021/10/15
- [PATCH v5 63/67] linux-user: Disable more prctl subcodes, Richard Henderson, 2021/10/15
- [PATCH v5 46/67] target/arm: Implement arm_cpu_record_sigbus, Richard Henderson, 2021/10/15