From: Mathieu Poirier <mathieu.poirier@linaro.org>
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: adrian.hunter@intel.com, 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, mathieu.poirier@linaro.org
Subject: [PATCH V3 14/26] coresight: etm3x: adding perf_get/set_config() API
Date: Wed, 11 Nov 2015 15:18:04 -0700 [thread overview]
Message-ID: <1447280296-19147-15-git-send-email-mathieu.poirier@linaro.org> (raw)
In-Reply-To: <1447280296-19147-1-git-send-email-mathieu.poirier@linaro.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 <mathieu.poirier@linaro.org>
---
drivers/hwtracing/coresight/Kconfig | 1 +
drivers/hwtracing/coresight/coresight-etm3x.c | 62 +++++++++++++++++++++++++++
include/linux/coresight.h | 7 ++-
3 files changed, 69 insertions(+), 1 deletion(-)
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 <linux/seq_file.h>
#include <linux/uaccess.h>
#include <linux/clk.h>
+#include <linux/perf_event.h>
#include <asm/sections.h>
#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);
};
--
1.9.1
next prev parent reply other threads:[~2015-11-11 22:24 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-11 22:17 [PATCH V3 00/26] Coresight integration with perf Mathieu Poirier
2015-11-11 22:17 ` [PATCH V3 01/26] coresight: etm3x: moving etm_readl/writel to header file Mathieu Poirier
2015-11-11 22:17 ` [PATCH V3 02/26] coresight: etm3x: moving sysFS entries to dedicated file Mathieu Poirier
2015-11-11 22:30 ` Arnd Bergmann
2015-11-13 16:17 ` Mathieu Poirier
2015-11-13 16:26 ` Arnd Bergmann
2015-11-11 22:17 ` [PATCH V3 03/26] coresight: etm3x: unlocking tracers in default arch init Mathieu Poirier
2015-11-11 22:17 ` [PATCH V3 04/26] coresight: etm3x: splitting struct etm_drvdata Mathieu Poirier
2015-11-11 22:17 ` [PATCH V3 05/26] coresight: etm3x: implementing 'cpu_id()' API Mathieu Poirier
2015-11-11 22:17 ` [PATCH V3 06/26] coresight: associating path with session rather than tracer Mathieu Poirier
2015-11-11 22:17 ` [PATCH V3 07/26] coresight: moving PM runtime operations to core framework Mathieu Poirier
2015-11-11 22:17 ` [PATCH V3 08/26] coresight: etm3x: adding operation mode for etm_enable() Mathieu Poirier
2015-11-11 22:17 ` [PATCH V3 09/26] coresight: add API to get sink from path Mathieu Poirier
2015-11-11 22:18 ` [PATCH V3 10/26] coresight: etm3x: set progbit to stop trace collection Mathieu Poirier
2015-11-11 22:18 ` [PATCH V3 11/26] coresight: etm3x: changing default trace configuration Mathieu Poirier
2015-11-11 22:18 ` [PATCH V3 12/26] coresight: etm3x: consolidating initial config Mathieu Poirier
2015-11-11 22:18 ` [PATCH V3 13/26] coresight: etm3x: implementing user/kernel mode tracing Mathieu Poirier
2015-11-11 22:18 ` Mathieu Poirier [this message]
2015-11-11 22:18 ` [PATCH V3 15/26] coresight: etm3x: implementing perf_enable/disable() API Mathieu Poirier
2015-11-11 22:18 ` [PATCH V3 16/26] perf: changing pmu::setup_aux() parameter to include event Mathieu Poirier
2015-11-11 22:18 ` [PATCH V3 17/26] coresight: etb10: moving to local atomic operations Mathieu Poirier
2015-11-11 22:18 ` [PATCH V3 18/26] coresight: adding operation mode for sink->enable() Mathieu Poirier
2015-11-11 22:18 ` [PATCH V3 19/26] coresight: etb10: implementing AUX space API Mathieu Poirier
2015-11-11 22:18 ` [PATCH V3 20/26] coresight: etm-perf: new PMU driver for ETM tracers Mathieu Poirier
2015-11-11 22:18 ` [PATCH V3 21/26] coresight: introducing a global trace ID function Mathieu Poirier
2015-11-11 22:18 ` [PATCH V3 22/26] coresight: updating documentation to reflect integration with perf Mathieu Poirier
2015-11-11 22:18 ` [PATCH V3 23/26] perf tools: making function set_max_cpu_num() non static Mathieu Poirier
2015-11-11 22:18 ` [PATCH V3 24/26] perf tools: adding perf_session to *info_prive_size() Mathieu Poirier
2015-11-11 22:18 ` [PATCH V3 25/26] perf tools: making coresight PMU listable Mathieu Poirier
2015-11-11 22:18 ` [PATCH V3 26/26] perf tools: adding coresight etm PMU record capabilities Mathieu Poirier
2015-11-12 10:53 ` [PATCH V3 00/26] Coresight integration with perf Alexander Shishkin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1447280296-19147-15-git-send-email-mathieu.poirier@linaro.org \
--to=mathieu.poirier@linaro.org \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@kernel.org \
--cc=adrian.hunter@intel.com \
--cc=al.grant@arm.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=corbet@lwn.net \
--cc=fainelli@broadcom.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mike.leach@arm.com \
--cc=mingo@redhat.com \
--cc=nicolas.pitre@linaro.org \
--cc=pawel.moll@arm.com \
--cc=tor@ti.com \
--cc=zhang.chunyan@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®