From patchwork Fri Aug 1 14:21:39 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 34703 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pa0-f71.google.com (mail-pa0-f71.google.com [209.85.220.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id BD4C8202A1 for ; Fri, 1 Aug 2014 14:22:48 +0000 (UTC) Received: by mail-pa0-f71.google.com with SMTP id et14sf28187373pad.6 for ; Fri, 01 Aug 2014 07:22:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:mime-version:cc:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list:content-type :content-transfer-encoding; bh=2WANQp3hP78n+qNOAW8bGmqI8x3shNWp88IWFg2t37g=; b=jQBHum22/W2TAKxeYtTlS/y2Nagvh/+FmeTiqgg/u8DxSSGS+d0/O/OJ3ax7npcuA8 3UEEc7wWLyHrC7j6RykCZYs2H3E55l4tUr/bjrbXtCmbbTWCS8NcEaOX5AE80lxjQgHV 44VgWRw2SpmceFuvyXotF7rGx+Lqxa3J+/lEkRdkq2Zt6J2Rdkvhnef6wpsw5je7OaZ6 Crro5YuUMXb9O+6Mt80FnOlAUWTM7fA1NTzlxtZTPMm5E9yVuf2pCur7Y2SsC6iwF1al WQf0bWuKwVi2jmrCYlNBJoURFLQPksmV6C/Bf2JW7ZmIOSj0e5XyAp1VrTuLWRAtLesJ 36Dw== X-Gm-Message-State: ALoCoQlyJszlr6DB24c6rDlHWu/zubrXc20D10ztGwFulfKO08pOPUOHi3QPc5P4Eez6VdyNtSie X-Received: by 10.66.65.108 with SMTP id w12mr2166286pas.46.1406902967957; Fri, 01 Aug 2014 07:22:47 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.86.239 with SMTP id p102ls1268181qgd.57.gmail; Fri, 01 Aug 2014 07:22:47 -0700 (PDT) X-Received: by 10.220.122.132 with SMTP id l4mr6448922vcr.41.1406902967864; Fri, 01 Aug 2014 07:22:47 -0700 (PDT) Received: from mail-vc0-f174.google.com (mail-vc0-f174.google.com [209.85.220.174]) by mx.google.com with ESMTPS id q6si7357706vey.71.2014.08.01.07.22.47 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 01 Aug 2014 07:22:47 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.174 as permitted sender) client-ip=209.85.220.174; Received: by mail-vc0-f174.google.com with SMTP id la4so6681762vcb.5 for ; Fri, 01 Aug 2014 07:22:47 -0700 (PDT) X-Received: by 10.52.144.14 with SMTP id si14mr1851010vdb.95.1406902967792; Fri, 01 Aug 2014 07:22:47 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.37.5 with SMTP id tc5csp114780vcb; Fri, 1 Aug 2014 07:22:47 -0700 (PDT) X-Received: by 10.52.170.140 with SMTP id am12mr5608830vdc.10.1406902967450; Fri, 01 Aug 2014 07:22:47 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id n8si15749135qge.127.2014.08.01.07.22.47 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 01 Aug 2014 07:22:47 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Received: from localhost ([::1]:39501 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XDDjL-00057i-0u for patch@linaro.org; Fri, 01 Aug 2014 10:22:47 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59696) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XDDiO-00040D-TW for qemu-devel@nongnu.org; Fri, 01 Aug 2014 10:21:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XDDiJ-0002CA-5B for qemu-devel@nongnu.org; Fri, 01 Aug 2014 10:21:48 -0400 Received: from static.88-198-71-155.clients.your-server.de ([88.198.71.155]:56179 helo=socrates.bennee.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XDDiI-0002Bg-VU for qemu-devel@nongnu.org; Fri, 01 Aug 2014 10:21:43 -0400 Received: from localhost ([127.0.0.1] helo=zen.linaro.local) by socrates.bennee.com with esmtp (Exim 4.80) (envelope-from ) id 1XDDsP-0003iL-Ck; Fri, 01 Aug 2014 16:32:09 +0200 From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: stefanha@redhat.com Date: Fri, 1 Aug 2014 15:21:39 +0100 Message-Id: <1406902899-15687-3-git-send-email-alex.bennee@linaro.org> X-Mailer: git-send-email 2.0.3 In-Reply-To: <1406902899-15687-1-git-send-email-alex.bennee@linaro.org> References: <1406902899-15687-1-git-send-email-alex.bennee@linaro.org> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: alex.bennee@linaro.org X-SA-Exim-Scanned: No (on socrates.bennee.com); SAEximRunCond expanded to false X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 88.198.71.155 Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH v3 2/2] trace: add some tcg tracing support X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: alex.bennee@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.174 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 This adds a couple of tcg specific trace-events which are useful for tracing execution though tcg generated blocks. It's been tested with lttng user space tracing but is generic enough for all systems. The tcg events are: * translate_block - when a subject block is translated * exec_tb - when a translated block is entered * exec_tb_exit - when we exit the translated code * exec_tb_nocache - special case translations Of course we can only trace the entrance to the first block of a chain as each block will jump directly to the next when it can. See the -d nochain patch to allow more complete tracing at the expense of performance. Signed-off-by: Alex Bennée --- v2 - rebase v3: - checkpatch clean-ups - add sign-off - disable exec_tb by default diff --git a/cpu-exec.c b/cpu-exec.c index 38e5f02..d209568 100644 --- a/cpu-exec.c +++ b/cpu-exec.c @@ -18,6 +18,7 @@ */ #include "config.h" #include "cpu.h" +#include "trace.h" #include "disas/disas.h" #include "tcg.h" #include "qemu/atomic.h" @@ -65,6 +66,9 @@ static inline tcg_target_ulong cpu_tb_exec(CPUState *cpu, uint8_t *tb_ptr) #endif /* DEBUG_DISAS */ next_tb = tcg_qemu_tb_exec(env, tb_ptr); + trace_exec_tb_exit((void *) (next_tb & ~TB_EXIT_MASK), + next_tb & TB_EXIT_MASK); + if ((next_tb & TB_EXIT_MASK) > TB_EXIT_IDX1) { /* We didn't start executing this TB (eg because the instruction * counter hit zero); we must restore the guest PC to the address @@ -105,6 +109,7 @@ static void cpu_exec_nocache(CPUArchState *env, int max_cycles, max_cycles); cpu->current_tb = tb; /* execute the generated code */ + trace_exec_tb_nocache(tb, tb->pc); cpu_tb_exec(cpu, tb->tc_ptr); cpu->current_tb = NULL; tb_phys_invalidate(tb, -1); @@ -637,6 +642,7 @@ int cpu_exec(CPUArchState *env) cpu->current_tb = tb; barrier(); if (likely(!cpu->exit_request)) { + trace_exec_tb(tb, tb->pc); tc_ptr = tb->tc_ptr; /* execute the generated code */ next_tb = cpu_tb_exec(cpu, tc_ptr); diff --git a/trace-events b/trace-events index 11a17a8..8aaa613 100644 --- a/trace-events +++ b/trace-events @@ -1265,6 +1265,15 @@ kvm_failed_spr_get(int str, const char *msg) "Warning: Unable to retrieve SPR %d kvm_failed_reg_get(uint64_t id, const char *msg) "Warning: Unable to retrieve ONEREG %" PRIu64 " from KVM: %s" kvm_failed_reg_set(uint64_t id, const char *msg) "Warning: Unable to set ONEREG %" PRIu64 " to KVM: %s" +# TCG related tracing (mostly disabled by default) +# cpu-exec.c +disable exec_tb(void *tb, uintptr_t pc) "tb:%p pc=0x%x" +disable exec_tb_nocache(void *tb, uintptr_t pc) "tb:%p pc=0x%x" +disable exec_tb_exit(void *next_tb, unsigned int flags) "tb:%p flags=%x" + +# translate-all.c +translate_block(void *tb, uintptr_t pc, uint8_t *tb_code) "tb:%p, pc:0x%x, tb_code:%p" + # memory.c memory_region_ops_read(void *mr, uint64_t addr, uint64_t value, unsigned size) "mr %p addr %#"PRIx64" value %#"PRIx64" size %u" memory_region_ops_write(void *mr, uint64_t addr, uint64_t value, unsigned size) "mr %p addr %#"PRIx64" value %#"PRIx64" size %u" diff --git a/translate-all.c b/translate-all.c index 8f7e11b..2e0265a 100644 --- a/translate-all.c +++ b/translate-all.c @@ -33,6 +33,7 @@ #include "qemu-common.h" #define NO_CPU_IO_DEFS #include "cpu.h" +#include "trace.h" #include "disas/disas.h" #include "tcg.h" #if defined(CONFIG_USER_ONLY) @@ -158,6 +159,8 @@ int cpu_gen_code(CPUArchState *env, TranslationBlock *tb, int *gen_code_size_ptr gen_intermediate_code(env, tb); + trace_translate_block(tb, tb->pc, tb->tc_ptr); + /* generate machine code */ gen_code_buf = tb->tc_ptr; tb->tb_next_offset[0] = 0xffff;