* [PULL 1/2] tcg: Move TCG_TARGET_HAS_direct_jump init to tb_gen_code
2022-11-09 7:02 [PULL for-7.2 0/2] tcg patch queue Richard Henderson
@ 2022-11-09 7:02 ` Richard Henderson
2022-11-09 7:02 ` [PULL 2/2] accel/tcg: Split out setjmp_gen_code Richard Henderson
2022-11-09 20:46 ` [PULL for-7.2 0/2] tcg patch queue Stefan Hajnoczi
2 siblings, 0 replies; 4+ messages in thread
From: Richard Henderson @ 2022-11-09 7:02 UTC (permalink / raw)
To: qemu-devel; +Cc: stefanha, Philippe Mathieu-Daudé
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
accel/tcg/translate-all.c | 10 ----------
tcg/tcg.c | 12 ++++++++++++
2 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c
index 921944a5ab..9ee21f7f52 100644
--- a/accel/tcg/translate-all.c
+++ b/accel/tcg/translate-all.c
@@ -821,16 +821,6 @@ TranslationBlock *tb_gen_code(CPUState *cpu,
trace_translate_block(tb, pc, tb->tc.ptr);
/* generate machine code */
- tb->jmp_reset_offset[0] = TB_JMP_RESET_OFFSET_INVALID;
- tb->jmp_reset_offset[1] = TB_JMP_RESET_OFFSET_INVALID;
- tcg_ctx->tb_jmp_reset_offset = tb->jmp_reset_offset;
- if (TCG_TARGET_HAS_direct_jump) {
- tcg_ctx->tb_jmp_insn_offset = tb->jmp_target_arg;
- tcg_ctx->tb_jmp_target_addr = NULL;
- } else {
- tcg_ctx->tb_jmp_insn_offset = NULL;
- tcg_ctx->tb_jmp_target_addr = tb->jmp_target_arg;
- }
#ifdef CONFIG_PROFILER
qatomic_set(&prof->tb_count, prof->tb_count + 1);
diff --git a/tcg/tcg.c b/tcg/tcg.c
index b43b6a7981..436fcf6ebd 100644
--- a/tcg/tcg.c
+++ b/tcg/tcg.c
@@ -4228,6 +4228,18 @@ int tcg_gen_code(TCGContext *s, TranslationBlock *tb, target_ulong pc_start)
}
#endif
+ /* Initialize goto_tb jump offsets. */
+ tb->jmp_reset_offset[0] = TB_JMP_RESET_OFFSET_INVALID;
+ tb->jmp_reset_offset[1] = TB_JMP_RESET_OFFSET_INVALID;
+ tcg_ctx->tb_jmp_reset_offset = tb->jmp_reset_offset;
+ if (TCG_TARGET_HAS_direct_jump) {
+ tcg_ctx->tb_jmp_insn_offset = tb->jmp_target_arg;
+ tcg_ctx->tb_jmp_target_addr = NULL;
+ } else {
+ tcg_ctx->tb_jmp_insn_offset = NULL;
+ tcg_ctx->tb_jmp_target_addr = tb->jmp_target_arg;
+ }
+
tcg_reg_alloc_start(s);
/*
--
2.34.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PULL 2/2] accel/tcg: Split out setjmp_gen_code
2022-11-09 7:02 [PULL for-7.2 0/2] tcg patch queue Richard Henderson
2022-11-09 7:02 ` [PULL 1/2] tcg: Move TCG_TARGET_HAS_direct_jump init to tb_gen_code Richard Henderson
@ 2022-11-09 7:02 ` Richard Henderson
2022-11-09 20:46 ` [PULL for-7.2 0/2] tcg patch queue Stefan Hajnoczi
2 siblings, 0 replies; 4+ messages in thread
From: Richard Henderson @ 2022-11-09 7:02 UTC (permalink / raw)
To: qemu-devel; +Cc: stefanha, Philippe Mathieu-Daudé
Isolate the code protected by setjmp. Fixes:
translate-all.c: In function ‘tb_gen_code’:
translate-all.c:748:51: error: argument ‘cflags’ might be clobbered by ‘longjmp’ or ‘vfork’ [-Werror=clobbered]
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
accel/tcg/translate-all.c | 58 ++++++++++++++++++++++-----------------
1 file changed, 33 insertions(+), 25 deletions(-)
diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c
index 9ee21f7f52..ac3ee3740c 100644
--- a/accel/tcg/translate-all.c
+++ b/accel/tcg/translate-all.c
@@ -742,6 +742,37 @@ void page_collection_unlock(struct page_collection *set)
#endif /* !CONFIG_USER_ONLY */
+/*
+ * Isolate the portion of code gen which can setjmp/longjmp.
+ * Return the size of the generated code, or negative on error.
+ */
+static int setjmp_gen_code(CPUArchState *env, TranslationBlock *tb,
+ target_ulong pc, void *host_pc,
+ int *max_insns, int64_t *ti)
+{
+ int ret = sigsetjmp(tcg_ctx->jmp_trans, 0);
+ if (unlikely(ret != 0)) {
+ return ret;
+ }
+
+ tcg_func_start(tcg_ctx);
+
+ tcg_ctx->cpu = env_cpu(env);
+ gen_intermediate_code(env_cpu(env), tb, *max_insns, pc, host_pc);
+ assert(tb->size != 0);
+ tcg_ctx->cpu = NULL;
+ *max_insns = tb->icount;
+
+#ifdef CONFIG_PROFILER
+ qatomic_set(&tcg_ctx->prof.tb_count, tcg_ctx->prof.tb_count + 1);
+ qatomic_set(&tcg_ctx->prof.interm_time,
+ tcg_ctx->prof.interm_time + profile_getclock() - *ti);
+ *ti = profile_getclock();
+#endif
+
+ return tcg_gen_code(tcg_ctx, tb, pc);
+}
+
/* Called with mmap_lock held for user mode emulation. */
TranslationBlock *tb_gen_code(CPUState *cpu,
target_ulong pc, target_ulong cs_base,
@@ -754,8 +785,8 @@ TranslationBlock *tb_gen_code(CPUState *cpu,
int gen_code_size, search_size, max_insns;
#ifdef CONFIG_PROFILER
TCGProfile *prof = &tcg_ctx->prof;
- int64_t ti;
#endif
+ int64_t ti;
void *host_pc;
assert_memory_lock();
@@ -805,33 +836,10 @@ TranslationBlock *tb_gen_code(CPUState *cpu,
ti = profile_getclock();
#endif
- gen_code_size = sigsetjmp(tcg_ctx->jmp_trans, 0);
- if (unlikely(gen_code_size != 0)) {
- goto error_return;
- }
-
- tcg_func_start(tcg_ctx);
-
- tcg_ctx->cpu = env_cpu(env);
- gen_intermediate_code(cpu, tb, max_insns, pc, host_pc);
- assert(tb->size != 0);
- tcg_ctx->cpu = NULL;
- max_insns = tb->icount;
-
trace_translate_block(tb, pc, tb->tc.ptr);
- /* generate machine code */
-
-#ifdef CONFIG_PROFILER
- qatomic_set(&prof->tb_count, prof->tb_count + 1);
- qatomic_set(&prof->interm_time,
- prof->interm_time + profile_getclock() - ti);
- ti = profile_getclock();
-#endif
-
- gen_code_size = tcg_gen_code(tcg_ctx, tb, pc);
+ gen_code_size = setjmp_gen_code(env, tb, pc, host_pc, &max_insns, &ti);
if (unlikely(gen_code_size < 0)) {
- error_return:
switch (gen_code_size) {
case -1:
/*
--
2.34.1
^ permalink raw reply related [flat|nested] 4+ messages in thread