From patchwork Tue Jul 19 22:53:56 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 72376 Delivered-To: patch@linaro.org Received: by 10.140.29.52 with SMTP id a49csp322273qga; Tue, 19 Jul 2016 15:55:00 -0700 (PDT) X-Received: by 10.66.154.232 with SMTP id vr8mr69283715pab.104.1468968897226; Tue, 19 Jul 2016 15:54:57 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id wy7si35007274pab.3.2016.07.19.15.54.56; Tue, 19 Jul 2016 15:54:57 -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; 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 dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752631AbcGSWyv (ORCPT + 29 others); Tue, 19 Jul 2016 18:54:51 -0400 Received: from mail-io0-f175.google.com ([209.85.223.175]:36404 "EHLO mail-io0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752369AbcGSWyI (ORCPT ); Tue, 19 Jul 2016 18:54:08 -0400 Received: by mail-io0-f175.google.com with SMTP id b62so32452431iod.3 for ; Tue, 19 Jul 2016 15:54:07 -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=5cXCxshSZyi1hEHkz+yVbnH8h89Bjhv4AW+TfX3P9bU=; b=kqzR6JIzW/2C2RsRzqpAdbQFUdfLKL3OaSzYsJ2B1n9ijOYiYpBXFff6pCH5YOXvNB mKsykt8/PembghdMke/i/IIue7qCb+dFtVO3XT5nuOPbfLKSDUgQBiR7yZ+Wc/A6VuXx 3tiX07gRG9e9JqoemSO8l8JB3VPEjasuorgkA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=5cXCxshSZyi1hEHkz+yVbnH8h89Bjhv4AW+TfX3P9bU=; b=jzcS+0X/mf1RvfgRsCr1EzbfG2dg6F28BdOIFxB+qHyxf7PJcaoo8q51QERRWsHt5a np/18IuYt/r8kW2ixTRghLBp4j+2vnTgd2SljwNFtD1nNvg/+F+EyzTZaLKPuZ5oyZhI tEMDP99tVQE4jPHsaklifqs6okThzV6GnF/SiSkh7cI1VNF5fA8cwW3DJhMQiD/Wp/kD cyQU0Lgo5NNYyw4hTmvDWC4EJzDqIbl4QpFm4dz2vB3x44RMd6SbS7iBKU4mScB14Qi+ ITPj8mfycWd2S2DkWsxO9tAOFwNyKzv45O9YEsD3hfDmriN68NAZHfsDUDN5fkpnW6uE zeNA== X-Gm-Message-State: ALyK8tJ2EEa9nzhWnBW23pfKMFDVNpS9q/zqo/ZYGc5V70AjTuEgoZA2ZiCG5VPwIXTkZisw X-Received: by 10.107.3.221 with SMTP id e90mr43276695ioi.17.1468968847178; Tue, 19 Jul 2016 15:54:07 -0700 (PDT) Received: from t430.cg.shawcable.net (S0106002369de4dac.cg.shawcable.net. [68.147.8.254]) by smtp.gmail.com with ESMTPSA id x96sm71499ita.20.2016.07.19.15.54.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 19 Jul 2016 15:54:06 -0700 (PDT) From: Mathieu Poirier To: peterz@infradead.org, mingo@redhat.com, acme@kernel.org, alexander.shishkin@linux.intel.com, jolsa@kernel.org Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 6/6] coresight: etm-perf: incorporating sink definition from cmd line Date: Tue, 19 Jul 2016 16:53:56 -0600 Message-Id: <1468968836-12695-7-git-send-email-mathieu.poirier@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1468968836-12695-1-git-send-email-mathieu.poirier@linaro.org> References: <1468968836-12695-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 Now that PMU specific configuration is available as part of the event, lookup the sink identified by users from the perf command line and build a path from source to sink. With this functionality it is no longer required to select a sink in a separate step (from sysFS) before a perf trace session can be started. Signed-off-by: Mathieu Poirier --- drivers/hwtracing/coresight/coresight-etm-perf.c | 101 ++++++++++++++++++++++- 1 file changed, 100 insertions(+), 1 deletion(-) -- 2.7.4 diff --git a/drivers/hwtracing/coresight/coresight-etm-perf.c b/drivers/hwtracing/coresight/coresight-etm-perf.c index f8c7a8733b23..5658a7411a66 100644 --- a/drivers/hwtracing/coresight/coresight-etm-perf.c +++ b/drivers/hwtracing/coresight/coresight-etm-perf.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include @@ -71,11 +72,20 @@ static const struct attribute_group *etm_pmu_attr_groups[] = { static void etm_event_read(struct perf_event *event) {} +static void etm_event_destroy(struct perf_event *event) +{ + kfree(event->hw.drv_configs); + event->hw.drv_configs = NULL; +} + static int etm_event_init(struct perf_event *event) { if (event->attr.type != etm_pmu.type) return -ENOENT; + event->destroy = etm_event_destroy; + event->hw.drv_configs = NULL; + return 0; } @@ -159,6 +169,7 @@ static void *etm_setup_aux(struct perf_event *event, void **pages, int nr_pages, bool overwrite) { int cpu; + char *cmdl_sink; cpumask_t *mask; struct coresight_device *sink; struct etm_event_data *event_data = NULL; @@ -171,6 +182,12 @@ static void *etm_setup_aux(struct perf_event *event, void **pages, mask = &event_data->mask; + /* + * If a sink was specified from the perf cmdline it will be part of + * the event's drv_configs. + */ + cmdl_sink = (char *)event->hw.drv_configs; + /* Setup the path for each CPU in a trace session */ for_each_cpu(cpu, mask) { struct coresight_device *csdev; @@ -184,7 +201,7 @@ static void *etm_setup_aux(struct perf_event *event, void **pages, * list of devices from source to sink that can be * referenced later when the path is actually needed. */ - event_data->path[cpu] = coresight_build_path(csdev, NULL); + event_data->path[cpu] = coresight_build_path(csdev, cmdl_sink); if (!event_data->path[cpu]) goto err; } @@ -342,6 +359,87 @@ static void etm_event_del(struct perf_event *event, int mode) etm_event_stop(event, PERF_EF_UPDATE); } +enum { + ETM_TOKEN_SINK_CPU, + ETM_TOKEN_SINK, + ETM_TOKEN_ERR, +}; + +static const match_table_t drv_cfg_tokens = { + {ETM_TOKEN_SINK_CPU, "sink=cpu%d:%s"}, + {ETM_TOKEN_SINK, "sink=%s"}, + {ETM_TOKEN_ERR, NULL}, +}; + +static int etm_set_drv_configs(struct perf_event *event, void __user *arg) +{ + char *config, *sink = NULL; + int cpu = -1, token, ret = 0; + substring_t args[MAX_OPT_ARGS]; + + /* Only one sink per event */ + if (event->hw.drv_configs != NULL) { + ret = -EINVAL; + goto err; + } + + /* Make user supplied input usable */ + config = strndup_user(arg, PAGE_SIZE); + if (IS_ERR(config)) { + ret = PTR_ERR(config); + goto err; + } + + /* See above declared @drv_cfg_tokens for the usable formats */ + token = match_token(config, drv_cfg_tokens, args); + switch (token) { + case ETM_TOKEN_SINK: + /* Just a sink has been specified */ + sink = match_strdup(&args[0]); + if (IS_ERR(sink)) { + ret = PTR_ERR(sink); + goto err; + } + break; + case ETM_TOKEN_SINK_CPU: + /* We have a sink and a CPU */ + + /* First get the cpu */ + if (match_int(&args[0], &cpu)) { + ret = -EINVAL; + goto err; + } + + /* Then the sink */ + sink = match_strdup(&args[1]); + if (IS_ERR(sink)) { + ret = PTR_ERR(sink); + goto err; + } + break; + default: + ret = -EINVAL; + goto err; + } + + /* + * If the CPUs don't match the sink is destined to another path. This + * isn't as an error hence not setting @ret. + */ + if (event->cpu != cpu) + goto err; + + /* We have a valid configuration */ + event->hw.drv_configs = sink; + +out: + return ret; + +err: + kfree(sink); + goto out; +} + int etm_perf_symlink(struct coresight_device *csdev, bool link) { char entry[sizeof("cpu9999999")]; @@ -383,6 +481,7 @@ static int __init etm_perf_init(void) etm_pmu.stop = etm_event_stop; etm_pmu.add = etm_event_add; etm_pmu.del = etm_event_del; + etm_pmu.set_drv_configs = etm_set_drv_configs; ret = perf_pmu_register(&etm_pmu, CORESIGHT_ETM_PMU_NAME, -1); if (ret == 0)