{"id":812166,"url":"http://patchwork.ozlabs.org/api/patches/812166/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/150506131942.19604.1306593039321280342.stgit@frigg.lan/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<150506131942.19604.1306593039321280342.stgit@frigg.lan>","list_archive_url":null,"date":"2017-09-10T16:35:19","name":"[6/7] trace: Add event \"guest_inst_after\"","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"cbb48a102bcb3b837cf383a2e6685359a0455a20","submitter":{"id":9099,"url":"http://patchwork.ozlabs.org/api/people/9099/?format=json","name":"Lluís Vilanova","email":"vilanova@ac.upc.edu"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/150506131942.19604.1306593039321280342.stgit@frigg.lan/mbox/","series":[{"id":2406,"url":"http://patchwork.ozlabs.org/api/series/2406/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=2406","date":"2017-09-10T16:11:07","name":"trace: Add guest code events","version":1,"mbox":"http://patchwork.ozlabs.org/series/2406/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/812166/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/812166/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":"ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xqxWf6yPNz9ryT\n\tfor ;\n\tMon, 11 Sep 2017 02:35:57 +1000 (AEST)","from localhost ([::1]:53599 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dr5D9-0002R9-El\n\tfor incoming@patchwork.ozlabs.org; Sun, 10 Sep 2017 12:35:55 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:44028)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dr5Cl-0002R1-BJ\n\tfor qemu-devel@nongnu.org; Sun, 10 Sep 2017 12:35:32 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dr5Ci-00089U-6R\n\tfor qemu-devel@nongnu.org; Sun, 10 Sep 2017 12:35:31 -0400","from roura.ac.upc.es ([147.83.33.10]:56924)\n\tby eggs.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dr5Ch-00089K-Ry\n\tfor qemu-devel@nongnu.org; Sun, 10 Sep 2017 12:35:28 -0400","from correu-1.ac.upc.es (correu-1.ac.upc.es [147.83.30.91])\n\tby roura.ac.upc.es (8.13.8/8.13.8) with ESMTP id v8AGZQxi020634;\n\tSun, 10 Sep 2017 18:35:26 +0200","from localhost (unknown [132.68.137.153])\n\tby correu-1.ac.upc.es (Postfix) with ESMTPSA id BF0AD1B8;\n\tSun, 10 Sep 2017 18:35:20 +0200 (CEST)"],"From":"=?utf-8?b?TGx1w61z?= Vilanova ","To":"qemu-devel@nongnu.org","Date":"Sun, 10 Sep 2017 19:35:19 +0300","Message-Id":"<150506131942.19604.1306593039321280342.stgit@frigg.lan>","X-Mailer":"git-send-email 2.14.1","In-Reply-To":"<150505986682.19604.11937392314067517230.stgit@frigg.lan>","References":"<150505986682.19604.11937392314067517230.stgit@frigg.lan>","User-Agent":"StGit/0.18","MIME-Version":"1.0","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"quoted-printable","X-MIME-Autoconverted":"from 8bit to quoted-printable by roura.ac.upc.es id\n\tv8AGZQxi020634","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.6.x [fuzzy]","X-Received-From":"147.83.33.10","Subject":"[Qemu-devel] [PATCH 6/7] trace: Add event \"guest_inst_after\"","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"Paolo Bonzini , Richard Henderson ,\n\tStefan Hajnoczi ,\n\tPeter Crosthwaite ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"Signed-off-by: Lluís Vilanova \n---\n accel/tcg/translator.c | 23 ++++++++++++++++++-----\n trace-events | 8 ++++++++\n 2 files changed, 26 insertions(+), 5 deletions(-)","diff":"diff --git a/accel/tcg/translator.c b/accel/tcg/translator.c\nindex d66d601c89..c010aeee45 100644\n--- a/accel/tcg/translator.c\n+++ b/accel/tcg/translator.c\n@@ -35,7 +35,8 @@ void translator_loop_temp_check(DisasContextBase *db)\n void translator_loop(const TranslatorOps *ops, DisasContextBase *db,\n CPUState *cpu, TranslationBlock *tb)\n {\n- target_ulong pc_bbl;\n+ target_ulong pc_bbl, pc_insn = 0;\n+ bool translated_insn = false;\n int max_insns;\n \n /* Initialize DisasContext */\n@@ -75,10 +76,15 @@ void translator_loop(const TranslatorOps *ops, DisasContextBase *db,\n tcg_debug_assert(db->is_jmp == DISAS_NEXT); /* no early exit */\n \n while (true) {\n- target_ulong pc_insn = db->pc_next;\n TCGv_i32 insn_size_tcg = 0;\n int insn_size_opcode_idx;\n \n+ /* Tracing after (previous instruction) */\n+ if (db->num_insns > 0) {\n+ trace_guest_inst_after_tcg(cpu, tcg_ctx.tcg_env, pc_insn);\n+ }\n+ pc_insn = db->pc_next;\n+\n db->num_insns++;\n if (db->num_insns == 1) {\n tcg_ctx.disas.in_guest_code = true;\n@@ -136,6 +142,7 @@ void translator_loop(const TranslatorOps *ops, DisasContextBase *db,\n ops->translate_insn(db, cpu);\n }\n \n+ translated_insn = true;\n /* Tracing after (patched values) */\n if (TRACE_GUEST_INST_INFO_BEFORE_EXEC_ENABLED) {\n unsigned int insn_size = db->pc_next - pc_insn;\n@@ -156,7 +163,8 @@ void translator_loop(const TranslatorOps *ops, DisasContextBase *db,\n }\n \n /* Tracing after */\n- if (TRACE_GUEST_BBL_AFTER_ENABLED) {\n+ if (TRACE_GUEST_BBL_AFTER_ENABLED ||\n+ TRACE_GUEST_INST_AFTER_ENABLED) {\n tcg_ctx.disas.in_guest_code = false;\n if (tcg_ctx.disas.inline_label == NULL) {\n tcg_ctx.disas.inline_label = gen_new_inline_label();\n@@ -164,6 +172,9 @@ void translator_loop(const TranslatorOps *ops, DisasContextBase *db,\n \n gen_set_inline_region_begin(tcg_ctx.disas.inline_label);\n \n+ if (TRACE_GUEST_INST_AFTER_ENABLED && translated_insn) {\n+ trace_guest_inst_after_tcg(cpu, tcg_ctx.tcg_env, pc_insn);\n+ }\n if (TRACE_GUEST_BBL_AFTER_ENABLED) {\n trace_guest_bbl_after_tcg(cpu, tcg_ctx.tcg_env, pc_bbl);\n }\n@@ -195,7 +206,8 @@ void translator_loop(const TranslatorOps *ops, DisasContextBase *db,\n void translator__gen_goto_tb(TCGContext *ctx)\n {\n if (ctx->disas.in_guest_code &&\n- (TRACE_GUEST_BBL_AFTER_ENABLED)) {\n+ (TRACE_GUEST_BBL_AFTER_ENABLED ||\n+ TRACE_GUEST_INST_AFTER_ENABLED)) {\n if (ctx->disas.inline_label == NULL) {\n ctx->disas.inline_label = gen_new_inline_label();\n }\n@@ -208,7 +220,8 @@ void translator__gen_goto_tb(TCGContext *ctx)\n void translator__gen_exit_tb(TCGContext *ctx)\n {\n if (ctx->disas.in_guest_code && !ctx->disas.seen_goto_tb &&\n- (TRACE_GUEST_BBL_AFTER_ENABLED)) {\n+ (TRACE_GUEST_BBL_AFTER_ENABLED ||\n+ TRACE_GUEST_INST_AFTER_ENABLED)) {\n if (ctx->disas.inline_label == NULL) {\n ctx->disas.inline_label = gen_new_inline_label();\n }\ndiff --git a/trace-events b/trace-events\nindex ce54bb4993..c477302d8d 100644\n--- a/trace-events\n+++ b/trace-events\n@@ -118,6 +118,14 @@ vcpu tcg guest_bbl_after(uint64_t vaddr) \"vaddr=0x%016\"PRIx64, \"vaddr=0x%016\"PRI\n # Targets: TCG(all)\n vcpu tcg guest_inst_before(uint64_t vaddr) \"vaddr=0x%016\"PRIx64, \"vaddr=0x%016\"PRIx64\n \n+# @vaddr: Instruction's virtual address\n+#\n+# Mark end of instruction execution (after its operations have taken effect).\n+#\n+# Mode: user, softmmu\n+# Targets: TCG(all)\n+vcpu tcg guest_inst_after(uint64_t vaddr) \"vaddr=0x%016\"PRIx64, \"vaddr=0x%016\"PRIx64\n+\n # @vaddr: Instruction's virtual address\n # @size: Instruction's size in bytes\n #\n","prefixes":["6/7"]}