Re: [PATCH V2 05/23] perf auxtrace: Do not mix up mmap idx

[Arnaldo Carvalho de Melo <acme@kernel.org>]

Em Fri, May 06, 2022 at 03:25:43PM +0300, Adrian Hunter escreveu:
> The idx is with respect to evlist not evsel. That hasn't mattered because
> they are the same at present. Prepare for that not being the case, which it
> won't be when sideband tracking events are allowed on all CPUs even when
> auxtrace is limited to selected CPUs.
> 
> Acked-by: Ian Rogers <irogers@google.com>
> Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>

Thanks, applied.

- Arnaldo

> ---
>  tools/perf/util/auxtrace.c | 10 ++++++++--
>  1 file changed, 8 insertions(+), 2 deletions(-)
> 
> diff --git a/tools/perf/util/auxtrace.c b/tools/perf/util/auxtrace.c
> index 10936a38031f..b11549ae39df 100644
> --- a/tools/perf/util/auxtrace.c
> +++ b/tools/perf/util/auxtrace.c
> @@ -640,8 +640,14 @@ static int evlist__enable_event_idx(struct evlist *evlist, struct evsel *evsel,
>  {
>  	bool per_cpu_mmaps = !perf_cpu_map__empty(evlist->core.user_requested_cpus);
>  
> -	if (per_cpu_mmaps)
> -		return perf_evsel__enable_cpu(&evsel->core, idx);
> +	if (per_cpu_mmaps) {
> +		struct perf_cpu evlist_cpu = perf_cpu_map__cpu(evlist->core.all_cpus, idx);
> +		int cpu_map_idx = perf_cpu_map__idx(evsel->core.cpus, evlist_cpu);
> +
> +		if (cpu_map_idx == -1)
> +			return -EINVAL;
> +		return perf_evsel__enable_cpu(&evsel->core, cpu_map_idx);
> +	}
>  
>  	return perf_evsel__enable_thread(&evsel->core, idx);
>  }
> -- 
> 2.25.1

-- 

- Arnaldo