github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-30 01:53:29 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

coresight: tmc: Re-enable sink after buffer update

Browse Source 
The buffer update callbacks disable the sink before syncing data but
misses to re-enable it afterward.  This is fine in the general flow,
because the sink will be re-enabled the next time the PMU event is
activated.

However, during AUX pause and resume, if the sink is disabled in the
buffer update callback, there is no chance to re-enable it when AUX
resumes.

To address this, the callbacks now check the event state
'event->hw.state'.  If the event is an active state (0), the sink is
re-enabled.

For the TMC ETR driver, buffer updates are not fully protected by
the driver's spinlock.  In this case, the sink is not re-enabled if its
reference counter is 0, in order to avoid race conditions where the sink
may have been completely disabled.

Signed-off-by: Leo Yan <leo.yan@arm.com>
Reviewed-by: Mike Leach <mike.leach@linaro.org>
Reviewed-by: James Clark <james.clark@linaro.org>
Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com>
Link: https://lore.kernel.org/r/20250401180708.385396-6-leo.yan@arm.com
This commit is contained in:
Leo Yan 2025-04-01 19:07:06 +01:00 committed by Suzuki K Poulose
parent abffe22e93
commit d5f7e4bea9
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/hwtracing/coresight/coresight-tmc-etf.c
View File

@ -482,6 +482,7 @@ static unsigned long tmc_update_etf_buffer(struct coresight_device *csdev,
unsigned long offset, to_read = 0, flags;
struct cs_buffers *buf = sink_config;
struct tmc_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent);
struct perf_event *event = handle->event;
if (!buf)
return 0;
@ -586,6 +587,14 @@ static unsigned long tmc_update_etf_buffer(struct coresight_device *csdev,
* is expected by the perf ring buffer.
*/
CS_LOCK(drvdata->base);
/*
* If the event is active, it is triggered during an AUX pause.
* Re-enable the sink so that it is ready when AUX resume is invoked.
*/
if (!event->hw.state)
__tmc_etb_enable_hw(drvdata);
out:
raw_spin_unlock_irqrestore(&drvdata->spinlock, flags);

10
drivers/hwtracing/coresight/coresight-tmc-etr.c
View File

@ -1634,6 +1634,7 @@ tmc_update_etr_buffer(struct coresight_device *csdev,
struct tmc_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent);
struct etr_perf_buffer *etr_perf = config;
struct etr_buf *etr_buf = etr_perf->etr_buf;
struct perf_event *event = handle->event;
raw_spin_lock_irqsave(&drvdata->spinlock, flags);
@ -1703,6 +1704,15 @@ tmc_update_etr_buffer(struct coresight_device *csdev,
*/
smp_wmb();
/*
* If the event is active, it is triggered during an AUX pause.
* Re-enable the sink so that it is ready when AUX resume is invoked.
*/
raw_spin_lock_irqsave(&drvdata->spinlock, flags);
if (csdev->refcnt && !event->hw.state)
__tmc_etr_enable_hw(drvdata);
raw_spin_unlock_irqrestore(&drvdata->spinlock, flags);
out:
/*
* Don't set the TRUNCATED flag in snapshot mode because 1) the