[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 10/23] exec-all: bring tb->invalid into tb->cflags
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PULL 10/23] exec-all: bring tb->invalid into tb->cflags |
Date: |
Mon, 9 Oct 2017 17:55:47 -0700 |
From: "Emilio G. Cota" <address@hidden>
This gets rid of a hole in struct TranslationBlock.
Reviewed-by: Richard Henderson <address@hidden>
Signed-off-by: Emilio G. Cota <address@hidden>
Signed-off-by: Richard Henderson <address@hidden>
---
include/exec/exec-all.h | 3 +--
include/exec/tb-lookup.h | 2 +-
accel/tcg/cpu-exec.c | 4 ++--
accel/tcg/translate-all.c | 3 +--
4 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h
index a9a8bb6f83..3135aaf4c9 100644
--- a/include/exec/exec-all.h
+++ b/include/exec/exec-all.h
@@ -314,12 +314,11 @@ struct TranslationBlock {
#define CF_NOCACHE 0x10000 /* To be freed after execution */
#define CF_USE_ICOUNT 0x20000
#define CF_IGNORE_ICOUNT 0x40000 /* Do not generate icount code */
+#define CF_INVALID 0x80000 /* TB is stale. Setters must acquire tb_lock */
/* Per-vCPU dynamic tracing state used to generate this TB */
uint32_t trace_vcpu_dstate;
- uint16_t invalid;
-
void *tc_ptr; /* pointer to the translated code */
uint8_t *tc_search; /* pointer to search data */
/* original tb when cflags has CF_NOCACHE */
diff --git a/include/exec/tb-lookup.h b/include/exec/tb-lookup.h
index 9d32cb0c6e..436b6d5ecf 100644
--- a/include/exec/tb-lookup.h
+++ b/include/exec/tb-lookup.h
@@ -35,7 +35,7 @@ tb_lookup__cpu_state(CPUState *cpu, target_ulong *pc,
target_ulong *cs_base,
tb->cs_base == *cs_base &&
tb->flags == *flags &&
tb->trace_vcpu_dstate == *cpu->trace_dstate &&
- !atomic_read(&tb->invalid))) {
+ !(atomic_read(&tb->cflags) & CF_INVALID))) {
return tb;
}
tb = tb_htable_lookup(cpu, *pc, *cs_base, *flags);
diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c
index f8a1d68db7..9cd809d607 100644
--- a/accel/tcg/cpu-exec.c
+++ b/accel/tcg/cpu-exec.c
@@ -294,7 +294,7 @@ static bool tb_cmp(const void *p, const void *d)
tb->cs_base == desc->cs_base &&
tb->flags == desc->flags &&
tb->trace_vcpu_dstate == desc->trace_vcpu_dstate &&
- !atomic_read(&tb->invalid)) {
+ !(atomic_read(&tb->cflags) & CF_INVALID)) {
/* check next page if needed */
if (tb->page_addr[1] == -1) {
return true;
@@ -412,7 +412,7 @@ static inline TranslationBlock *tb_find(CPUState *cpu,
tb_lock();
acquired_tb_lock = true;
}
- if (!tb->invalid) {
+ if (!(tb->cflags & CF_INVALID)) {
tb_add_jump(last_tb, tb_exit, tb);
}
}
diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c
index a7c1d4e3f2..ed65d68709 100644
--- a/accel/tcg/translate-all.c
+++ b/accel/tcg/translate-all.c
@@ -1073,7 +1073,7 @@ void tb_phys_invalidate(TranslationBlock *tb,
tb_page_addr_t page_addr)
assert_tb_locked();
- atomic_set(&tb->invalid, true);
+ atomic_set(&tb->cflags, tb->cflags | CF_INVALID);
/* remove the TB from the hash list */
phys_pc = tb->page_addr[0] + (tb->pc & ~TARGET_PAGE_MASK);
@@ -1269,7 +1269,6 @@ TranslationBlock *tb_gen_code(CPUState *cpu,
tb->flags = flags;
tb->cflags = cflags;
tb->trace_vcpu_dstate = *cpu->trace_dstate;
- tb->invalid = false;
#ifdef CONFIG_PROFILER
tcg_ctx.tb_count1++; /* includes aborted translations because of
--
2.13.6
- [Qemu-devel] [PULL 00/23] Queued TCG patches, Richard Henderson, 2017/10/09
- [Qemu-devel] [PULL 01/23] cputlb: bring back tlb_flush_count under !TLB_DEBUG, Richard Henderson, 2017/10/09
- [Qemu-devel] [PULL 03/23] exec-all: fix typos in TranslationBlock's documentation, Richard Henderson, 2017/10/09
- [Qemu-devel] [PULL 02/23] tcg: fix corruption of code_time profiling counter upon tb_flush, Richard Henderson, 2017/10/09
- [Qemu-devel] [PULL 04/23] translate-all: make have_tb_lock static, Richard Henderson, 2017/10/09
- [Qemu-devel] [PULL 05/23] cpu-exec: rename have_tb_lock to acquired_tb_lock in tb_find, Richard Henderson, 2017/10/09
- [Qemu-devel] [PULL 06/23] tcg/i386: constify tcg_target_callee_save_regs, Richard Henderson, 2017/10/09
- [Qemu-devel] [PULL 08/23] tcg: remove addr argument from lookup_tb_ptr, Richard Henderson, 2017/10/09
- [Qemu-devel] [PULL 07/23] tcg/mips: constify tcg_target_callee_save_regs, Richard Henderson, 2017/10/09
- [Qemu-devel] [PULL 09/23] tcg: consolidate TB lookups in tb_lookup__cpu_state, Richard Henderson, 2017/10/09
- [Qemu-devel] [PULL 10/23] exec-all: bring tb->invalid into tb->cflags,
Richard Henderson <=
- [Qemu-devel] [PULL 12/23] exec-all: introduce TB_PAGE_ADDR_FMT, Richard Henderson, 2017/10/09
- [Qemu-devel] [PULL 11/23] translate-all: define and use DEBUG_TB_FLUSH_GATE, Richard Henderson, 2017/10/09
- [Qemu-devel] [PULL 13/23] translate-all: define and use DEBUG_TB_INVALIDATE_GATE, Richard Henderson, 2017/10/09
- [Qemu-devel] [PULL 15/23] exec-all: extract tb->tc_* into a separate struct tc_tb, Richard Henderson, 2017/10/09
- [Qemu-devel] [PULL 17/23] tcg: take .helpers out of TCGContext, Richard Henderson, 2017/10/09
- [Qemu-devel] [PULL 14/23] translate-all: define and use DEBUG_TB_CHECK_GATE, Richard Henderson, 2017/10/09
- [Qemu-devel] [PULL 19/23] util: move qemu_real_host_page_size/mask to osdep.h, Richard Henderson, 2017/10/09
- [Qemu-devel] [PULL 16/23] tci: move tci_regs to tcg_qemu_tb_exec's stack, Richard Henderson, 2017/10/09
- [Qemu-devel] [PULL 20/23] osdep: introduce qemu_mprotect_rwx/none, Richard Henderson, 2017/10/09
- [Qemu-devel] [PULL 21/23] translate-all: use qemu_protect_rwx/none helpers, Richard Henderson, 2017/10/09