From patchwork Sat Oct 5 09:16:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Yan X-Patchwork-Id: 175263 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp1790881ill; Sat, 5 Oct 2019 02:16:59 -0700 (PDT) X-Google-Smtp-Source: APXvYqzGD/Bl+Jbbw2wYJhfkkMTFPit5lxVxlKpn7+X7AOd2Absbmp0TufVDghUeIcZcWif/HvSy X-Received: by 2002:a50:9fe5:: with SMTP id c92mr19620419edf.280.1570267019400; Sat, 05 Oct 2019 02:16:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570267019; cv=none; d=google.com; s=arc-20160816; b=HxZeWRnBIP6DdyhV3IjwU5Shrnj5RCQgno4mtK9thSA2ew2mdU/BBSvnk+KiuyiuFB IwXWNZsq08kfab4uLGANNNTFUcvR7TqWfcTK0RqwYX42qNcS0i+i59DXn9pFxZt+vYSU xo09BvFk4NpIHOO8kRb62zaEoyWUTDRri6m9GyY8S9mQm8f/t8wbNFnWrP2eV1E7kgbB Nf1kaIyGjd+yZCWlG5kgoD6p16NCMCwhQsf5d4DNcyWhFvr2e/J18Z6baesuIYNDMklS LFRGnUF5INU27EAg8HpcVEEi6Xbu/wu704Uk+tvgjeBEfuBKj4MDYe7mz4J3xRjTjTED TeuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=Cvyd7SHkhsAyUTNzK4HPFdW4gJjTTlJOoIIwpnVpIng=; b=cxPik9jOS72TgZTLXVIM4DxXUscd4absq/wc5wuxTodm5NIwey2fVmROggiGPjQcxq UZk+48tVc1pUfa+h5OuajMCY+jqrGqGLuH6Uhhbomui8+iVqay2HW+sXXNuxT5D8dtgz A/BTpSO8Zb7kwBevoRFlZ0NYbCZ3BdqgYYO4iB2NqxnLSQZmn2wpHYZh9hPGv1xyP54p YsGw1mGq1xDvrZDjESFmbpQ63E92JbZnykTSV2lUmPHnf99XHs+HVDr8HObvu1UYsolx +anWyZ7CzkDKRL2CI0Y4q98cZiUENDLVsCTp9Qc42XIWNDZGYT+E5N7xIdaAPDDiOHOB nCPQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=z5vT+rgz; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h15si4543774ejx.211.2019.10.05.02.16.59; Sat, 05 Oct 2019 02:16:59 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=z5vT+rgz; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727735AbfJEJQz (ORCPT + 27 others); Sat, 5 Oct 2019 05:16:55 -0400 Received: from mail-qk1-f195.google.com ([209.85.222.195]:34819 "EHLO mail-qk1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725862AbfJEJQx (ORCPT ); Sat, 5 Oct 2019 05:16:53 -0400 Received: by mail-qk1-f195.google.com with SMTP id w2so8180650qkf.2 for ; Sat, 05 Oct 2019 02:16:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Cvyd7SHkhsAyUTNzK4HPFdW4gJjTTlJOoIIwpnVpIng=; b=z5vT+rgzkZPqTKKCurUgvEv1ooynkUFR/AQMCq+v6/Osi48scL/33NZN1iGSeO2Dj3 Pn4NTON6EroCgzngDc0FbriOnT+uSNYaa4TspMk58PI+BwMXS/IlTmsMs9AVwlYlzOUS 7QNaXX953LvpWa6PJqJvz51Nkn4cedIaP/S46Ho9LEIe3D+udB47yY3yCdh2NvnWn8UL YbScIKTKICmyHa26J/VoJ/dVo4Bh3OlCsj7im2WOhQYw1isOR6/Oorsd55zCZfEoplsr ebEQ/sej2qOtSm9rzHqxoEUhNf1+vsQEPwlfFWi+tp4cR2tXID58ShYh2kMFyovTesBR eS5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Cvyd7SHkhsAyUTNzK4HPFdW4gJjTTlJOoIIwpnVpIng=; b=Km/58bd/ak05vVQf67BrpTOjfX/VOu8RYwuA0P752BDX+ixtTIRXnfFD3yIZHEMFtj rcEiVE9aJDzDZovQYzDwAeETQ21P6D9N35hWU7u8znQdPBzFXp0YFlVg08kNsq8Zj5r5 zYrpqvudROAPuWk+D/qpzFZf1O293/yCRiaOS0c25XR0Uej6iOJ8La8M/mKmx9D6AAsu kB4REnbxT+nZxoYKfqKb+FgpkBLmEkWghxYhxCKscQJ4ptvPK5jkXAJqrhv26bctbopR 9X/Tf3imAlkSB/YFJc1iT05wIKgSDhHMu51t2vaeCw409z0qcBHl0ag6aG1ltRVGbrB1 cGww== X-Gm-Message-State: APjAAAWpJylkUrpubE2jqnwpZBqQDPAe8PUYTcbLaWSdgeveZgEuiXh/ p1MEExPnjIizSibp4ezfcHE8VjZ0BpY= X-Received: by 2002:ae9:f215:: with SMTP id m21mr14508170qkg.47.1570267011921; Sat, 05 Oct 2019 02:16:51 -0700 (PDT) Received: from localhost.localdomain (li937-157.members.linode.com. [45.56.119.157]) by smtp.gmail.com with ESMTPSA id u132sm4384621qka.50.2019.10.05.02.16.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Oct 2019 02:16:51 -0700 (PDT) From: Leo Yan To: Arnaldo Carvalho de Melo , Mathieu Poirier , Suzuki K Poulose , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Mike Leach , Coresight ML , Peter Zijlstra , Ingo Molnar Cc: Leo Yan Subject: [PATCH v3 3/6] perf cs-etm: Support thread stack Date: Sat, 5 Oct 2019 17:16:11 +0800 Message-Id: <20191005091614.11635-4-leo.yan@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191005091614.11635-1-leo.yan@linaro.org> References: <20191005091614.11635-1-leo.yan@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Since Arm CoreSight doesn't support thread stack, the decoding cannot display symbols with indented spaces to reflect the stack depth. This patch adds support thread stack for Arm CoreSight, this allows 'perf script' to display properly for option '-F,+callindent'. Before: # perf script -F,+callindent main 2808 1 branches: coresight_test1 ffff8634f5c8 coresight_test1+0x3c (/root/coresight_test/libcstest.so) main 2808 1 branches: printf@plt aaaaba8d37ec main+0x28 (/root/coresight_test/main) main 2808 1 branches: printf@plt aaaaba8d36bc printf@plt+0xc (/root/coresight_test/main) main 2808 1 branches: _init aaaaba8d3650 _init+0x30 (/root/coresight_test/main) main 2808 1 branches: _dl_fixup ffff86373b4c _dl_runtime_resolve+0x40 (/lib/aarch64-linux-gnu/ld-2.28.so) main 2808 1 branches: _dl_lookup_symbol_x ffff8636e078 _dl_fixup+0xb8 (/lib/aarch64-linux-gnu/ld-2.28.so) [...] After: # perf script -F,+callindent main 2808 1 branches: coresight_test1 ffff8634f5c8 coresight_test1+0x3c (/root/coresight_test/libcstest.so) main 2808 1 branches: printf@plt aaaaba8d37ec main+0x28 (/root/coresight_test/main) main 2808 1 branches: printf@plt aaaaba8d36bc printf@plt+0xc (/root/coresight_test/main) main 2808 1 branches: _init aaaaba8d3650 _init+0x30 (/root/coresight_test/main) main 2808 1 branches: _dl_fixup ffff86373b4c _dl_runtime_resolve+0x40 (/lib/aarch64-linux-gnu/ld-2.28.s main 2808 1 branches: _dl_lookup_symbol_x ffff8636e078 _dl_fixup+0xb8 (/lib/aarch64-linux-gnu/ld-2.28.so) [...] Signed-off-by: Leo Yan --- tools/perf/util/cs-etm.c | 44 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) -- 2.17.1 diff --git a/tools/perf/util/cs-etm.c b/tools/perf/util/cs-etm.c index 58ceba7b91d5..780abbfd1833 100644 --- a/tools/perf/util/cs-etm.c +++ b/tools/perf/util/cs-etm.c @@ -1117,6 +1117,45 @@ static void cs_etm__copy_insn(struct cs_etm_queue *etmq, sample->insn_len, (void *)sample->insn); } +static void cs_etm__add_stack_event(struct cs_etm_queue *etmq, + struct cs_etm_traceid_queue *tidq) +{ + struct cs_etm_auxtrace *etm = etmq->etm; + u8 trace_chan_id = tidq->trace_chan_id; + int insn_len; + u64 from_ip, to_ip; + + if (etm->synth_opts.thread_stack) { + from_ip = cs_etm__last_executed_instr(tidq->prev_packet); + to_ip = cs_etm__first_executed_instr(tidq->packet); + + insn_len = cs_etm__instr_size(etmq, trace_chan_id, + tidq->prev_packet->isa, from_ip); + + /* + * Create thread stacks by keeping track of calls and returns; + * any call pushes thread stack, return pops the stack, and + * flush stack when the trace is discontinuous. + */ + thread_stack__event(tidq->thread, tidq->prev_packet->cpu, + tidq->prev_packet->flags, + from_ip, to_ip, insn_len, + etmq->buffer->buffer_nr); + } else { + /* + * The thread stack can be output via thread_stack__process(); + * thus the detailed information about paired calls and returns + * will be facilitated by Python script for the db-export. + * + * Need to set trace buffer number and flush thread stack if the + * trace buffer number has been alternate. + */ + thread_stack__set_trace_nr(tidq->thread, + tidq->prev_packet->cpu, + etmq->buffer->buffer_nr); + } +} + static int cs_etm__synth_instruction_sample(struct cs_etm_queue *etmq, struct cs_etm_traceid_queue *tidq, u64 addr, u64 period) @@ -1393,6 +1432,9 @@ static int cs_etm__sample(struct cs_etm_queue *etmq, tidq->period_instructions = instrs_over; } + if (tidq->prev_packet->last_instr_taken_branch) + cs_etm__add_stack_event(etmq, tidq); + if (etm->sample_branches) { bool generate_sample = false; @@ -2593,6 +2635,8 @@ int cs_etm__process_auxtrace_info(union perf_event *event, itrace_synth_opts__set_default(&etm->synth_opts, session->itrace_synth_opts->default_no_sample); etm->synth_opts.callchain = false; + etm->synth_opts.thread_stack = + session->itrace_synth_opts->thread_stack; } err = cs_etm__synth_events(etm, session);