[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v7 57/60] accel/tcg: Report unaligned atomics for user-only
From: |
Richard Henderson |
Subject: |
[PATCH v7 57/60] accel/tcg: Report unaligned atomics for user-only |
Date: |
Mon, 1 Nov 2021 13:27:26 -0400 |
Use the new cpu_loop_exit_sigbus for atomic_mmu_lookup, which
has access to complete alignment info from the TCGMemOpIdx arg.
Reviewed-by: Warner Losh <imp@bsdimp.com>
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 c4f69908e9..1ee64f01fc 100644
--- a/accel/tcg/user-exec.c
+++ b/accel/tcg/user-exec.c
@@ -474,11 +474,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 v7 47/60] target/microblaze: Do not set MO_ALIGN for user-only, (continued)
- [PATCH v7 47/60] target/microblaze: Do not set MO_ALIGN for user-only, Richard Henderson, 2021/11/01
- [PATCH v7 48/60] target/ppc: Move SPR_DSISR setting to powerpc_excp, Richard Henderson, 2021/11/01
- [PATCH v7 50/60] target/ppc: Restrict ppc_cpu_do_unaligned_access to sysemu, Richard Henderson, 2021/11/01
- [PATCH v7 41/60] accel/tcg: Restrict TCGCPUOps::tlb_fill() to sysemu, Richard Henderson, 2021/11/01
- [PATCH v7 43/60] linux-user: Add cpu_loop_exit_sigbus, Richard Henderson, 2021/11/01
- [PATCH v7 51/60] linux-user/ppc: Remove POWERPC_EXCP_ALIGN handling, Richard Henderson, 2021/11/01
- [PATCH v7 46/60] linux-user/hppa: Remove EXCP_UNALIGN handling, Richard Henderson, 2021/11/01
- [PATCH v7 49/60] target/ppc: Set fault address in ppc_cpu_do_unaligned_access, Richard Henderson, 2021/11/01
- [PATCH v7 56/60] target/sparc: Set fault address in sparc_cpu_do_unaligned_access, Richard Henderson, 2021/11/01
- [PATCH v7 54/60] target/sparc: Remove DEBUG_UNALIGNED, Richard Henderson, 2021/11/01
- [PATCH v7 57/60] accel/tcg: Report unaligned atomics for user-only,
Richard Henderson <=
- [PATCH v7 58/60] accel/tcg: Report unaligned load/store for user-only, Richard Henderson, 2021/11/01
- [PATCH v7 52/60] target/s390x: Implement s390x_cpu_record_sigbus, Richard Henderson, 2021/11/01
- [PATCH v7 59/60] tcg: Add helper_unaligned_{ld, st} for user-only sigbus, Richard Henderson, 2021/11/01
- [PATCH v7 55/60] target/sparc: Split out build_sfsr, Richard Henderson, 2021/11/01
- [PATCH v7 53/60] target/sh4: Set fault address in superh_cpu_do_unaligned_access, Richard Henderson, 2021/11/01
- [PATCH v7 60/60] linux-user: Handle BUS_ADRALN in host_signal_handler, Richard Henderson, 2021/11/01