mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tcg: call qemu_spin_destroy for tb->jmp_lock

Browse Source 
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>
This commit is contained in:
Emilio G. Cota 2020-06-12 20:02:28 +01:00 committed by Alex Bennée
parent 5107a47bb2
commit 938e897a66
3 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
accel/tcg/translate-all.c
View File

@ -384,6 +384,11 @@ static int cpu_restore_state_from_tb(CPUState *cpu, TranslationBlock *tb,
return 0; 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) bool cpu_restore_state(CPUState *cpu, uintptr_t host_pc, bool will_exit)
{ {
TranslationBlock *tb; 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 */ /* one-shot translation, invalidate it immediately */
tb_phys_invalidate(tb, -1); tb_phys_invalidate(tb, -1);
tcg_tb_remove(tb); tcg_tb_remove(tb);
tb_destroy(tb);
} }
r = true; r = true;
} }
@ -1886,6 +1892,7 @@ TranslationBlock *tb_gen_code(CPUState *cpu,
orig_aligned -= ROUND_UP(sizeof(*tb), qemu_icache_linesize); orig_aligned -= ROUND_UP(sizeof(*tb), qemu_icache_linesize);
atomic_set(&tcg_ctx->code_gen_ptr, (void *)orig_aligned); atomic_set(&tcg_ctx->code_gen_ptr, (void *)orig_aligned);
tb_destroy(tb);
return existing_tb; return existing_tb;
} }
tcg_tb_insert(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); tb_phys_invalidate(tb->orig_tb, -1);
} }
tcg_tb_remove(tb); tcg_tb_remove(tb);
tb_destroy(tb);
} }
/* TODO: If env->pc != tb->pc (i.e. the faulting instruction was not /* TODO: If env->pc != tb->pc (i.e. the faulting instruction was not

1
include/tcg/tcg.h
View File

@ -819,6 +819,7 @@ void tcg_pool_reset(TCGContext *s);
TranslationBlock *tcg_tb_alloc(TCGContext *s); TranslationBlock *tcg_tb_alloc(TCGContext *s);
void tcg_region_init(void); void tcg_region_init(void);
void tb_destroy(TranslationBlock *tb);
void tcg_region_reset_all(void); void tcg_region_reset_all(void);
size_t tcg_code_size(void); size_t tcg_code_size(void);

9
tcg/tcg.c
View File

@ -502,6 +502,14 @@ size_t tcg_nb_tbs(void)
return nb_tbs; 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) static void tcg_region_tree_reset_all(void)
{ {
size_t i; size_t i;
@ -510,6 +518,7 @@ static void tcg_region_tree_reset_all(void)
for (i = 0; i < region.n; i++) { for (i = 0; i < region.n; i++) {
struct tcg_region_tree *rt = region_trees + i * tree_size; 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 */ /* Increment the refcount first so that destroy acts as a reset */
g_tree_ref(rt->tree); g_tree_ref(rt->tree);
g_tree_destroy(rt->tree); g_tree_destroy(rt->tree);