[PATCH v10 08/24] coresight: etm: perf: Fix warning caused by etm_setup_aux failure

Mathieu Poirier mathieu.poirier at linaro.org
Thu Sep 10 18:28:40 EDT 2020


On Fri, Aug 21, 2020 at 11:44:29AM +0800, Tingwei Zhang wrote:
> When coresight_build_path() fails on all the cpus, etm_setup_aux
> calls etm_free_aux() to free allocated event_data.
> WARN_ON(cpumask_empty(mask) will be triggered since cpu mask is empty.
> Check event_data->snk_config is not NULL first to avoid this
> warning.
> 
> Signed-off-by: Tingwei Zhang <tingwei at codeaurora.org>
> Reviewed-by: Mike Leach <mike.leach at linaro.org>
> Reviewed-by: Suzuki K Poulose <suzuki.poulose at arm.com>
> Reviewed-by: Mathieu Poirier <mathieu.poirier at linaro.org>

What happend to the Fixed tag that was in V8?  This is casting doubts on the
reset of this set.  

> ---
>  drivers/hwtracing/coresight/coresight-etm-perf.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/hwtracing/coresight/coresight-etm-perf.c b/drivers/hwtracing/coresight/coresight-etm-perf.c
> index dcb0592418ae..3728c44e5763 100644
> --- a/drivers/hwtracing/coresight/coresight-etm-perf.c
> +++ b/drivers/hwtracing/coresight/coresight-etm-perf.c
> @@ -126,10 +126,10 @@ static void free_sink_buffer(struct etm_event_data *event_data)
>  	cpumask_t *mask = &event_data->mask;
>  	struct coresight_device *sink;
>  
> -	if (WARN_ON(cpumask_empty(mask)))
> +	if (!event_data->snk_config)
>  		return;
>  
> -	if (!event_data->snk_config)
> +	if (WARN_ON(cpumask_empty(mask)))
>  		return;
>  
>  	cpu = cpumask_first(mask);
> -- 
> The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
> a Linux Foundation Collaborative Project
> 



More information about the linux-arm-kernel mailing list