From patchwork Mon Nov 23 18:33:12 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 57184 Delivered-To: patch@linaro.org Received: by 10.112.155.196 with SMTP id vy4csp1603443lbb; Mon, 23 Nov 2015 10:36:36 -0800 (PST) X-Received: by 10.98.70.138 with SMTP id o10mr17799751pfi.17.1448303796324; Mon, 23 Nov 2015 10:36:36 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f5si21015098pat.158.2015.11.23.10.36.36; Mon, 23 Nov 2015 10:36:36 -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 S1755318AbbKWSge (ORCPT + 28 others); Mon, 23 Nov 2015 13:36:34 -0500 Received: from mail-pa0-f41.google.com ([209.85.220.41]:36108 "EHLO mail-pa0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755037AbbKWSec (ORCPT ); Mon, 23 Nov 2015 13:34:32 -0500 Received: by pacdm15 with SMTP id dm15so198929987pac.3 for ; Mon, 23 Nov 2015 10:34:31 -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=wfk2rhRaQawDLn0s96uBkDcvVTU4DHolyUDtN+gM8As=; b=lJ54atC+Tkze14a00MYj/TSTu8HNQV3T6FywLDgXlco//fLhVTIOhQFuHqMe3JFFNC XNYw7mdBtDQRdttXFNCeH4z/j6uic7rK+kNsuz7taYhMQfjcYCCcB91Tb4IMS78VJTkz Bzv5tso9UMJAIB+oX+2GNRFkG9VTOK6wH1ThBza4B/rAeOY55XP6mDeahosm0qlyX1+w B8WCDme906/5hKmFmlLuDc2JDijHnmHeCP1xcSMDwXzRP/jDyq59BVihUoaz0Nh5gd9n eE0psVpnGEuOJGdVBaveU7egtCq3MVdPk2UrZawZJajTlj0WiRfzaqHP+JKsxd7BWvKm hCjw== 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=wfk2rhRaQawDLn0s96uBkDcvVTU4DHolyUDtN+gM8As=; b=KdRU5LTls7n/e9F3cqVvV3yUBMHuyK3kcWlH5r33cjOanTJKaEasz6XAKUk7ZdRHXD 9L9s+f26sb4yvixuoDiLmnt5f1czbBOfIfoMX+2ZyLBXxhhmGXiOWSxBw+qye88L79nm WIPrLF3nBTxF0w1WBiStQGFlZOHo/zf6DzKLuSkKehWCETnqbDIKiVVJLdCoY0baoslu aRboANz0XtDG/tdG6pKsULx7LE9rwEgJwdBD7yOl+6NunuvacgtsaOx1vjW9wvFrrSUp /6vperFL2dQS+WxxlyoTpVIkkWIynIejgiXXzECHhxi216kOTRzt1VPeSHx5NSd+vAj+ +RRQ== X-Gm-Message-State: ALoCoQlO3TvNs652NB67JFyc7+ZPJ9nZcCGM11+vS4T0jDEbOi2bjw569H7IB4mvDYOaYZrAqC+0 X-Received: by 10.66.235.231 with SMTP id up7mr37712891pac.87.1448303671335; Mon, 23 Nov 2015 10:34:31 -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.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 23 Nov 2015 10:34:30 -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 20/26] coresight: etm-perf: new PMU driver for ETM tracers Date: Mon, 23 Nov 2015 11:33:12 -0700 Message-Id: <1448303598-11249-21-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 Perf is a well known and used tool for performance monitoring and much more. A such it is an ideal candidate for integration with coresight based HW tracing. This patch introduces a PMU that represent a coresight tracer to the Perf core. Signed-off-by: Mathieu Poirier --- drivers/hwtracing/coresight/Makefile | 3 +- drivers/hwtracing/coresight/coresight-etm-perf.c | 438 +++++++++++++++++++++++ drivers/hwtracing/coresight/coresight-etm-perf.h | 32 ++ drivers/hwtracing/coresight/coresight-etm3x.c | 7 + include/linux/coresight-pmu.h | 27 ++ 5 files changed, 506 insertions(+), 1 deletion(-) create mode 100644 drivers/hwtracing/coresight/coresight-etm-perf.c create mode 100644 drivers/hwtracing/coresight/coresight-etm-perf.h create mode 100644 include/linux/coresight-pmu.h -- 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/Makefile b/drivers/hwtracing/coresight/Makefile index 233d66cf22d3..cf8c6d689747 100644 --- a/drivers/hwtracing/coresight/Makefile +++ b/drivers/hwtracing/coresight/Makefile @@ -9,6 +9,7 @@ obj-$(CONFIG_CORESIGHT_SINK_ETBV10) += coresight-etb10.o obj-$(CONFIG_CORESIGHT_LINKS_AND_SINKS) += coresight-funnel.o \ coresight-replicator.o obj-$(CONFIG_CORESIGHT_SOURCE_ETM3X) += coresight-etm3x.o coresight-etm-cp14.o \ - coresight-etm3x-sysfs.o + coresight-etm3x-sysfs.o \ + coresight-etm-perf.o obj-$(CONFIG_CORESIGHT_SOURCE_ETM4X) += coresight-etm4x.o obj-$(CONFIG_CORESIGHT_QCOM_REPLICATOR) += coresight-replicator-qcom.o diff --git a/drivers/hwtracing/coresight/coresight-etm-perf.c b/drivers/hwtracing/coresight/coresight-etm-perf.c new file mode 100644 index 000000000000..590d9b132e6c --- /dev/null +++ b/drivers/hwtracing/coresight/coresight-etm-perf.c @@ -0,0 +1,438 @@ +/* + * Copyright(C) 2015 Linaro Limited. All rights reserved. + * Author: Mathieu Poirier + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 as published by + * the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along with + * this program. If not, see . + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "coresight-priv.h" + +static struct pmu etm_pmu; +static bool etm_perf_up; + +/** + * struct etm_event_data - Coresight specifics associated to an event + * @mask: hold the CPU(s) this event was set for. + * @source_config: per CPU tracer configuration associated to a + * trace session. + * @sink_config: per CPU AUX configuration associated to a + * trace session. + * @path: the path, from source (first element) to + * sink (last element). + */ +struct etm_event_data { + cpumask_t mask; + void **source_config; + void **sink_config; + struct list_head **path; +}; + +static DEFINE_PER_CPU(struct perf_output_handle, ctx_handle); +static DEFINE_PER_CPU(struct coresight_device *, csdev_src); + +/* ETMv3.5/PTM's ETMCR is 'config' */ +PMU_FORMAT_ATTR(cycacc, "config:" __stringify(ETM_OPT_CYCACC)); +PMU_FORMAT_ATTR(timestamp, "config:" __stringify(ETM_OPT_TS)); + +static struct attribute *etm_config_formats_attr[] = { + &format_attr_cycacc.attr, + &format_attr_timestamp.attr, + NULL, +}; + +static struct attribute_group etm_pmu_format_group = { + .name = "format", + .attrs = etm_config_formats_attr, +}; + +static const struct attribute_group *etm_pmu_attr_groups[] = { + &etm_pmu_format_group, + NULL, +}; + +static void etm_event_read(struct perf_event *event) {} +static void etm_event_destroy(struct perf_event *event) {} + +static int etm_event_init(struct perf_event *event) +{ + if (event->attr.type != etm_pmu.type) + return -ENOENT; + + if (event->cpu >= nr_cpu_ids) + return -EINVAL; + + event->destroy = etm_event_destroy; + + return 0; +} + +static void *alloc_event_data(int cpu) +{ + int size; + struct etm_event_data *event_data; + void *source_config, *sink_config; + struct list_head *path; + + event_data = kzalloc(sizeof(struct etm_event_data), GFP_KERNEL); + if (!event_data) + return NULL; + + if (cpu != -1) + size = 1; + else + size = num_online_cpus(); + + source_config = kcalloc(size, sizeof(void *), GFP_KERNEL); + if (!source_config) + goto source_config_err; + + sink_config = kcalloc(size, sizeof(void *), GFP_KERNEL); + if (!sink_config) + goto sink_config_err; + + path = kcalloc(size, sizeof(struct list_head *), GFP_KERNEL); + if (!path) + goto path_err; + + cpumask_clear(&event_data->mask); + event_data->source_config = source_config; + event_data->sink_config = sink_config; + event_data->path = (struct list_head **)path; + +out: + return event_data; + +path_err: + kfree(sink_config); +sink_config_err: + kfree(source_config); +source_config_err: + kfree(event_data); + event_data = NULL; + goto out; +} + +static void free_event_data(struct etm_event_data *event_data) +{ + int cpu; + cpumask_t *mask = &event_data->mask; + + for_each_cpu(cpu, mask) { + kfree(event_data->source_config[cpu]); + kfree(event_data->sink_config[cpu]); + kfree(event_data->path[cpu]); + } + + kfree(event_data->source_config); + kfree(event_data->sink_config); + kfree(event_data->path); + kfree(event_data); +} + +static void *etm_setup_aux(struct perf_event *event, void **pages, + int nr_pages, bool overwrite) +{ + int cpu; + cpumask_t *mask, initialised; + struct etm_event_data *event_data = NULL; + struct coresight_device *csdev; + + event_data = alloc_event_data(event->cpu); + if (!event_data) + return NULL; + + mask = &event_data->mask; + + if (event->cpu != -1) + cpumask_set_cpu(event->cpu, mask); + else + cpumask_copy(mask, cpu_online_mask); + + cpumask_clear(&initialised); + for_each_cpu(cpu, mask) { + struct coresight_device *sink; + + csdev = per_cpu(csdev_src, cpu); + if (!csdev) + goto err; + + /* Get the tracer's config from perf */ + if (!source_ops(csdev)->get_config) + goto err; + + event_data->source_config[cpu] = + source_ops(csdev)->get_config(csdev, event); + + if (!event_data->source_config[cpu]) + goto err; + + /* + * Building a path doesn't enable it, it simply builds a + * 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); + if (!event_data->path[cpu]) + goto err; + + /* + * Remember which paths have been initialised so that they + * can be undone in case of errors. + */ + cpumask_set_cpu(cpu, &initialised); + + /* Grab the sink at the end of the path */ + sink = coresight_get_sink(event_data->path[cpu]); + if (!sink) + goto err; + + if (!sink_ops(sink)->setup_aux) + goto err; + + /* Finally get the AUX specific data from the sink buffer */ + event_data->sink_config[cpu] = + sink_ops(sink)->setup_aux(sink, cpu, pages, + nr_pages, overwrite); + if (!event_data->sink_config[cpu]) + goto err; + } + +out: + return event_data; + +err: + for_each_cpu(cpu, &initialised) + coresight_release_path(event_data->path[cpu]); + + free_event_data(event_data); + event_data = NULL; + goto out; +} + +static void etm_free_aux(void *data) +{ + free_event_data(data); +} + +static void etm_event_stop(struct perf_event *event, int mode) +{ + int cpu = smp_processor_id(); + struct coresight_device *csdev = per_cpu(csdev_src, cpu); + + if (event->hw.state == PERF_HES_STOPPED) + return; + + if (!csdev) + return; + + /* stop tracer */ + source_ops(csdev)->disable(csdev); + + /* tell the core */ + event->hw.state = PERF_HES_STOPPED; + + + if (mode & PERF_EF_UPDATE) { + struct coresight_device *sink; + struct perf_output_handle *handle = this_cpu_ptr(&ctx_handle); + struct etm_event_data *event_data = perf_get_aux(handle); + + if (WARN_ON_ONCE(handle->event != event)) + return; + + if (WARN_ON_ONCE(!event_data)) + return; + + sink = coresight_get_sink(event_data->path[cpu]); + if (WARN_ON_ONCE(!sink)) + return; + + /* update trace information */ + if (!sink_ops(sink)->update_buffer) + return; + + sink_ops(sink)->update_buffer(sink, handle, + event_data->sink_config[cpu]); + } +} + +static void etm_event_start(struct perf_event *event, int flags) +{ + int cpu = smp_processor_id(); + struct coresight_device *csdev = per_cpu(csdev_src, cpu); + + if (!csdev) + goto fail; + + /* tell the perf core the event is alive */ + event->hw.state = 0; + + if (source_ops(csdev)->enable(csdev, CS_MODE_PERF)) + goto fail; + + return; + +fail: + event->hw.state = PERF_HES_STOPPED; +} + +static void etm_event_del(struct perf_event *event, int mode) +{ + bool lost = true; + int cpu = smp_processor_id(); + unsigned long size; + struct coresight_device *sink; + struct perf_output_handle *handle = this_cpu_ptr(&ctx_handle); + struct etm_event_data *event_data = perf_get_aux(handle); + + if (WARN_ON_ONCE(!event_data)) + return; + + etm_event_stop(event, PERF_EF_UPDATE); + + sink = coresight_get_sink(event_data->path[cpu]); + if (!sink) + return; + + if (!sink_ops(sink)->reset_buffer) + return; + + size = sink_ops(sink)->reset_buffer(sink, handle, + event_data->sink_config[cpu], + &lost); + + perf_aux_output_end(handle, size, lost); + + coresight_disable_path(event_data->path[cpu]); +} + +static int etm_event_add(struct perf_event *event, int mode) +{ + + int ret = -EBUSY, cpu = smp_processor_id(); + struct etm_event_data *event_data; + struct perf_output_handle *handle = this_cpu_ptr(&ctx_handle); + struct hw_perf_event *hwc = &event->hw; + struct coresight_device *csdev = per_cpu(csdev_src, cpu); + struct coresight_device *sink; + + if (handle->event) + goto out; + + event_data = perf_aux_output_begin(handle, event); + ret = -EINVAL; + if (WARN_ON_ONCE(!event_data)) + goto fail_stop; + + sink = coresight_get_sink(event_data->path[cpu]); + if (!sink) + goto fail_end_stop; + + if (!sink_ops(sink)->set_buffer) + goto fail_end_stop; + + ret = sink_ops(sink)->set_buffer(sink, handle, + event_data->sink_config[cpu]); + + if (ret) + goto fail_end_stop; + + if (!source_ops(csdev)->set_config) { + ret = -EINVAL; + goto fail_end_stop; + } + + source_ops(csdev)->set_config(csdev, event_data->source_config[cpu]); + + ret = coresight_enable_path(event_data->path[cpu], CS_MODE_PERF); + if (ret) + goto fail_end_stop; + + if (mode & PERF_EF_START) { + etm_event_start(event, 0); + if (hwc->state & PERF_HES_STOPPED) { + etm_event_del(event, 0); + return -EBUSY; + } + } + +out: + return ret; + +fail_end_stop: + perf_aux_output_end(handle, 0, true); +fail_stop: + hwc->state = PERF_HES_STOPPED; + goto out; +} + +int etm_perf_symlink(struct coresight_device *csdev, bool link) +{ + char entry[sizeof("cpu9999999")]; + int ret = 0, cpu = source_ops(csdev)->cpu_id(csdev); + struct device *pmu_dev = etm_pmu.dev; + struct device *cs_dev = &csdev->dev; + + sprintf(entry, "cpu%d", cpu); + + if (!etm_perf_up) + return -EPROBE_DEFER; + + if (link) { + ret = sysfs_create_link(&pmu_dev->kobj, &cs_dev->kobj, entry); + if (ret) + return ret; + per_cpu(csdev_src, cpu) = csdev; + } else { + sysfs_remove_link(&pmu_dev->kobj, entry); + per_cpu(csdev_src, cpu) = NULL; + } + + return 0; +} + +static int __init etm_perf_init(void) +{ + int ret; + + etm_pmu.capabilities = PERF_PMU_CAP_EXCLUSIVE; + + etm_pmu.attr_groups = etm_pmu_attr_groups; + etm_pmu.task_ctx_nr = perf_sw_context; + etm_pmu.read = etm_event_read; + etm_pmu.event_init = etm_event_init; + etm_pmu.setup_aux = etm_setup_aux; + etm_pmu.free_aux = etm_free_aux; + etm_pmu.stop = etm_event_stop; + etm_pmu.start = etm_event_start; + etm_pmu.del = etm_event_del; + etm_pmu.add = etm_event_add; + + ret = perf_pmu_register(&etm_pmu, CORESIGHT_ETM_PMU_NAME, -1); + if (ret == 0) + etm_perf_up = true; + + return ret; +} +module_init(etm_perf_init); diff --git a/drivers/hwtracing/coresight/coresight-etm-perf.h b/drivers/hwtracing/coresight/coresight-etm-perf.h new file mode 100644 index 000000000000..87f5a134eb6f --- /dev/null +++ b/drivers/hwtracing/coresight/coresight-etm-perf.h @@ -0,0 +1,32 @@ +/* + * Copyright(C) 2015 Linaro Limited. All rights reserved. + * Author: Mathieu Poirier + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 as published by + * the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along with + * this program. If not, see . + */ + +#ifndef _CORESIGHT_ETM_PERF_H +#define _CORESIGHT_ETM_PERF_H + +struct coresight_device; + +#ifdef CONFIG_CORESIGHT +int etm_perf_symlink(struct coresight_device *csdev, bool link); + +#else +static inline int etm_perf_symlink(struct coresight_device *csdev, bool link) +{ return -EINVAL; } + +#endif /* CONFIG_CORESIGHT */ + +#endif diff --git a/drivers/hwtracing/coresight/coresight-etm3x.c b/drivers/hwtracing/coresight/coresight-etm3x.c index 4ff3e1419fde..c07b7d3eee86 100644 --- a/drivers/hwtracing/coresight/coresight-etm3x.c +++ b/drivers/hwtracing/coresight/coresight-etm3x.c @@ -35,6 +35,7 @@ #include #include "coresight-etm.h" +#include "coresight-etm-perf.h" static int boot_enable; module_param_named(boot_enable, boot_enable, int, S_IRUGO); @@ -870,6 +871,12 @@ static int etm_probe(struct amba_device *adev, const struct amba_id *id) goto err_arch_supported; } + ret = etm_perf_symlink(drvdata->csdev, true); + if (ret) { + coresight_unregister(drvdata->csdev); + goto err_arch_supported; + } + pm_runtime_put(&adev->dev); dev_info(dev, "%s initialized\n", (char *)id->data); diff --git a/include/linux/coresight-pmu.h b/include/linux/coresight-pmu.h new file mode 100644 index 000000000000..6c5386b23b10 --- /dev/null +++ b/include/linux/coresight-pmu.h @@ -0,0 +1,27 @@ +/* + * Copyright(C) 2015 Linaro Limited. All rights reserved. + * Author: Mathieu Poirier + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 as published by + * the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along with + * this program. If not, see . + */ + +#ifndef _LINUX_CORESIGHT_PMU_H +#define _LINUX_CORESIGHT_PMU_H + +#define CORESIGHT_ETM_PMU_NAME "cs_etm" + +/* ETMv3.5/PTM's ETMCR config bit */ +#define ETM_OPT_CYCACC 12 +#define ETM_OPT_TS 28 + +#endif