Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35;
Message-ID: <bb2db7bf-a1cb-c109-80f5-7e7be23c8b95@linux.intel.com>
Date:   Tue, 26 Sep 2023 12:36:35 -0400
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101
 Thunderbird/102.15.1
Subject: Re: [RFC PATCH 23/25] perf stat: Fix a return error issue in
 hardware-grouping
Content-Language: en-US
To:     weilin.wang@intel.com, Ian Rogers <irogers@google.com>,
        Peter Zijlstra <peterz@infradead.org>,
        Ingo Molnar <mingo@redhat.com>,
        Arnaldo Carvalho de Melo <acme@kernel.org>,
        Alexander Shishkin <alexander.shishkin@linux.intel.com>,
        Jiri Olsa <jolsa@kernel.org>,
        Namhyung Kim <namhyung@kernel.org>,
        Adrian Hunter <adrian.hunter@intel.com>
Cc:     linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org,
        Perry Taylor <perry.taylor@intel.com>,
        Samantha Alt <samantha.alt@intel.com>,
        Caleb Biggers <caleb.biggers@intel.com>,
        Mark Rutland <mark.rutland@arm.com>
References: <20230925061824.3818631-1-weilin.wang@intel.com>
 <20230925061824.3818631-24-weilin.wang@intel.com>
From:   "Liang, Kan" <kan.liang@linux.intel.com>
In-Reply-To: <20230925061824.3818631-24-weilin.wang@intel.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Precedence: bulk


On 2023-09-25 2:18 a.m., weilin.wang@intel.com wrote:
> From: Weilin Wang <weilin.wang@intel.com>
> 
> Update the hw_aware_parse_ids() goto to improve error handling.
> 

Seems like a bug fix. Please merge it with the patch which introduces
the issue.

Thanks,
Kan
> Signed-off-by: Weilin Wang <weilin.wang@intel.com>
> ---
>  tools/perf/util/metricgroup.c | 9 +++++----
>  1 file changed, 5 insertions(+), 4 deletions(-)
> 
> diff --git a/tools/perf/util/metricgroup.c b/tools/perf/util/metricgroup.c
> index 07a82fa21..6a4404226 100644
> --- a/tools/perf/util/metricgroup.c
> +++ b/tools/perf/util/metricgroup.c
> @@ -2196,11 +2196,11 @@ static int hw_aware_parse_ids(struct perf_pmu *fake_pmu,
>  	*out_evlist = NULL;
>  	ret = hw_aware_build_grouping(ids, &grouping);
>  	if (ret)
> -		goto err_out;
> +		goto out;
>  	ret = hw_aware_metricgroup__build_event_string(&grouping_str, modifier,
>  						      tool_events, &grouping);
>  	if (ret)
> -		goto err_out;
> +		goto out;
>  
>  	parsed_evlist = evlist__new();
>  	if (!parsed_evlist) {
> @@ -2225,10 +2225,11 @@ static int hw_aware_parse_ids(struct perf_pmu *fake_pmu,
>  	*out_evlist = parsed_evlist;
>  	parsed_evlist = NULL;
>  err_out:
> -	metricgroup__free_group_list(&grouping);
> -	metricgroup__free_grouping_strs(&grouping_str);
>  	parse_events_error__exit(&parse_error);
>  	evlist__delete(parsed_evlist);
> +out:
> +	metricgroup__free_group_list(&grouping);
> +	metricgroup__free_grouping_strs(&grouping_str);
>  	return ret;
>  }
>