[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 11/23] tcg: Prepare safe tb_jmp_cache lookup out of t
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 11/23] tcg: Prepare safe tb_jmp_cache lookup out of tb_lock |
Date: |
Mon, 18 Jul 2016 11:27:43 +0200 |
From: Sergey Fedorov <address@hidden>
Ensure atomicity of CPU's 'tb_jmp_cache' access for future translation
block lookup out of 'tb_lock'.
Note that this patch does *not* make CPU's TLB invalidation safe if it
is done from some other thread while the CPU is in its execution loop.
Signed-off-by: Alex Bennée <address@hidden>
Signed-off-by: Sergey Fedorov <address@hidden>
Signed-off-by: Sergey Fedorov <address@hidden>
Reviewed-by: Alex Bennée <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
cpu-exec.c | 4 ++--
translate-all.c | 10 +++++++---
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/cpu-exec.c b/cpu-exec.c
index cf511f1..d48ef5e 100644
--- a/cpu-exec.c
+++ b/cpu-exec.c
@@ -315,7 +315,7 @@ static TranslationBlock *tb_find_slow(CPUState *cpu,
found:
/* we add the TB in the virtual pc hash table */
- cpu->tb_jmp_cache[tb_jmp_cache_hash_func(pc)] = tb;
+ atomic_set(&cpu->tb_jmp_cache[tb_jmp_cache_hash_func(pc)], tb);
return tb;
}
@@ -333,7 +333,7 @@ static inline TranslationBlock *tb_find_fast(CPUState *cpu,
is executed. */
cpu_get_tb_cpu_state(env, &pc, &cs_base, &flags);
tb_lock();
- tb = cpu->tb_jmp_cache[tb_jmp_cache_hash_func(pc)];
+ tb = atomic_read(&cpu->tb_jmp_cache[tb_jmp_cache_hash_func(pc)]);
if (unlikely(!tb || tb->pc != pc || tb->cs_base != cs_base ||
tb->flags != flags)) {
tb = tb_find_slow(cpu, pc, cs_base, flags);
diff --git a/translate-all.c b/translate-all.c
index 0d47c1c..fdf520a 100644
--- a/translate-all.c
+++ b/translate-all.c
@@ -848,7 +848,11 @@ void tb_flush(CPUState *cpu)
tcg_ctx.tb_ctx.nb_tbs = 0;
CPU_FOREACH(cpu) {
- memset(cpu->tb_jmp_cache, 0, sizeof(cpu->tb_jmp_cache));
+ int i;
+
+ for (i = 0; i < TB_JMP_CACHE_SIZE; ++i) {
+ atomic_set(&cpu->tb_jmp_cache[i], NULL);
+ }
cpu->tb_flushed = true;
}
@@ -1007,8 +1011,8 @@ void tb_phys_invalidate(TranslationBlock *tb,
tb_page_addr_t page_addr)
/* remove the TB from the hash list */
h = tb_jmp_cache_hash_func(tb->pc);
CPU_FOREACH(cpu) {
- if (cpu->tb_jmp_cache[h] == tb) {
- cpu->tb_jmp_cache[h] = NULL;
+ if (atomic_read(&cpu->tb_jmp_cache[h]) == tb) {
+ atomic_set(&cpu->tb_jmp_cache[h], NULL);
}
}
--
2.7.4
- [Qemu-devel] [PULL 04/23] compiler: never omit assertions if using a static analysis tool, (continued)
- [Qemu-devel] [PULL 04/23] compiler: never omit assertions if using a static analysis tool, Paolo Bonzini, 2016/07/18
- [Qemu-devel] [PULL 05/23] megasas: remove useless check for cmd->frame, Paolo Bonzini, 2016/07/18
- [Qemu-devel] [PULL 03/23] hw/i386: add device tree support, Paolo Bonzini, 2016/07/18
- [Qemu-devel] [PULL 02/23] Changed malloc to g_malloc, free to g_free in bsd-user/qemu.h, Paolo Bonzini, 2016/07/18
- [Qemu-devel] [PULL 06/23] checkpatch: consider git extended headers valid patches, Paolo Bonzini, 2016/07/18
- [Qemu-devel] [PULL 07/23] exec: avoid realloc in phys_map_node_reserve, Paolo Bonzini, 2016/07/18
- [Qemu-devel] [PULL 08/23] cpu-exec: Move down some declarations in cpu_exec(), Paolo Bonzini, 2016/07/18
- [Qemu-devel] [PULL 09/23] util/qht: Document memory ordering assumptions, Paolo Bonzini, 2016/07/18
- [Qemu-devel] [PULL 10/23] tcg: Pass last_tb by value to tb_find_fast(), Paolo Bonzini, 2016/07/18
- [Qemu-devel] [PULL 12/23] tcg: Prepare safe access to tb_flushed out of tb_lock, Paolo Bonzini, 2016/07/18
- [Qemu-devel] [PULL 11/23] tcg: Prepare safe tb_jmp_cache lookup out of tb_lock,
Paolo Bonzini <=
- [Qemu-devel] [PULL 13/23] target-i386: Remove redundant HF_SOFTMMU_MASK, Paolo Bonzini, 2016/07/18
- [Qemu-devel] [PULL 16/23] tcg: set up tb->page_addr before insertion, Paolo Bonzini, 2016/07/18
- [Qemu-devel] [PULL 14/23] tcg: Introduce tb_mark_invalid() and tb_is_invalid(), Paolo Bonzini, 2016/07/18
- [Qemu-devel] [PULL 15/23] tcg: Prepare TB invalidation for lockless TB lookup, Paolo Bonzini, 2016/07/18
- [Qemu-devel] [PULL 17/23] tcg: cpu-exec: remove tb_lock from the hot-path, Paolo Bonzini, 2016/07/18
- [Qemu-devel] [PULL 18/23] tcg: Avoid bouncing tb_lock between tb_gen_code() and tb_add_jump(), Paolo Bonzini, 2016/07/18
- [Qemu-devel] [PULL 20/23] tcg: rename tb_find_physical(), Paolo Bonzini, 2016/07/18
- [Qemu-devel] [PULL 21/23] Move README to markdown, Paolo Bonzini, 2016/07/18
- [Qemu-devel] [PULL 22/23] block/iscsi: fix rounding in iscsi_allocationmap_set, Paolo Bonzini, 2016/07/18
- [Qemu-devel] [PULL 19/23] tcg: Merge tb_find_slow() and tb_find_fast(), Paolo Bonzini, 2016/07/18