From patchwork Wed Jan 17 17:52:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 124895 Delivered-To: patch@linaro.org Received: by 10.46.62.1 with SMTP id l1csp131605lja; Wed, 17 Jan 2018 09:52:50 -0800 (PST) X-Google-Smtp-Source: ACJfBosM6Dgv0NDPEjvSKDKNiwHxYf36oSBWKGdWzXZmZ4UiZQI1SHwHDHq/eZ6AJ1cPNkEfyyuI X-Received: by 10.84.241.194 with SMTP id t2mr44299882plm.318.1516211570569; Wed, 17 Jan 2018 09:52:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516211570; cv=none; d=google.com; s=arc-20160816; b=SHUrAbYSnpbZO0vZapMWfCPaEPb+ZTpC0PrYeZIj6mFYL+WCHweDXWXnxQWqEXao4W OuginT+DlpK7GnDBXRwNzrKWOWNa6TjTsVgutUahAIROS1fQkgDWiTwhMNh2YBskDz5Y 4evkKqj+bbn0dFuvYFPiHnlDq7gMfbVbd6H5KhsvxuBnBbIVrYvjlXUX6tGNAfKwnGb6 BhLlo30QeVVD1aWhtErieKdsR8rQpkZo3tObBaqIVymgv9oyKWtzxwAOD355hw2Ier5/ nU33fdVuqVgDgfWZBwdZuIa+srFruWqtRK5n7ww2m3jfsCAH+m9qCRzQFv0+Hol5QsCJ MjdQ== 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=FFpO7QKtF5gYzcLGDLYjEZ4LJy7F/+vMuZ8EK02d+awYpiZayk1EZZKAnR7h4XSsb3 iqXhlGmgUoI2T6NmtdRlCLaxMrY5ER8gIHV0A/J6d82ePPkNZznvY/P8L+oaepC30k3f FKeY0lngsArKcwfE8LtD4orqZFWULyB1VCV2lkKqaBRiYxCK5IcUyPOI86yJ5Z8s/ISz JJ+irJA11xOOCNA9FfV+LORzw2hB+6siDwx5B+htpwJ2rOLD3HHMvVup07N7jzEf2z8X z9t609s1Ln7aBhhucG7TI+oAKeOYT+Q+kXSvli2721fp25pZcJgKb/QLyx0s0hL9FBP6 vPaw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=G0D371tB; 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 z3si4747166plk.594.2018.01.17.09.52.50; Wed, 17 Jan 2018 09:52:50 -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=G0D371tB; 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 S1754511AbeAQRwr (ORCPT + 28 others); Wed, 17 Jan 2018 12:52:47 -0500 Received: from mail-it0-f44.google.com ([209.85.214.44]:36718 "EHLO mail-it0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754487AbeAQRwp (ORCPT ); Wed, 17 Jan 2018 12:52:45 -0500 Received: by mail-it0-f44.google.com with SMTP id p124so10254871ite.1 for ; Wed, 17 Jan 2018 09:52:44 -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=G0D371tBpvXWxk4KTm6tO8pfLmBIVK7eTisQXWAdV7SxDVv5MzK1uvxKJSIzug4ix4 8efO76aqrFbCUv/3XezUsrGg8s/WGVtJ3xVFL3ZZ0Wy3+7S9qPeGwrdUpz1+Nsi1tYVe kdoDlAsCusOZ2lm1kqa5+Nbdxn0UkLuwT0GkM= 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=CregrDg0BpaO3fLrft6xWV++J6aob3Au23zuI7zCxCIf5+X7Fp0Uy8j4PlUOyPA8sM wiWqZ/14EkWoXlFrhTijXOfrQKqHuQOsFPu4Pd8may334vg4R96cfoHQmx0W3jhspGVe g6Uu9H4WYua728Odqwtln+uGgh7qEDh1m9yhmYGnBgIpXMgU4of17tcUMwbusUamBZVX HER81JHRYz+aPHE2PXWzftzui/eYlJydl2T+w1Ha3D1EDIH8Fvp+0022DeUvWFYwk5YJ ZN0tfSYMdvJuj5/TR8DcQL2eJ6SxdXfyXv5s7LV6yvrAbFmja9r6tM8ZIietEQvKFmJE spxg== X-Gm-Message-State: AKwxytcQ5Q/OifAfzS62bXlQbgWrNluEyiF7/bzzXWT9IGudMkISjrRe mX3CCs8nf4U0LE7eo3NSJ0XFvA== X-Received: by 10.36.76.68 with SMTP id a65mr22217278itb.57.1516211564328; Wed, 17 Jan 2018 09:52:44 -0800 (PST) Received: from xps15.cg.shawcable.net (S0106002369de4dac.cg.shawcable.net. [68.147.8.254]) by smtp.gmail.com with ESMTPSA id h72sm2694392ioe.61.2018.01.17.09.52.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 17 Jan 2018 09:52:43 -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, jolsa@redhat.com, kim.phillips@arm.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v3 09/10] perf tools: Add mechanic to synthesise CoreSight trace packets Date: Wed, 17 Jan 2018 10:52:18 -0700 Message-Id: <1516211539-5166-10-git-send-email-mathieu.poirier@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516211539-5166-1-git-send-email-mathieu.poirier@linaro.org> References: <1516211539-5166-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;