From patchwork Mon Nov 23 18:33:06 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 57176 Delivered-To: patch@linaro.org Received: by 10.112.155.196 with SMTP id vy4csp1602570lbb; Mon, 23 Nov 2015 10:34:50 -0800 (PST) X-Received: by 10.66.217.138 with SMTP id oy10mr36978587pac.112.1448303689627; Mon, 23 Nov 2015 10:34:49 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n12si21229032pfa.89.2015.11.23.10.34.49; Mon, 23 Nov 2015 10:34:49 -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; 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; dkim=neutral (body hash did not verify) header.i=@linaro-org.20150623.gappssmtp.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755161AbbKWSee (ORCPT + 28 others); Mon, 23 Nov 2015 13:34:34 -0500 Received: from mail-pa0-f49.google.com ([209.85.220.49]:35580 "EHLO mail-pa0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754998AbbKWSeV (ORCPT ); Mon, 23 Nov 2015 13:34:21 -0500 Received: by pacej9 with SMTP id ej9so198771349pac.2 for ; Mon, 23 Nov 2015 10:34:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=vNXwL1Vmvy6gRlkIM0ym8VMaudelNbiYK08V5ksvWu8=; b=c2Kebz4PWTPGXW+T5UcD7j+WsSPPupyxl9t4Kdl/uqOhZ3QqVx4wF6y/8dqF+WBV1F uw4R6QOlAvYeE4OavNHJ/Ajs4Fe4VVLG9+dNvpBtA382SZSHJE/XOB6VxV+FL7jmrM+M FlWiJtlcDfynl1szIJ6mMawwDhA/pJ2Qv63F1Ds7RAsxNWQzOR5KkSGGTBrkFLo+YhGz g+1UcHJUku/AdiJs3F6ZPSdbuLA6SKgXPAq9cLwOHMbJ1hzCWFA9hAkH0k7Er9kYHq+0 NEcu897Ht8ivdQT1u7jbAl1HJKOYtjiZXil6A+Ns8xasb2hHmCUYFv5AVhtkI8xwakcd o1tg== 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=vNXwL1Vmvy6gRlkIM0ym8VMaudelNbiYK08V5ksvWu8=; b=EyPya2kWoBeL2lb9Kda5LZ9qxiu+wiAZWluQrF6B9i6ciz2HkAFulXDnYoxUfyK0mQ I5lW2JLUopDjHA+CAwbwsPKfEoGJWLyTyq9Ykp5BvtWoBT/fSnb/HQ8NOf1sQ7kmAKji XOZCAT2QJk2jSEFXHt9t+9SyiAZBTaDQEb6XfMVNntfWUwTAak14VN4xRZW5pH6bdOp9 8u8R9tJpdR/UUB01spWmM9KXpUehLafycDjnpKuL+8o0f51OFffVabqeiS2aHJG/9ZFN UWVeA5dM+Q6jykrWmOs7e6F+3L35zdykr4DEz7u2AuV95lEk6DywixlSa+lZym497Kg0 9O6w== X-Gm-Message-State: ALoCoQmlAdVc6MpWK1A6g12LDHEDUxcllyypM5vOyEFfWUKEa4s1bINTm+erdqrqS3pzXc/xk5q6 X-Received: by 10.68.143.40 with SMTP id sb8mr31005130pbb.29.1448303660839; Mon, 23 Nov 2015 10:34:20 -0800 (PST) Received: from t430.cg.shawcable.net ([184.64.168.246]) by smtp.gmail.com with ESMTPSA id r20sm10865186pfa.93.2015.11.23.10.34.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 23 Nov 2015 10:34:20 -0800 (PST) From: Mathieu Poirier To: gregkh@linuxfoundation.org, a.p.zijlstra@chello.nl, alexander.shishkin@linux.intel.com, acme@kernel.org, mingo@redhat.com, corbet@lwn.net, nicolas.pitre@linaro.org Cc: zhang.chunyan@linaro.org, mike.leach@arm.com, tor@ti.com, al.grant@arm.com, pawel.moll@arm.com, fainelli@broadcom.com, linux-arm-kernel@lists.infradead.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [RESEND PATCH V4 14/26] coresight: etm3x: adding perf_get/set_config() API Date: Mon, 23 Nov 2015 11:33:06 -0700 Message-Id: <1448303598-11249-15-git-send-email-mathieu.poirier@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1448303598-11249-1-git-send-email-mathieu.poirier@linaro.org> References: <1448303598-11249-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 Adding a source operation to build a tracer's configuration from a perf_event. That way possibly complex parsing of the information conveyed by the event doesn't have to be carried out every time the configuration is needed. Since event configuration can change between concurrent sessions, the possibility of associating a tracer with a configuration is also provided. As such Perf can assign session configuration to tracers as it see fit. Signed-off-by: Mathieu Poirier --- drivers/hwtracing/coresight/Kconfig | 1 + drivers/hwtracing/coresight/coresight-etm3x.c | 62 +++++++++++++++++++++++++++ include/linux/coresight.h | 7 ++- 3 files changed, 69 insertions(+), 1 deletion(-) -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ diff --git a/drivers/hwtracing/coresight/Kconfig b/drivers/hwtracing/coresight/Kconfig index 6c8921140f02..e252dd1522e5 100644 --- a/drivers/hwtracing/coresight/Kconfig +++ b/drivers/hwtracing/coresight/Kconfig @@ -4,6 +4,7 @@ menuconfig CORESIGHT bool "CoreSight Tracing Support" select ARM_AMBA + select PERF_EVENTS help This framework provides a kernel interface for the CoreSight debug and trace drivers to register themselves with. It's intended to build diff --git a/drivers/hwtracing/coresight/coresight-etm3x.c b/drivers/hwtracing/coresight/coresight-etm3x.c index a83c67d13b21..dd319ef0f1ac 100644 --- a/drivers/hwtracing/coresight/coresight-etm3x.c +++ b/drivers/hwtracing/coresight/coresight-etm3x.c @@ -31,6 +31,7 @@ #include #include #include +#include #include #include "coresight-etm.h" @@ -315,6 +316,40 @@ void etm_config_trace_mode(struct etm_drvdata *drvdata, config->addr_type[1] = ETM_ADDR_TYPE_RANGE; } +#define ETM3X_SUPPORTED_OPTIONS (ETMCR_CYC_ACC | ETMCR_TIMESTAMP_EN) + +static int etm_parse_event_config(struct etm_drvdata *drvdata, + struct etm_config *config, + struct perf_event *event) +{ + u32 mode = 0; + u64 event_config = event->attr.config; + + if (event->attr.exclude_kernel) + mode = ETM_MODE_EXCL_KERN; + + if (event->attr.exclude_user) + mode = ETM_MODE_EXCL_USER; + + /* + * By default the tracers are configured to trace the whole address + * range. Narrow the field only if requested by user space. + */ + if (mode) + etm_config_trace_mode(drvdata, config, mode); + + /* + * At this time only cycle accurate and timestamp options are + * available. + */ + if (event_config & ~ETM3X_SUPPORTED_OPTIONS) + return -EINVAL; + + config->ctrl = event_config; + + return 0; +} + static void etm_enable_hw(void *info) { int i; @@ -428,6 +463,31 @@ static int etm_trace_id(struct coresight_device *csdev) return etm_get_trace_id(drvdata); } +static void *etm_get_config(struct coresight_device *csdev, + struct perf_event *event) +{ + struct etm_config *config = NULL; + struct etm_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent); + + config = kzalloc(sizeof(struct etm_config), GFP_KERNEL); + if (!config) + return config; + + etm_set_default(config); + + if (etm_parse_event_config(drvdata, config, event)) + return ERR_PTR(-EINVAL); + + return config; +} + +static void etm_set_config(struct coresight_device *csdev, void *config) +{ + struct etm_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent); + + drvdata->config = config; +} + static int etm_enable_sysfs(struct coresight_device *csdev) { struct etm_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent); @@ -568,6 +628,8 @@ static void etm_disable(struct coresight_device *csdev) static const struct coresight_ops_source etm_source_ops = { .cpu_id = etm_cpu_id, .trace_id = etm_trace_id, + .get_config = etm_get_config, + .set_config = etm_set_config, .enable = etm_enable, .disable = etm_disable, }; diff --git a/include/linux/coresight.h b/include/linux/coresight.h index 61dfb8d511ea..f2148bc2bcfe 100644 --- a/include/linux/coresight.h +++ b/include/linux/coresight.h @@ -206,13 +206,18 @@ struct coresight_ops_link { * @cpu_id: returns the value of the CPU number this component * is associated to. * @trace_id: returns the value of the component's trace ID as known - to the HW. + * to the HW. + * @get_config: builds the ETM configuration after events' specifics. + * @set_config: associate a tracer with a configuration. * @enable: enables tracing for a source. * @disable: disables tracing for a source. */ struct coresight_ops_source { int (*cpu_id)(struct coresight_device *csdev); int (*trace_id)(struct coresight_device *csdev); + void *(*get_config)(struct coresight_device *csdev, + struct perf_event *event); + void (*set_config)(struct coresight_device *csdev, void *config); int (*enable)(struct coresight_device *csdev, u32 mode); void (*disable)(struct coresight_device *csdev); };