[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 09/21] tcg: call qemu_spin_destroy for tb->jmp_lock
From: |
Alex Bennée |
Subject: |
[PULL 09/21] tcg: call qemu_spin_destroy for tb->jmp_lock |
Date: |
Tue, 16 Jun 2020 13:53:12 +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>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
[RF: minor changes + remove tb_destroy_func]
Message-Id: <20200609200738.445-7-robert.foley@linaro.org>
Message-Id: <20200612190237.30436-10-alex.bennee@linaro.org>
diff --git a/include/tcg/tcg.h b/include/tcg/tcg.h
index 380014ed805..e63450a8936 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/accel/tcg/translate-all.c b/accel/tcg/translate-all.c
index 42ce1dfcff7..c937210e217 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/tcg/tcg.c b/tcg/tcg.c
index 1aa6cb47f29..1362bc61017 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.20.1
- [PULL 03/21] Makefile: remove old compatibility gunks, (continued)
- [PULL 03/21] Makefile: remove old compatibility gunks, Alex Bennée, 2020/06/16
- [PULL 01/21] tests/docker: bump fedora to 32, Alex Bennée, 2020/06/16
- [PULL 06/21] thread: add qemu_spin_destroy, Alex Bennée, 2020/06/16
- [PULL 04/21] configure: add --enable-tsan flag + fiber annotations for coroutine-ucontext, Alex Bennée, 2020/06/16
- [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 <=
- [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, 2020/06/16
- [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