[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 11/21] thread: add tsan annotations to QemuSpin
From: |
Alex Bennée |
Subject: |
[PULL 11/21] thread: add tsan annotations to QemuSpin |
Date: |
Tue, 16 Jun 2020 13:53:14 +0100 |
From: "Emilio G. Cota" <cota@braap.org>
Signed-off-by: Emilio G. Cota <cota@braap.org>
Signed-off-by: Robert Foley <robert.foley@linaro.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20200609200738.445-9-robert.foley@linaro.org>
Message-Id: <20200612190237.30436-12-alex.bennee@linaro.org>
diff --git a/include/qemu/thread.h b/include/qemu/thread.h
index 9479facdcc5..4baf4d17157 100644
--- a/include/qemu/thread.h
+++ b/include/qemu/thread.h
@@ -206,6 +206,10 @@ void qemu_thread_atexit_add(struct Notifier *notifier);
*/
void qemu_thread_atexit_remove(struct Notifier *notifier);
+#ifdef CONFIG_TSAN
+#include <sanitizer/tsan_interface.h>
+#endif
+
struct QemuSpin {
int value;
};
@@ -213,23 +217,46 @@ struct QemuSpin {
static inline void qemu_spin_init(QemuSpin *spin)
{
__sync_lock_release(&spin->value);
+#ifdef CONFIG_TSAN
+ __tsan_mutex_create(spin, __tsan_mutex_not_static);
+#endif
}
-static inline void qemu_spin_destroy(QemuSpin *spin)
-{ }
+/* const parameter because the only purpose here is the TSAN annotation */
+static inline void qemu_spin_destroy(const QemuSpin *spin)
+{
+#ifdef CONFIG_TSAN
+ __tsan_mutex_destroy((void *)spin, __tsan_mutex_not_static);
+#endif
+}
static inline void qemu_spin_lock(QemuSpin *spin)
{
+#ifdef CONFIG_TSAN
+ __tsan_mutex_pre_lock(spin, 0);
+#endif
while (unlikely(__sync_lock_test_and_set(&spin->value, true))) {
while (atomic_read(&spin->value)) {
cpu_relax();
}
}
+#ifdef CONFIG_TSAN
+ __tsan_mutex_post_lock(spin, 0, 0);
+#endif
}
static inline bool qemu_spin_trylock(QemuSpin *spin)
{
- return __sync_lock_test_and_set(&spin->value, true);
+#ifdef CONFIG_TSAN
+ __tsan_mutex_pre_lock(spin, __tsan_mutex_try_lock);
+#endif
+ bool busy = __sync_lock_test_and_set(&spin->value, true);
+#ifdef CONFIG_TSAN
+ unsigned flags = __tsan_mutex_try_lock;
+ flags |= busy ? __tsan_mutex_try_lock_failed : 0;
+ __tsan_mutex_post_lock(spin, flags, 0);
+#endif
+ return busy;
}
static inline bool qemu_spin_locked(QemuSpin *spin)
@@ -239,7 +266,13 @@ static inline bool qemu_spin_locked(QemuSpin *spin)
static inline void qemu_spin_unlock(QemuSpin *spin)
{
+#ifdef CONFIG_TSAN
+ __tsan_mutex_pre_unlock(spin, 0);
+#endif
__sync_lock_release(&spin->value);
+#ifdef CONFIG_TSAN
+ __tsan_mutex_post_unlock(spin, 0);
+#endif
}
struct QemuLockCnt {
--
2.20.1
- [PULL 02/21] Makefile: dtc: update, build the libfdt target, (continued)
- [PULL 02/21] Makefile: dtc: update, build the libfdt target, Alex Bennée, 2020/06/16
- [PULL 05/21] cpu: convert queued work to a QSIMPLEQ, Alex Bennée, 2020/06/16
- [PULL 07/21] cputlb: destroy CPUTLB with tlb_destroy, Alex Bennée, 2020/06/16
- [PULL 13/21] include/qemu: Added tsan.h for annotations., Alex Bennée, 2020/06/16
- [PULL 14/21] util: Added tsan annotate for thread name., Alex Bennée, 2020/06/16
- [PULL 08/21] qht: call qemu_spin_destroy for head buckets, Alex Bennée, 2020/06/16
- [PULL 09/21] tcg: call qemu_spin_destroy for tb->jmp_lock, Alex Bennée, 2020/06/16
- [PULL 12/21] tests/docker: Added docker build support for TSan., Alex Bennée, 2020/06/16
- [PULL 10/21] translate-all: call qemu_spin_destroy for PageDesc, Alex Bennée, 2020/06/16
- [PULL 21/21] plugins: new lockstep plugin for debugging TCG changes, Alex Bennée, 2020/06/16
- [PULL 11/21] thread: add tsan annotations to QemuSpin,
Alex Bennée <=
- [PULL 19/21] tests/tcg: build plugin list from contents of src directory, Alex Bennée, 2020/06/16
- [PULL 15/21] docs: Added details on TSan to testing.rst, Alex Bennée, 2020/06/16
- [PULL 18/21] cirrus.yml: serialise make check, Alex Bennée, 2020/06/16
- [PULL 16/21] tests: Disable select tests under TSan, which hit TSan issue., Alex Bennée, 2020/06/16
- [PULL 17/21] Revert ".shippable: temporaily disable some cross builds", Alex Bennée, 2020/06/16
- [PULL 20/21] tests/tcg: ensure -cpu max also used for plugin run, Alex Bennée, 2020/06/16