From: Suzuki K Poulose <suzuki.poulose@arm.com>
To: Mike Leach <mike.leach@linaro.org>,
coresight@lists.linaro.org, linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Cc: mathieu.poirier@linaro.org, peterz@infradead.org,
mingo@redhat.com, acme@kernel.org,
linux-perf-users@vger.kernel.org, leo.yan@linaro.org,
quic_jinlmao@quicinc.com
Subject: Re: [PATCH v5 05/14] coresight: etm4x: Update ETM4 driver to use Trace ID API
Date: Tue, 8 Nov 2022 22:24:28 +0000 [thread overview]
Message-ID: <ce50327b-d42c-713f-2529-74eac8d1e5b9@arm.com> (raw)
In-Reply-To: <20221101163103.17921-6-mike.leach@linaro.org>
On 01/11/2022 16:30, Mike Leach wrote:
> The trace ID API is now used to allocate trace IDs for ETM4.x / ETE
> devices.
>
> For perf sessions, these will be allocated on enable, and released on
> disable.
>
> For sysfs sessions, these will be allocated on enable, but only released
> on reset. This allows the sysfs session to interrogate the Trace ID used
> after the session is over - maintaining functional consistency with the
> previous allocation scheme.
>
> The trace ID will also be allocated on read of the mgmt/trctraceid file.
> This ensures that if perf or sysfs read this before enabling trace, the
> value will be the one used for the trace session.
>
> Trace ID initialisation is removed from the _probe() function.
>
> Signed-off-by: Mike Leach <mike.leach@linaro.org>
> ---
> .../coresight/coresight-etm4x-core.c | 70 +++++++++++++++++--
> .../coresight/coresight-etm4x-sysfs.c | 27 ++++++-
> drivers/hwtracing/coresight/coresight-etm4x.h | 3 +
> 3 files changed, 90 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/hwtracing/coresight/coresight-etm4x-core.c b/drivers/hwtracing/coresight/coresight-etm4x-core.c
> index 80fefaba58ee..0e361d35c611 100644
> --- a/drivers/hwtracing/coresight/coresight-etm4x-core.c
> +++ b/drivers/hwtracing/coresight/coresight-etm4x-core.c
> @@ -42,6 +42,7 @@
> #include "coresight-etm4x-cfg.h"
> #include "coresight-self-hosted-trace.h"
> #include "coresight-syscfg.h"
> +#include "coresight-trace-id.h"
>
> static int boot_enable;
> module_param(boot_enable, int, 0444);
> @@ -234,6 +235,30 @@ static int etm4_trace_id(struct coresight_device *csdev)
> return drvdata->trcid;
> }
>
> +int etm4_read_alloc_trace_id(struct etmv4_drvdata *drvdata)
> +{
> + int trace_id;
> +
> + /*
> + * This will allocate a trace ID to the cpu,
> + * or return the one currently allocated.
> + * The trace id function has its own lock
> + */
> + trace_id = coresight_trace_id_get_cpu_id(drvdata->cpu);
> + if (IS_VALID_ID(trace_id))
> + drvdata->trcid = (u8)trace_id;
> + else
> + dev_err(&drvdata->csdev->dev,
> + "Failed to allocate trace ID for %s on CPU%d\n",
> + dev_name(&drvdata->csdev->dev), drvdata->cpu);
> + return trace_id;
> +}
> +
> +void etm4_release_trace_id(struct etmv4_drvdata *drvdata)
> +{
> + coresight_trace_id_put_cpu_id(drvdata->cpu);
> +}
> +
> struct etm4_enable_arg {
> struct etmv4_drvdata *drvdata;
> int rc;
> @@ -717,7 +742,7 @@ static int etm4_parse_event_config(struct coresight_device *csdev,
> static int etm4_enable_perf(struct coresight_device *csdev,
> struct perf_event *event)
> {
> - int ret = 0;
> + int ret = 0, trace_id;
> struct etmv4_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent);
>
> if (WARN_ON_ONCE(drvdata->cpu != smp_processor_id())) {
> @@ -729,6 +754,24 @@ static int etm4_enable_perf(struct coresight_device *csdev,
> ret = etm4_parse_event_config(csdev, event);
> if (ret)
> goto out;
> +
> + /*
> + * perf allocates cpu ids as part of _setup_aux() - device needs to use
> + * the allocated ID. This reads the current version without allocation.
> + *
> + * This does not use the trace id lock to prevent lock_dep issues
> + * with perf locks - we know the ID cannot change until perf shuts down
> + * the session
> + */
> + trace_id = coresight_trace_id_read_cpu_id(drvdata->cpu);
> + if (!IS_VALID_ID(trace_id)) {
> + dev_err(&drvdata->csdev->dev, "Failed to set trace ID for %s on CPU%d\n",
> + dev_name(&drvdata->csdev->dev), drvdata->cpu);
> + ret = -EINVAL;
> + goto out;
> + }
> + drvdata->trcid = (u8)trace_id;
> +
> /* And enable it */
> ret = etm4_enable_hw(drvdata);
>
> @@ -753,6 +796,11 @@ static int etm4_enable_sysfs(struct coresight_device *csdev)
>
> spin_lock(&drvdata->spinlock);
>
> + /* sysfs needs to read and allocate a trace ID */
> + ret = etm4_read_alloc_trace_id(drvdata);
> + if (ret < 0)
> + goto unlock_sysfs_enable;
> +
> /*
> * Executing etm4_enable_hw on the cpu whose ETM is being enabled
> * ensures that register writes occur when cpu is powered.
> @@ -764,6 +812,11 @@ static int etm4_enable_sysfs(struct coresight_device *csdev)
> ret = arg.rc;
> if (!ret)
> drvdata->sticky_enable = true;
> +
> + if (ret)
> + etm4_release_trace_id(drvdata);
> +
> +unlock_sysfs_enable:
> spin_unlock(&drvdata->spinlock);
>
> if (!ret)
> @@ -895,6 +948,8 @@ static int etm4_disable_perf(struct coresight_device *csdev,
> /* TRCVICTLR::SSSTATUS, bit[9] */
> filters->ssstatus = (control & BIT(9));
>
> + /* perf will release trace ids when _free_aux() is called at the end of the session */
minor nit: Please split this to multi-line.
With that:
Reviewed-by: Suzuki K Poulose <suzuki.poulose@arm.com>
next prev parent reply other threads:[~2022-11-08 22:28 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-01 16:30 [PATCH v5 00/14] coresight: Add new API to allocate trace source ID values Mike Leach
2022-11-01 16:30 ` [PATCH v5 01/14] coresight: trace-id: Add API to dynamically assign Trace " Mike Leach
2022-11-08 14:03 ` Suzuki K Poulose
2022-11-22 9:28 ` Mike Leach
2022-11-08 19:14 ` Suzuki K Poulose
2022-11-01 16:30 ` [PATCH v5 02/14] coresight: Remove obsolete Trace ID unniqueness checks Mike Leach
2022-11-01 16:30 ` [PATCH v5 03/14] coresight: perf: traceid: Add perf ID allocation and notifiers Mike Leach
2022-11-08 15:04 ` Suzuki Kuruppassery Poulose
2022-11-01 16:30 ` [PATCH v5 04/14] coresight: stm: Update STM driver to use Trace ID API Mike Leach
2022-11-01 16:30 ` [PATCH v5 05/14] coresight: etm4x: Update ETM4 " Mike Leach
2022-11-08 22:24 ` Suzuki K Poulose [this message]
2022-11-01 16:30 ` [PATCH v5 06/14] coresight: etm3x: Update ETM3 " Mike Leach
2022-11-08 22:25 ` Suzuki K Poulose
2022-11-01 16:30 ` [PATCH v5 07/14] coresight: etmX.X: stm: Remove trace_id() callback Mike Leach
2022-11-01 16:30 ` [PATCH v5 08/14] coresight: trace id: Remove legacy get trace ID function Mike Leach
2022-11-08 17:06 ` Suzuki Kuruppassery Poulose
2022-11-01 16:30 ` [PATCH v5 09/14] perf: cs-etm: Move mapping of Trace ID and cpu into helper function Mike Leach
2022-11-08 23:31 ` Suzuki K Poulose
2022-11-01 16:30 ` [PATCH v5 10/14] perf: cs-etm: Update record event to use new Trace ID protocol Mike Leach
2022-11-08 23:31 ` Suzuki K Poulose
2022-11-01 16:31 ` [PATCH v5 11/14] kernel: events: Export perf_report_aux_output_id() Mike Leach
2022-11-01 16:31 ` [PATCH v5 12/14] perf: cs-etm: Handle PERF_RECORD_AUX_OUTPUT_HW_ID packet Mike Leach
2022-11-09 12:00 ` Suzuki Kuruppassery Poulose
2022-11-01 16:31 ` [PATCH v5 13/14] coresight: events: PERF_RECORD_AUX_OUTPUT_HW_ID used for Trace ID Mike Leach
2022-11-08 22:49 ` Suzuki K Poulose
2022-11-01 16:31 ` [PATCH v5 14/14] coresight: trace-id: Add debug & test macros to Trace ID allocation Mike Leach
2022-11-09 12:07 ` Suzuki Kuruppassery Poulose
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=ce50327b-d42c-713f-2529-74eac8d1e5b9@arm.com \
--to=suzuki.poulose@arm.com \
--cc=acme@kernel.org \
--cc=coresight@lists.linaro.org \
--cc=leo.yan@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=mathieu.poirier@linaro.org \
--cc=mike.leach@linaro.org \
--cc=mingo@redhat.com \
--cc=peterz@infradead.org \
--cc=quic_jinlmao@quicinc.com \
/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®