1. Patchew
  2. linux
  3. View series

[PATCH] perf auxtrace: Avoid redundant NULL check in auxtrace_mmap_params__set_idx()

Gautam Menghani posted 1 patch 2 months ago 
tools/perf/util/auxtrace.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
[PATCH] perf auxtrace: Avoid redundant NULL check in auxtrace_mmap_params__set_idx()
Posted by Gautam Menghani 2 months ago 
Since commit eead8a011477 ("libperf threadmap: Don't segv for index 0 for the
NULL 'struct perf_thread_map' pointer"), perf_thread_map__pid() can
check for a NULL map and return -1 if idx is 0. Cleanup
auxtrace_mmap_params__set_idx() and remove the redundant NULL check.

No functional change intended.

Signed-off-by: Gautam Menghani <gautam@linux.ibm.com>
---
 tools/perf/util/auxtrace.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/tools/perf/util/auxtrace.c b/tools/perf/util/auxtrace.c
index ebd32f1b8f12..5e437133c753 100644
--- a/tools/perf/util/auxtrace.c
+++ b/tools/perf/util/auxtrace.c
@@ -185,10 +185,7 @@ void auxtrace_mmap_params__set_idx(struct auxtrace_mmap_params *mp,
 
 	if (per_cpu) {
 		mp->cpu = perf_cpu_map__cpu(evlist->core.all_cpus, idx);
-		if (evlist->core.threads)
-			mp->tid = perf_thread_map__pid(evlist->core.threads, 0);
-		else
-			mp->tid = -1;
+		mp->tid = perf_thread_map__pid(evlist->core.threads, 0);
 	} else {
 		mp->cpu.cpu = -1;
 		mp->tid = perf_thread_map__pid(evlist->core.threads, idx);
-- 
2.49.0
Re: [PATCH] perf auxtrace: Avoid redundant NULL check in auxtrace_mmap_params__set_idx()
Posted by Adrian Hunter 2 months ago 
On 04/08/2025 14:06, Gautam Menghani wrote:
> Since commit eead8a011477 ("libperf threadmap: Don't segv for index 0 for the
> NULL 'struct perf_thread_map' pointer"), perf_thread_map__pid() can
> check for a NULL map and return -1 if idx is 0. Cleanup
> auxtrace_mmap_params__set_idx() and remove the redundant NULL check.
> 
> No functional change intended.
> 
> Signed-off-by: Gautam Menghani <gautam@linux.ibm.com>

Reviewed-by: Adrian Hunter <adrian.hunter@intel.com>

> ---
>  tools/perf/util/auxtrace.c | 5 +----
>  1 file changed, 1 insertion(+), 4 deletions(-)
> 
> diff --git a/tools/perf/util/auxtrace.c b/tools/perf/util/auxtrace.c
> index ebd32f1b8f12..5e437133c753 100644
> --- a/tools/perf/util/auxtrace.c
> +++ b/tools/perf/util/auxtrace.c
> @@ -185,10 +185,7 @@ void auxtrace_mmap_params__set_idx(struct auxtrace_mmap_params *mp,
>  
>  	if (per_cpu) {
>  		mp->cpu = perf_cpu_map__cpu(evlist->core.all_cpus, idx);
> -		if (evlist->core.threads)
> -			mp->tid = perf_thread_map__pid(evlist->core.threads, 0);
> -		else
> -			mp->tid = -1;
> +		mp->tid = perf_thread_map__pid(evlist->core.threads, 0);
>  	} else {
>  		mp->cpu.cpu = -1;
>  		mp->tid = perf_thread_map__pid(evlist->core.threads, idx);
Re: [PATCH] perf auxtrace: Avoid redundant NULL check in auxtrace_mmap_params__set_idx()
Posted by Arnaldo Carvalho de Melo 3 weeks, 1 day ago 
On Mon, Aug 04, 2025 at 03:08:33PM +0300, Adrian Hunter wrote:
> On 04/08/2025 14:06, Gautam Menghani wrote:
> > Since commit eead8a011477 ("libperf threadmap: Don't segv for index 0 for the
> > NULL 'struct perf_thread_map' pointer"), perf_thread_map__pid() can
> > check for a NULL map and return -1 if idx is 0. Cleanup
> > auxtrace_mmap_params__set_idx() and remove the redundant NULL check.
> > 
> > No functional change intended.
> > 
> > Signed-off-by: Gautam Menghani <gautam@linux.ibm.com>
> 
> Reviewed-by: Adrian Hunter <adrian.hunter@intel.com>

Thanks, applied to perf-tools-next,

- Arnaldo
 
> > ---
> >  tools/perf/util/auxtrace.c | 5 +----
> >  1 file changed, 1 insertion(+), 4 deletions(-)
> > 
> > diff --git a/tools/perf/util/auxtrace.c b/tools/perf/util/auxtrace.c
> > index ebd32f1b8f12..5e437133c753 100644
> > --- a/tools/perf/util/auxtrace.c
> > +++ b/tools/perf/util/auxtrace.c
> > @@ -185,10 +185,7 @@ void auxtrace_mmap_params__set_idx(struct auxtrace_mmap_params *mp,
> >  
> >  	if (per_cpu) {
> >  		mp->cpu = perf_cpu_map__cpu(evlist->core.all_cpus, idx);
> > -		if (evlist->core.threads)
> > -			mp->tid = perf_thread_map__pid(evlist->core.threads, 0);
> > -		else
> > -			mp->tid = -1;
> > +		mp->tid = perf_thread_map__pid(evlist->core.threads, 0);
> >  	} else {
> >  		mp->cpu.cpu = -1;
> >  		mp->tid = perf_thread_map__pid(evlist->core.threads, idx);
Re: [PATCH] perf auxtrace: Avoid redundant NULL check in auxtrace_mmap_params__set_idx()
Posted by Aditya Bodkhe 1 month, 3 weeks ago 
On 04/08/25 4:36 pm, Gautam Menghani wrote:
> Since commit eead8a011477 ("libperf threadmap: Don't segv for index 0 for the
> NULL 'struct perf_thread_map' pointer"), perf_thread_map__pid() can
> check for a NULL map and return -1 if idx is 0. Cleanup
> auxtrace_mmap_params__set_idx() and remove the redundant NULL check.
>
> No functional change intended.
>
> Signed-off-by: Gautam Menghani <gautam@linux.ibm.com>
> ---
>   tools/perf/util/auxtrace.c | 5 +----
>   1 file changed, 1 insertion(+), 4 deletions(-)
>
> diff --git a/tools/perf/util/auxtrace.c b/tools/perf/util/auxtrace.c
> index ebd32f1b8f12..5e437133c753 100644
> --- a/tools/perf/util/auxtrace.c
> +++ b/tools/perf/util/auxtrace.c
> @@ -185,10 +185,7 @@ void auxtrace_mmap_params__set_idx(struct auxtrace_mmap_params *mp,
>   
>   	if (per_cpu) {
>   		mp->cpu = perf_cpu_map__cpu(evlist->core.all_cpus, idx);
> -		if (evlist->core.threads)
> -			mp->tid = perf_thread_map__pid(evlist->core.threads, 0);
> -		else
> -			mp->tid = -1;
> +		mp->tid = perf_thread_map__pid(evlist->core.threads, 0);
>   	} else {
>   		mp->cpu.cpu = -1;
>   		mp->tid = perf_thread_map__pid(evlist->core.threads, idx);

LGTM.

Reviewed-by: Aditya Bodkhe <adityab1@linux.ibm.com>
Re: [PATCH] perf auxtrace: Avoid redundant NULL check in auxtrace_mmap_params__set_idx()
Posted by Amit Machhiwal 1 month, 3 weeks ago 
On 2025/08/04 04:36 PM, Gautam Menghani wrote:
> Since commit eead8a011477 ("libperf threadmap: Don't segv for index 0 for the
> NULL 'struct perf_thread_map' pointer"), perf_thread_map__pid() can
> check for a NULL map and return -1 if idx is 0. Cleanup
> auxtrace_mmap_params__set_idx() and remove the redundant NULL check.
> 
> No functional change intended.
> 
> Signed-off-by: Gautam Menghani <gautam@linux.ibm.com>

LGTM.

Reviewed-by: Amit Machhiwal <amachhiw@linux.ibm.com>

Regards,
Amit

> ---
>  tools/perf/util/auxtrace.c | 5 +----
>  1 file changed, 1 insertion(+), 4 deletions(-)
> 
> diff --git a/tools/perf/util/auxtrace.c b/tools/perf/util/auxtrace.c
> index ebd32f1b8f12..5e437133c753 100644
> --- a/tools/perf/util/auxtrace.c
> +++ b/tools/perf/util/auxtrace.c
> @@ -185,10 +185,7 @@ void auxtrace_mmap_params__set_idx(struct auxtrace_mmap_params *mp,
>  
>  	if (per_cpu) {
>  		mp->cpu = perf_cpu_map__cpu(evlist->core.all_cpus, idx);
> -		if (evlist->core.threads)
> -			mp->tid = perf_thread_map__pid(evlist->core.threads, 0);
> -		else
> -			mp->tid = -1;
> +		mp->tid = perf_thread_map__pid(evlist->core.threads, 0);
>  	} else {
>  		mp->cpu.cpu = -1;
>  		mp->tid = perf_thread_map__pid(evlist->core.threads, idx);
> -- 
> 2.49.0
>

Patchew 2.1-devel-b67e4c2

© 2016 - 2025 Red Hat, Inc.