2023-04-25 03:41:14

by Ruidong Tian

Subject: [PATCH] coresight: perf: Release Coresight path when alloc trace id failed

Error handler for etm_setup_aux can not release coresight path because
cpu mask was cleared when coresight_trace_id_get_cpu_id failed.

Call coresight_release_path function explicitly when alloc trace id filed.

Signed-off-by: Ruidong Tian <[email protected]>
---
drivers/hwtracing/coresight/coresight-etm-perf.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/drivers/hwtracing/coresight/coresight-etm-perf.c b/drivers/hwtracing/coresight/coresight-etm-perf.c
index 711f451b6946..89e8ed214ea4 100644
--- a/drivers/hwtracing/coresight/coresight-etm-perf.c
+++ b/drivers/hwtracing/coresight/coresight-etm-perf.c
@@ -402,6 +402,7 @@ static void *etm_setup_aux(struct perf_event *event, void **pages,
trace_id = coresight_trace_id_get_cpu_id(cpu);
if (!IS_VALID_CS_TRACE_ID(trace_id)) {
cpumask_clear_cpu(cpu, mask);
+ coresight_release_path(path);
continue;
}

--
2.33.1

2023-04-25 09:21:09

by Suzuki K Poulose

Subject: Re: [PATCH] coresight: perf: Release Coresight path when alloc trace id failed

On 25/04/2023 04:24, Ruidong Tian wrote:
> Error handler for etm_setup_aux can not release coresight path because
> cpu mask was cleared when coresight_trace_id_get_cpu_id failed.
>
> Call coresight_release_path function explicitly when alloc trace id filed.
>
> Signed-off-by: Ruidong Tian <[email protected]>

Good catch, I will queue this.

Thanks
Suzuki

> ---
> drivers/hwtracing/coresight/coresight-etm-perf.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/hwtracing/coresight/coresight-etm-perf.c b/drivers/hwtracing/coresight/coresight-etm-perf.c
> index 711f451b6946..89e8ed214ea4 100644
> --- a/drivers/hwtracing/coresight/coresight-etm-perf.c
> +++ b/drivers/hwtracing/coresight/coresight-etm-perf.c
> @@ -402,6 +402,7 @@ static void *etm_setup_aux(struct perf_event *event, void **pages,
> trace_id = coresight_trace_id_get_cpu_id(cpu);
> if (!IS_VALID_CS_TRACE_ID(trace_id)) {
> cpumask_clear_cpu(cpu, mask);
> + coresight_release_path(path);
> continue;
> }
>