github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-09-23 13:14:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

coresight: etm4x: missing cscfg_csdev_disable_active_config() in perf enable

Browse Source 
In the perf enable path, there are missing cases where
cscfg_csdev_disable_active_config() is not called:

  - Branch broadcast is selected but not supported by the hardware
  - etm4_enable_hw() fails

This can lead to a leak of config_desc->active_cnt.
Fix this by properly calling cscfg_csdev_disable_active_config()
in these error paths.

Fixes: 810ac401db ("coresight: etm4x: Add complex configuration handlers to etmv4")
Suggested-by: Leo Yan <leo.yan@arm.com>
Signed-off-by: Yeoreum Yun <yeoreum.yun@arm.com>
Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com>
Link: https://lore.kernel.org/r/20260725113645.57519-6-yeoreum.yun@arm.com
This commit is contained in:
Yeoreum Yun 2026-07-25 12:36:37 +01:00 committed by Suzuki K Poulose
parent 467e5862cc
commit 0a47f0be65
1 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
drivers/hwtracing/coresight/coresight-etm4x-core.c
View File

@ -757,8 +757,7 @@ static int etm4_parse_event_config(struct coresight_device *csdev,
.ATTR_CFG_FLD_timestamp_CFG = U64_MAX,
};
struct perf_event_attr *attr = &event->attr;
unsigned long cfg_hash;
int preset, cc_threshold;
int cc_threshold;
u8 ts_level;
/* Clear configuration from previous run */
@ -844,16 +843,6 @@ static int etm4_parse_event_config(struct coresight_device *csdev,
/* bit[12], Return stack enable bit */
config->cfg |= TRCCONFIGR_RS;
/*
* Set any selected configuration and preset. A zero configid means no
* configuration active, preset = 0 means no preset selected.
*/
cfg_hash = ATTR_CFG_GET_FLD(attr, configid);
if (cfg_hash) {
preset = ATTR_CFG_GET_FLD(attr, preset);
ret = cscfg_csdev_enable_active_config(csdev, cfg_hash, preset);
}
/* branch broadcast - enable if selected and supported */
if (ATTR_CFG_GET_FLD(attr, branch_broadcast)) {
if (!drvdata->trcbb) {
@ -877,7 +866,9 @@ static int etm4_enable_perf(struct coresight_device *csdev,
struct coresight_path *path)
{
struct etmv4_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent);
int ret;
struct perf_event_attr *attr = &event->attr;
unsigned long cfg_hash;
int ret, preset;
if (WARN_ON_ONCE(drvdata->cpu != smp_processor_id()))
return -EINVAL;
@ -888,7 +879,19 @@ static int etm4_enable_perf(struct coresight_device *csdev,
/* Configure the tracer based on the session's specifics */
ret = etm4_parse_event_config(csdev, event);
if (ret)
goto out;
goto err;
/*
* Set any selected configuration and preset. A zero configid means no
* configuration active, preset = 0 means no preset selected.
*/
cfg_hash = ATTR_CFG_GET_FLD(attr, configid);
if (cfg_hash) {
preset = ATTR_CFG_GET_FLD(attr, preset);
ret = cscfg_csdev_enable_active_config(csdev, cfg_hash, preset);
if (ret)
goto err;
}
drvdata->trcid = path->trace_id;
@ -897,16 +900,19 @@ static int etm4_enable_perf(struct coresight_device *csdev,
/* And enable it */
ret = etm4_enable_hw(drvdata);
out:
/* Failed to start tracer; roll back to DISABLED mode */
if (ret) {
coresight_set_mode(csdev, CS_MODE_DISABLED);
return ret;
if (cfg_hash)
cscfg_csdev_disable_active_config(csdev);
goto err;
}
csdev->path = path;
return 0;
err:
/* Failed to start tracer; roll back to DISABLED mode */
coresight_set_mode(csdev, CS_MODE_DISABLED);
return ret;
}
static int etm4_enable_sysfs(struct coresight_device *csdev, struct coresight_path *path)