From patchwork Fri Dec 15 16:44:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 122126 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp707103qgn; Fri, 15 Dec 2017 08:46:01 -0800 (PST) X-Google-Smtp-Source: ACJfBovNIxncVsvsfMtntPiZslo/txXpM4Ex5w92k/axQ6ROs2L1D851cmdVuDvkLn9cajjO4A5z X-Received: by 10.99.170.1 with SMTP id e1mr12970956pgf.120.1513356361401; Fri, 15 Dec 2017 08:46:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513356361; cv=none; d=google.com; s=arc-20160816; b=Y/4LGIXjoUDmBUTyFWq1wJGqgc9HKVODxtX2Az/3HsEkQgpDlsql8yg33WX8g+1fC0 nvgsChKM8Wp7aK1GVTSts+NYiZWC7n733erVktArHqS9YBtslvDIGbZzPrEglyq0sRva dnqUpR3pdxqcTNXFAVXXtlBOviSeY0RbxfdkHFvyeO0VypM7v2wVMsOThUUNfLn4kj8W kHeeiVXfrlg5pNQ06fqmeIAB3tRDZhTghtbIVtCEy8NkdVYmYNPD3xHJWQzwY+Zg1+W8 J+PPhbtcsJRQqxSLzqhsOWHJB5F5H6RD7GNosAIngV23Qt61VJuKccqWPqeA+XMSYUog XUHg== 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:arc-authentication-results; bh=A6W1XtJQdjoZR9NsZdSVjX0dAYL8NIBU+4g7IS13xkg=; b=jbBrLQ/Kq2Pz6m+kskYvMhU0dLegpZuQKrgxIhF2KdDjbSI/vZ7xY0Rmo85IG2p2hk jLBO8BQwHVBWwYGClrUVNPU4UC6K1vKkwFX6lNs6JB0dZTVyirPY2E55qEM3Cu6ZGe2u wV6SFjah1guH4A4OE/lmFYBkMcRa8LiGi5tYhUW9b0Wpm6AyO9KMUs2880Tjln5oWFnM DlZy/zNRH/BFw+YdDAsf7VZ+dn19Vq7gQqyQYN4h8dGVynKhm8dbcjeODqG8ttFYkF47 KrOPE/pcy/pFJgu8SlMlo23k60FCCCo2iuYZdMJK0/V7G4uO1Vif4Y50UsdQgFSg9eJT KsAg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Nkl9Qiq5; 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 z6si4837219pgz.111.2017.12.15.08.46.01; Fri, 15 Dec 2017 08:46:01 -0800 (PST) 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=Nkl9Qiq5; 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 S1756990AbdLOQp5 (ORCPT + 24 others); Fri, 15 Dec 2017 11:45:57 -0500 Received: from mail-it0-f46.google.com ([209.85.214.46]:38119 "EHLO mail-it0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756911AbdLOQpZ (ORCPT ); Fri, 15 Dec 2017 11:45:25 -0500 Received: by mail-it0-f46.google.com with SMTP id r6so20324522itr.3 for ; Fri, 15 Dec 2017 08:45:24 -0800 (PST) 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=A6W1XtJQdjoZR9NsZdSVjX0dAYL8NIBU+4g7IS13xkg=; b=Nkl9Qiq5OH68GOmYw5mjj1DGnpA4L1Fol+t6xu1sFm0A2b/Qwp+GtRlY8oNOfgHYL7 a71DiS57zLyqDN/bDTZgRwqj8cg4AXyWyX812O8rcj9oCofu613p338jws+Y3PJlBR54 z4yJlAFREBFC1sk1mshkElClerM4NMetCnqsk= 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=A6W1XtJQdjoZR9NsZdSVjX0dAYL8NIBU+4g7IS13xkg=; b=qFE7EtRSgYhAP5UOMsnROGQ0Fnhz2qHguf8GcAR/X7pb1bRgCo9ZdTbygxGS8tyOxB PbhWmXEw1jip46q07oKPnaVSDfwg3L6ltkTTWiF+zG4q8zf8+UdRq8CbKvsisokyaHut mBxsZL9e4dVQgXqBODyBTCbLs+N5NunP0PcX2YtFsu4TGXr22YEY4LM8vAkYvSDbyzz7 ugQtZmwAVBXVoIDTHbNxYw/LIVgx/aNfpULGJDLOVETHr2O6d7Ui4ykbq6fp09ya17Wk sAq9NdNuSnxgmWcbyF5bHmDWv4Beuq5yZONEzrQJNE0JBKSovhTOPHj99Z7FBuawu5QN tAWg== X-Gm-Message-State: AKGB3mJqN5U+Q8OYcl++M3KOldi/vLl1/xCmp9+SYwln0yX8ff6EQeW+ yBg47o2IKDPjRHlHhmLGJo34eA== X-Received: by 10.107.1.15 with SMTP id 15mr12920616iob.249.1513356324099; Fri, 15 Dec 2017 08:45:24 -0800 (PST) Received: from xps15.cg.shawcable.net (S0106002369de4dac.cg.shawcable.net. [68.147.8.254]) by smtp.gmail.com with ESMTPSA id q132sm3631732iod.26.2017.12.15.08.45.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 15 Dec 2017 08:45:23 -0800 (PST) From: Mathieu Poirier To: acme@kernel.org Cc: peterz@infradead.org, mingo@redhat.com, alexander.shishkin@linux.intel.com, namhyung@kernel.org, adrian.hunter@intel.com, mike.leach@arm.com, suzuki.poulosi@arm.com, tor@ti.com, jolsa@redhat.com, mathieu.poirier@linaro.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 09/10] perf tools: Add mechanic to synthesise CoreSight trace packets Date: Fri, 15 Dec 2017 09:44:58 -0700 Message-Id: <1513356299-26274-10-git-send-email-mathieu.poirier@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1513356299-26274-1-git-send-email-mathieu.poirier@linaro.org> References: <1513356299-26274-1-git-send-email-mathieu.poirier@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Once decoded from trace packets information on trace range needs to be communicated to the perf synthesis infrastructure so that it is available to the perf tools built-in rendering tools and scripts. Co-authored-by: Tor Jeremiassen Signed-off-by: Mathieu Poirier --- tools/perf/util/cs-etm.c | 168 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 168 insertions(+) -- 2.7.4 diff --git a/tools/perf/util/cs-etm.c b/tools/perf/util/cs-etm.c index 407095af1456..b9f0a53dfa65 100644 --- a/tools/perf/util/cs-etm.c +++ b/tools/perf/util/cs-etm.c @@ -453,6 +453,157 @@ static void cs_etm__set_pid_tid_cpu(struct cs_etm_auxtrace *etm, } } +/* + * The cs etm packet encodes an instruction range between a branch target + * and the next taken branch. Generate sample accordingly. + */ +static int cs_etm__synth_branch_sample(struct cs_etm_queue *etmq, + struct cs_etm_packet *packet) +{ + int ret = 0; + struct cs_etm_auxtrace *etm = etmq->etm; + struct perf_sample sample = {.ip = 0,}; + union perf_event *event = etmq->event_buf; + u64 start_addr = packet->start_addr; + u64 end_addr = packet->end_addr; + + event->sample.header.type = PERF_RECORD_SAMPLE; + event->sample.header.misc = PERF_RECORD_MISC_USER; + event->sample.header.size = sizeof(struct perf_event_header); + + sample.ip = start_addr; + sample.pid = etmq->pid; + sample.tid = etmq->tid; + sample.addr = end_addr; + sample.id = etmq->etm->branches_id; + sample.stream_id = etmq->etm->branches_id; + sample.period = 1; + sample.cpu = packet->cpu; + sample.flags = 0; + sample.cpumode = PERF_RECORD_MISC_USER; + + ret = perf_session__deliver_synth_event(etm->session, event, &sample); + + if (ret) + pr_err( + "CS ETM Trace: failed to deliver instruction event, error %d\n", + ret); + + return ret; +} + +struct cs_etm_synth { + struct perf_tool dummy_tool; + struct perf_session *session; +}; + +static int cs_etm__event_synth(struct perf_tool *tool, + union perf_event *event, + struct perf_sample *sample __maybe_unused, + struct machine *machine __maybe_unused) +{ + struct cs_etm_synth *cs_etm_synth = + container_of(tool, struct cs_etm_synth, dummy_tool); + + return perf_session__deliver_synth_event(cs_etm_synth->session, + event, NULL); +} + +static int cs_etm__synth_event(struct perf_session *session, + struct perf_event_attr *attr, u64 id) +{ + struct cs_etm_synth cs_etm_synth; + + memset(&cs_etm_synth, 0, sizeof(struct cs_etm_synth)); + cs_etm_synth.session = session; + + return perf_event__synthesize_attr(&cs_etm_synth.dummy_tool, attr, 1, + &id, cs_etm__event_synth); +} + +static int cs_etm__synth_events(struct cs_etm_auxtrace *etm, + struct perf_session *session) +{ + struct perf_evlist *evlist = session->evlist; + struct perf_evsel *evsel; + struct perf_event_attr attr; + bool found = false; + u64 id; + int err; + + evlist__for_each_entry(evlist, evsel) { + if (evsel->attr.type == etm->pmu_type) { + found = true; + break; + } + } + + if (!found) { + pr_debug("No selected events with CoreSight Trace data\n"); + return 0; + } + + memset(&attr, 0, sizeof(struct perf_event_attr)); + attr.size = sizeof(struct perf_event_attr); + attr.type = PERF_TYPE_HARDWARE; + attr.sample_type = evsel->attr.sample_type & PERF_SAMPLE_MASK; + attr.sample_type |= PERF_SAMPLE_IP | PERF_SAMPLE_TID | + PERF_SAMPLE_PERIOD; + if (etm->timeless_decoding) + attr.sample_type &= ~(u64)PERF_SAMPLE_TIME; + else + attr.sample_type |= PERF_SAMPLE_TIME; + + attr.exclude_user = evsel->attr.exclude_user; + attr.exclude_kernel = evsel->attr.exclude_kernel; + attr.exclude_hv = evsel->attr.exclude_hv; + attr.exclude_host = evsel->attr.exclude_host; + attr.exclude_guest = evsel->attr.exclude_guest; + attr.sample_id_all = evsel->attr.sample_id_all; + attr.read_format = evsel->attr.read_format; + + /* create new id val to be a fixed offset from evsel id */ + id = evsel->id[0] + 1000000000; + + if (!id) + id = 1; + + if (etm->synth_opts.branches) { + attr.config = PERF_COUNT_HW_BRANCH_INSTRUCTIONS; + attr.sample_period = 1; + attr.sample_type |= PERF_SAMPLE_ADDR; + err = cs_etm__synth_event(session, &attr, id); + if (err) + return err; + etm->sample_branches = true; + etm->branches_sample_type = attr.sample_type; + etm->branches_id = id; + } + + return 0; +} + +static int cs_etm__sample(struct cs_etm_queue *etmq) +{ + int ret; + struct cs_etm_packet packet; + + while (1) { + ret = cs_etm_decoder__get_packet(etmq->decoder, &packet); + if (ret <= 0) + return ret; + + /* + * If the packet contains an instruction range, generate an + * instruction sequence event. + */ + if (packet.sample_type & CS_ETM_RANGE) + cs_etm__synth_branch_sample(etmq, &packet); + } + + return 0; +} + static int cs_etm__run_decoder(struct cs_etm_queue *etmq) { struct cs_etm_auxtrace *etm = etmq->etm; @@ -494,6 +645,12 @@ static int cs_etm__run_decoder(struct cs_etm_queue *etmq) etmq->offset += processed; buffer_used += processed; + + /* + * Nothing to do with an error condition, let's hope the next + * chunk will be better. + */ + err = cs_etm__sample(etmq); } while (buffer.len > buffer_used); goto more; @@ -828,6 +985,17 @@ int cs_etm__process_auxtrace_info(union perf_event *event, return 0; } + if (session->itrace_synth_opts && session->itrace_synth_opts->set) { + etm->synth_opts = *session->itrace_synth_opts; + } else { + itrace_synth_opts__set_default(&etm->synth_opts); + etm->synth_opts.callchain = false; + } + + err = cs_etm__synth_events(etm, session); + if (err) + goto err_free_queues; + err = auxtrace_queues__process_index(&etm->queues, session); if (err) goto err_free_queues;