[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 06/13] tcg: call qemu_spin_destroy for tb->jmp_lock
From: |
Robert Foley |
Subject: |
[PATCH v3 06/13] tcg: call qemu_spin_destroy for tb->jmp_lock |
Date: |
Tue, 9 Jun 2020 16:07:31 -0400 |
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>
[RF: minor changes + remove tb_destroy_func]
---
accel/tcg/translate-all.c | 8 ++++++++
include/tcg/tcg.h | 1 +
tcg/tcg.c | 9 +++++++++
3 files changed, 18 insertions(+)
diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c
index 42ce1dfcff..c937210e21 100644
--- a/accel/tcg/translate-all.c
+++ b/accel/tcg/translate-all.c
@@ -384,6 +384,11 @@ static int cpu_restore_state_from_tb(CPUState *cpu,
TranslationBlock *tb,
return 0;
}
+void tb_destroy(TranslationBlock *tb)
+{
+ qemu_spin_destroy(&tb->jmp_lock);
+}
+
bool cpu_restore_state(CPUState *cpu, uintptr_t host_pc, bool will_exit)
{
TranslationBlock *tb;
@@ -413,6 +418,7 @@ bool cpu_restore_state(CPUState *cpu, uintptr_t host_pc,
bool will_exit)
/* one-shot translation, invalidate it immediately */
tb_phys_invalidate(tb, -1);
tcg_tb_remove(tb);
+ tb_destroy(tb);
}
r = true;
}
@@ -1886,6 +1892,7 @@ TranslationBlock *tb_gen_code(CPUState *cpu,
orig_aligned -= ROUND_UP(sizeof(*tb), qemu_icache_linesize);
atomic_set(&tcg_ctx->code_gen_ptr, (void *)orig_aligned);
+ tb_destroy(tb);
return existing_tb;
}
tcg_tb_insert(tb);
@@ -2235,6 +2242,7 @@ void cpu_io_recompile(CPUState *cpu, uintptr_t retaddr)
tb_phys_invalidate(tb->orig_tb, -1);
}
tcg_tb_remove(tb);
+ tb_destroy(tb);
}
/* TODO: If env->pc != tb->pc (i.e. the faulting instruction was not
diff --git a/include/tcg/tcg.h b/include/tcg/tcg.h
index 380014ed80..e63450a893 100644
--- a/include/tcg/tcg.h
+++ b/include/tcg/tcg.h
@@ -819,6 +819,7 @@ void tcg_pool_reset(TCGContext *s);
TranslationBlock *tcg_tb_alloc(TCGContext *s);
void tcg_region_init(void);
+void tb_destroy(TranslationBlock *tb);
void tcg_region_reset_all(void);
size_t tcg_code_size(void);
diff --git a/tcg/tcg.c b/tcg/tcg.c
index 1aa6cb47f2..1362bc6101 100644
--- a/tcg/tcg.c
+++ b/tcg/tcg.c
@@ -502,6 +502,14 @@ size_t tcg_nb_tbs(void)
return nb_tbs;
}
+static gboolean tcg_region_tree_traverse(gpointer k, gpointer v, gpointer data)
+{
+ TranslationBlock *tb = v;
+
+ tb_destroy(tb);
+ return FALSE;
+}
+
static void tcg_region_tree_reset_all(void)
{
size_t i;
@@ -510,6 +518,7 @@ static void tcg_region_tree_reset_all(void)
for (i = 0; i < region.n; i++) {
struct tcg_region_tree *rt = region_trees + i * tree_size;
+ g_tree_foreach(rt->tree, tcg_region_tree_traverse, NULL);
/* Increment the refcount first so that destroy acts as a reset */
g_tree_ref(rt->tree);
g_tree_destroy(rt->tree);
--
2.17.1
- [PATCH v3 00/13] Add Thread Sanitizer support to QEMU, Robert Foley, 2020/06/09
- [PATCH v3 01/13] configure: add --enable-tsan flag + fiber annotations for coroutine-ucontext, Robert Foley, 2020/06/09
- [PATCH v3 02/13] cpu: convert queued work to a QSIMPLEQ, Robert Foley, 2020/06/09
- [PATCH v3 03/13] thread: add qemu_spin_destroy, Robert Foley, 2020/06/09
- [PATCH v3 04/13] cputlb: destroy CPUTLB with tlb_destroy, Robert Foley, 2020/06/09
- [PATCH v3 05/13] qht: call qemu_spin_destroy for head buckets, Robert Foley, 2020/06/09
- [PATCH v3 06/13] tcg: call qemu_spin_destroy for tb->jmp_lock,
Robert Foley <=
- [PATCH v3 07/13] translate-all: call qemu_spin_destroy for PageDesc, Robert Foley, 2020/06/09
- [PATCH v3 08/13] thread: add tsan annotations to QemuSpin, Robert Foley, 2020/06/09
- [PATCH v3 09/13] tests/docker: Added docker build support for TSan., Robert Foley, 2020/06/09
- [PATCH v3 10/13] include/qemu: Added tsan.h for annotations., Robert Foley, 2020/06/09
- [PATCH v3 11/13] util: Added tsan annotate for thread name., Robert Foley, 2020/06/09
- [PATCH v3 12/13] docs: Added details on TSan to testing.rst, Robert Foley, 2020/06/09
- [PATCH v3 13/13] tests: Disable select tests under TSan, which hit TSan issue., Robert Foley, 2020/06/09
- Re: [PATCH v3 00/13] Add Thread Sanitizer support to QEMU, Alex Bennée, 2020/06/10