提交 7d7500d9 编写于 作者: P Paolo Bonzini

tcg: comment on which functions have to be called with tb_lock held

softmmu requires more functions to be thread-safe, because translation
blocks can be invalidated from e.g. notdirty callbacks.  Probably the
same holds for user-mode emulation, it's just that no one has ever
tried to produce a coherent locking there.

This patch will guide the introduction of more tb_lock and tb_unlock
calls for system emulation.

Note that after this patch some (most) of the mentioned functions are
still called outside tb_lock/tb_unlock.  The next one will rectify this.
Signed-off-by: NPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: NAlex Bennée <alex.bennee@linaro.org>
Reviewed-by: NRichard Henderson <rth@twiddle.net>
Message-Id: <20161027151030.20863-7-alex.bennee@linaro.org>
Signed-off-by: NPaolo Bonzini <pbonzini@redhat.com>
上级 4426f83a
...@@ -316,6 +316,7 @@ static inline void tb_set_jmp_target(TranslationBlock *tb, ...@@ -316,6 +316,7 @@ static inline void tb_set_jmp_target(TranslationBlock *tb,
#endif #endif
/* Called with tb_lock held. */
static inline void tb_add_jump(TranslationBlock *tb, int n, static inline void tb_add_jump(TranslationBlock *tb, int n,
TranslationBlock *tb_next) TranslationBlock *tb_next)
{ {
......
...@@ -319,7 +319,10 @@ struct CPUState { ...@@ -319,7 +319,10 @@ struct CPUState {
MemoryRegion *memory; MemoryRegion *memory;
void *env_ptr; /* CPUArchState */ void *env_ptr; /* CPUArchState */
/* Writes protected by tb_lock, reads not thread-safe */
struct TranslationBlock *tb_jmp_cache[TB_JMP_CACHE_SIZE]; struct TranslationBlock *tb_jmp_cache[TB_JMP_CACHE_SIZE];
struct GDBRegisterState *gdb_regs; struct GDBRegisterState *gdb_regs;
int gdb_num_regs; int gdb_num_regs;
int gdb_num_g_regs; int gdb_num_g_regs;
......
...@@ -726,6 +726,7 @@ static inline bool tcg_op_buf_full(void) ...@@ -726,6 +726,7 @@ static inline bool tcg_op_buf_full(void)
/* pool based memory allocation */ /* pool based memory allocation */
/* tb_lock must be held for tcg_malloc_internal. */
void *tcg_malloc_internal(TCGContext *s, int size); void *tcg_malloc_internal(TCGContext *s, int size);
void tcg_pool_reset(TCGContext *s); void tcg_pool_reset(TCGContext *s);
...@@ -733,6 +734,7 @@ void tb_lock(void); ...@@ -733,6 +734,7 @@ void tb_lock(void);
void tb_unlock(void); void tb_unlock(void);
void tb_lock_reset(void); void tb_lock_reset(void);
/* Called with tb_lock held. */
static inline void *tcg_malloc(int size) static inline void *tcg_malloc(int size)
{ {
TCGContext *s = &tcg_ctx; TCGContext *s = &tcg_ctx;
......
...@@ -308,7 +308,9 @@ static int encode_search(TranslationBlock *tb, uint8_t *block) ...@@ -308,7 +308,9 @@ static int encode_search(TranslationBlock *tb, uint8_t *block)
return p - block; return p - block;
} }
/* The cpu state corresponding to 'searched_pc' is restored. */ /* The cpu state corresponding to 'searched_pc' is restored.
* Called with tb_lock held.
*/
static int cpu_restore_state_from_tb(CPUState *cpu, TranslationBlock *tb, static int cpu_restore_state_from_tb(CPUState *cpu, TranslationBlock *tb,
uintptr_t searched_pc) uintptr_t searched_pc)
{ {
...@@ -462,6 +464,7 @@ static void page_init(void) ...@@ -462,6 +464,7 @@ static void page_init(void)
} }
/* If alloc=1: /* If alloc=1:
* Called with tb_lock held for system emulation.
* Called with mmap_lock held for user-mode emulation. * Called with mmap_lock held for user-mode emulation.
*/ */
static PageDesc *page_find_alloc(tb_page_addr_t index, int alloc) static PageDesc *page_find_alloc(tb_page_addr_t index, int alloc)
...@@ -826,8 +829,12 @@ bool tcg_enabled(void) ...@@ -826,8 +829,12 @@ bool tcg_enabled(void)
return tcg_ctx.code_gen_buffer != NULL; return tcg_ctx.code_gen_buffer != NULL;
} }
/* Allocate a new translation block. Flush the translation buffer if /*
too many translation blocks or too much generated code. */ * Allocate a new translation block. Flush the translation buffer if
* too many translation blocks or too much generated code.
*
* Called with tb_lock held.
*/
static TranslationBlock *tb_alloc(target_ulong pc) static TranslationBlock *tb_alloc(target_ulong pc)
{ {
TranslationBlock *tb; TranslationBlock *tb;
...@@ -842,6 +849,7 @@ static TranslationBlock *tb_alloc(target_ulong pc) ...@@ -842,6 +849,7 @@ static TranslationBlock *tb_alloc(target_ulong pc)
return tb; return tb;
} }
/* Called with tb_lock held. */
void tb_free(TranslationBlock *tb) void tb_free(TranslationBlock *tb)
{ {
/* In practice this is mostly used for single use temporary TB /* In practice this is mostly used for single use temporary TB
...@@ -966,6 +974,10 @@ do_tb_invalidate_check(struct qht *ht, void *p, uint32_t hash, void *userp) ...@@ -966,6 +974,10 @@ do_tb_invalidate_check(struct qht *ht, void *p, uint32_t hash, void *userp)
} }
} }
/* verify that all the pages have correct rights for code
*
* Called with tb_lock held.
*/
static void tb_invalidate_check(target_ulong address) static void tb_invalidate_check(target_ulong address)
{ {
address &= TARGET_PAGE_MASK; address &= TARGET_PAGE_MASK;
...@@ -1070,7 +1082,10 @@ static inline void tb_jmp_unlink(TranslationBlock *tb) ...@@ -1070,7 +1082,10 @@ static inline void tb_jmp_unlink(TranslationBlock *tb)
} }
} }
/* invalidate one TB */ /* invalidate one TB
*
* Called with tb_lock held.
*/
void tb_phys_invalidate(TranslationBlock *tb, tb_page_addr_t page_addr) void tb_phys_invalidate(TranslationBlock *tb, tb_page_addr_t page_addr)
{ {
CPUState *cpu; CPUState *cpu;
...@@ -1504,7 +1519,9 @@ void tb_invalidate_phys_page_fast(tb_page_addr_t start, int len) ...@@ -1504,7 +1519,9 @@ void tb_invalidate_phys_page_fast(tb_page_addr_t start, int len)
} }
if (!p->code_bitmap && if (!p->code_bitmap &&
++p->code_write_count >= SMC_BITMAP_USE_THRESHOLD) { ++p->code_write_count >= SMC_BITMAP_USE_THRESHOLD) {
/* build code bitmap */ /* build code bitmap. FIXME: writes should be protected by
* tb_lock, reads by tb_lock or RCU.
*/
build_page_bitmap(p); build_page_bitmap(p);
} }
if (p->code_bitmap) { if (p->code_bitmap) {
...@@ -1645,6 +1662,7 @@ void tb_invalidate_phys_addr(AddressSpace *as, hwaddr addr) ...@@ -1645,6 +1662,7 @@ void tb_invalidate_phys_addr(AddressSpace *as, hwaddr addr)
} }
#endif /* !defined(CONFIG_USER_ONLY) */ #endif /* !defined(CONFIG_USER_ONLY) */
/* Called with tb_lock held. */
void tb_check_watchpoint(CPUState *cpu) void tb_check_watchpoint(CPUState *cpu)
{ {
TranslationBlock *tb; TranslationBlock *tb;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册