[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v5 28/31] linux-user/aarch64: Signal SEGV_MTEAERR for async tag c
From: |
Richard Henderson |
Subject: |
[PATCH v5 28/31] linux-user/aarch64: Signal SEGV_MTEAERR for async tag check error |
Date: |
Wed, 3 Feb 2021 09:00:07 -1000 |
The real kernel collects _TIF_MTE_ASYNC_FAULT into the current thread's
state on any kernel entry (interrupt, exception etc), and then delivers
the signal in advance of resuming the thread.
This means that while the signal won't be delivered immediately, it will
not be delayed forever -- at minimum it will be delivered after the next
clock interrupt.
We don't have a clock interrupt in linux-user, so we issue a cpu_kick
to signal a return to the main loop at the end of the current TB.
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
linux-user/aarch64/target_signal.h | 1 +
linux-user/aarch64/cpu_loop.c | 11 +++++++++++
target/arm/mte_helper.c | 10 ++++++++++
3 files changed, 22 insertions(+)
diff --git a/linux-user/aarch64/target_signal.h
b/linux-user/aarch64/target_signal.h
index 777fb667fe..18013e1b23 100644
--- a/linux-user/aarch64/target_signal.h
+++ b/linux-user/aarch64/target_signal.h
@@ -21,6 +21,7 @@ typedef struct target_sigaltstack {
#include "../generic/signal.h"
+#define TARGET_SEGV_MTEAERR 8 /* Asynchronous ARM MTE error */
#define TARGET_SEGV_MTESERR 9 /* Synchronous ARM MTE exception */
#define TARGET_ARCH_HAS_SETUP_FRAME
diff --git a/linux-user/aarch64/cpu_loop.c b/linux-user/aarch64/cpu_loop.c
index b6a2e65593..7c42f65706 100644
--- a/linux-user/aarch64/cpu_loop.c
+++ b/linux-user/aarch64/cpu_loop.c
@@ -164,6 +164,17 @@ void cpu_loop(CPUARMState *env)
EXCP_DUMP(env, "qemu: unhandled CPU exception 0x%x - aborting\n",
trapnr);
abort();
}
+
+ /* Check for MTE asynchronous faults */
+ if (unlikely(env->cp15.tfsr_el[0])) {
+ env->cp15.tfsr_el[0] = 0;
+ info.si_signo = TARGET_SIGSEGV;
+ info.si_errno = 0;
+ info._sifields._sigfault._addr = 0;
+ info.si_code = TARGET_SEGV_MTEAERR;
+ queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info);
+ }
+
process_pending_signals(env);
/* Exception return on AArch64 always clears the exclusive monitor,
* so any return to running guest code implies this.
diff --git a/target/arm/mte_helper.c b/target/arm/mte_helper.c
index 153bd1e9df..d55f8d1e1e 100644
--- a/target/arm/mte_helper.c
+++ b/target/arm/mte_helper.c
@@ -565,6 +565,16 @@ static void mte_check_fail(CPUARMState *env, uint32_t desc,
select = 0;
}
env->cp15.tfsr_el[el] |= 1 << select;
+#ifdef CONFIG_USER_ONLY
+ /*
+ * Stand in for a timer irq, setting _TIF_MTE_ASYNC_FAULT,
+ * which then sends a SIGSEGV when the thread is next scheduled.
+ * This cpu will return to the main loop at the end of the TB,
+ * which is rather sooner than "normal". But the alternative
+ * is waiting until the next syscall.
+ */
+ qemu_cpu_kick(env_cpu(env));
+#endif
break;
default:
--
2.25.1
- [PATCH v5 10/31] linux-user: Fix guest_addr_valid vs reserved_va, (continued)
- [PATCH v5 10/31] linux-user: Fix guest_addr_valid vs reserved_va, Richard Henderson, 2021/02/03
- [PATCH v5 11/31] exec: Introduce cpu_untagged_addr, Richard Henderson, 2021/02/03
- [PATCH v5 12/31] exec: Use cpu_untagged_addr in g2h; split out g2h_untagged, Richard Henderson, 2021/02/03
- [PATCH v5 14/31] linux-user: Use guest_range_valid in access_ok, Richard Henderson, 2021/02/03
- [PATCH v5 15/31] exec: Rename guest_{addr,range}_valid to *_untagged, Richard Henderson, 2021/02/03
- [PATCH v5 27/31] linux-user/aarch64: Signal SEGV_MTESERR for sync tag check fault, Richard Henderson, 2021/02/03
- [PATCH v5 28/31] linux-user/aarch64: Signal SEGV_MTEAERR for async tag check error,
Richard Henderson <=
- [PATCH v5 06/31] linux-user: Check for overflow in access_ok, Richard Henderson, 2021/02/03
- [PATCH v5 04/31] exec: Use uintptr_t in cpu_ldst.h, Richard Henderson, 2021/02/03
- [PATCH v5 09/31] linux-user: Do not use guest_addr_valid for h2g_valid, Richard Henderson, 2021/02/03
- [PATCH v5 08/31] bsd-user: Tidy VERIFY_READ/VERIFY_WRITE, Richard Henderson, 2021/02/03
- [PATCH v5 13/31] linux-user: Explicitly untag memory management syscalls, Richard Henderson, 2021/02/03
- [PATCH v5 16/31] linux-user: Use cpu_untagged_addr in access_ok; split out *_untagged, Richard Henderson, 2021/02/03
- [PATCH v5 17/31] linux-user: Move lock_user et al out of line, Richard Henderson, 2021/02/03