From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33025) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aiN82-000538-Fv for qemu-devel@nongnu.org; Tue, 22 Mar 2016 10:17:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aiN81-0006k2-7w for qemu-devel@nongnu.org; Tue, 22 Mar 2016 10:17:50 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37086) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aiN81-0006jn-0Y for qemu-devel@nongnu.org; Tue, 22 Mar 2016 10:17:49 -0400 From: Paolo Bonzini Date: Tue, 22 Mar 2016 15:16:59 +0100 Message-Id: <1458656229-32043-20-git-send-email-pbonzini@redhat.com> In-Reply-To: <1458656229-32043-1-git-send-email-pbonzini@redhat.com> References: <1458656229-32043-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 19/29] qemu-log: Improve the "exec" TB execution logging List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , =?UTF-8?q?Alex=20Benn=C3=A9e?= From: Peter Maydell Improve the TB execution logging so that it is easier to identify what is happening from trace logs: * move the "Trace" logging of executed TBs into cpu_tb_exec() so that it is emitted if and only if we actually execute a TB, and for consistency for the CPU state logging * log when we link two TBs together via tb_add_jump() * log when cpu_tb_exec() returns early from a chain of TBs The new style logging looks like this: Trace 0x7fb7cc822ca0 [ffffffc0000dce00] Linking TBs 0x7fb7cc822ca0 [ffffffc0000dce00] index 0 -> 0x7fb7cc823110 [= ffffffc0000dce10] Trace 0x7fb7cc823110 [ffffffc0000dce10] Trace 0x7fb7cc823420 [ffffffc000302688] Trace 0x7fb7cc8234a0 [ffffffc000302698] Trace 0x7fb7cc823520 [ffffffc0003026a4] Trace 0x7fb7cc823560 [ffffffc0000dce44] Linking TBs 0x7fb7cc823560 [ffffffc0000dce44] index 1 -> 0x7fb7cc8235d0 [= ffffffc0000dce70] Trace 0x7fb7cc8235d0 [ffffffc0000dce70] Stopped execution of TB chain before 0x7fb7cc8235d0 [ffffffc0000dce70] Trace 0x7fb7cc8235d0 [ffffffc0000dce70] Trace 0x7fb7cc822fd0 [ffffffc0000dd52c] Signed-off-by: Peter Maydell Signed-off-by: Alex Benn=C3=A9e [AJB: reword patch title, Abandoned->Stopped] Reviewed-by: Aurelien Jarno Reviewed-by: Richard Henderson Message-Id: <1458052224-9316-6-git-send-email-alex.bennee@linaro.org> Signed-off-by: Paolo Bonzini --- cpu-exec.c | 20 +++++++++++--------- include/exec/exec-all.h | 3 +++ 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/cpu-exec.c b/cpu-exec.c index fd92452..6206cdf 100644 --- a/cpu-exec.c +++ b/cpu-exec.c @@ -133,10 +133,14 @@ static void init_delay_params(SyncClocks *sc, const= CPUState *cpu) #endif /* CONFIG USER ONLY */ =20 /* Execute a TB, and fix up the CPU state afterwards if necessary */ -static inline tcg_target_ulong cpu_tb_exec(CPUState *cpu, uint8_t *tb_pt= r) +static inline tcg_target_ulong cpu_tb_exec(CPUState *cpu, TranslationBlo= ck *itb) { CPUArchState *env =3D cpu->env_ptr; uintptr_t next_tb; + uint8_t *tb_ptr =3D itb->tc_ptr; + + qemu_log_mask(CPU_LOG_EXEC, "Trace %p [" TARGET_FMT_lx "] %s\n", + itb->tc_ptr, itb->pc, lookup_symbol(itb->pc)); =20 #if defined(DEBUG_DISAS) if (qemu_loglevel_mask(CPU_LOG_TB_CPU)) { @@ -167,6 +171,10 @@ static inline tcg_target_ulong cpu_tb_exec(CPUState = *cpu, uint8_t *tb_ptr) */ CPUClass *cc =3D CPU_GET_CLASS(cpu); TranslationBlock *tb =3D (TranslationBlock *)(next_tb & ~TB_EXIT= _MASK); + qemu_log_mask(CPU_LOG_EXEC, + "Stopped execution of TB chain before %p [" + TARGET_FMT_lx "] %s\n", + itb->tc_ptr, itb->pc, lookup_symbol(itb->pc)); if (cc->synchronize_from_tb) { cc->synchronize_from_tb(cpu, tb); } else { @@ -202,7 +210,7 @@ static void cpu_exec_nocache(CPUState *cpu, int max_c= ycles, cpu->current_tb =3D tb; /* execute the generated code */ trace_exec_tb_nocache(tb, tb->pc); - cpu_tb_exec(cpu, tb->tc_ptr); + cpu_tb_exec(cpu, tb); cpu->current_tb =3D NULL; tb_phys_invalidate(tb, -1); tb_free(tb); @@ -344,7 +352,6 @@ int cpu_exec(CPUState *cpu) #endif int ret, interrupt_request; TranslationBlock *tb; - uint8_t *tc_ptr; uintptr_t next_tb; SyncClocks sc; =20 @@ -500,10 +507,6 @@ int cpu_exec(CPUState *cpu) next_tb =3D 0; tcg_ctx.tb_ctx.tb_invalidated_flag =3D 0; } - if (qemu_loglevel_mask(CPU_LOG_EXEC)) { - qemu_log("Trace %p [" TARGET_FMT_lx "] %s\n", - tb->tc_ptr, tb->pc, lookup_symbol(tb->pc)); - } /* see if we can patch the calling TB. When the TB spans two pages, we cannot safely do a direct jump. */ @@ -515,10 +518,9 @@ int cpu_exec(CPUState *cpu) tb_unlock(); if (likely(!cpu->exit_request)) { trace_exec_tb(tb, tb->pc); - tc_ptr =3D tb->tc_ptr; /* execute the generated code */ cpu->current_tb =3D tb; - next_tb =3D cpu_tb_exec(cpu, tc_ptr); + next_tb =3D cpu_tb_exec(cpu, tb); cpu->current_tb =3D NULL; switch (next_tb & TB_EXIT_MASK) { case TB_EXIT_REQUESTED: diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h index 05a151d..1823ee3 100644 --- a/include/exec/exec-all.h +++ b/include/exec/exec-all.h @@ -379,6 +379,9 @@ static inline void tb_add_jump(TranslationBlock *tb, = int n, { /* NOTE: this test is only needed for thread safety */ if (!tb->jmp_next[n]) { + qemu_log_mask(CPU_LOG_EXEC, "Linking TBs %p [" TARGET_FMT_lx + "] index %d -> %p [" TARGET_FMT_lx "]\n", + tb->tc_ptr, tb->pc, n, tb_next->tc_ptr, tb_next->p= c); /* patch the native jump address */ tb_set_jmp_target(tb, n, (uintptr_t)tb_next->tc_ptr); =20 --=20 2.5.0