Re: [PATCH 1/2] perf inject: Call dso__put() even if dso->hit is set

[Jiri Olsa]

On Mon, May 24, 2021 at 03:50:50PM -0700, Namhyung Kim wrote:
> Otherwise it'll leak the refcount for the DSO.  As dso__put() can
> handle a NULL dso pointer, we can just call it unconditionally.
> 
> Signed-off-by: Namhyung Kim <namhyung@xxxxxxxxxx>

for the patchset

Acked-by: Jiri Olsa <jolsa@xxxxxxxxxx>

thanks,
jirka

> ---
>  tools/perf/builtin-inject.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/tools/perf/builtin-inject.c b/tools/perf/builtin-inject.c
> index 102cafb0c0b3..8bbaa46eb7e6 100644
> --- a/tools/perf/builtin-inject.c
> +++ b/tools/perf/builtin-inject.c
> @@ -383,8 +383,8 @@ static int perf_event__repipe_buildid_mmap(struct perf_tool *tool,
>  	if (dso && !dso->hit) {
>  		dso->hit = 1;
>  		dso__inject_build_id(dso, tool, machine, sample->cpumode, 0);
> -		dso__put(dso);
>  	}
> +	dso__put(dso);
>  
>  	return perf_event__repipe(tool, event, sample, machine);
>  }
> @@ -447,8 +447,8 @@ static int perf_event__repipe_buildid_mmap2(struct perf_tool *tool,
>  		dso->hit = 1;
>  		dso__inject_build_id(dso, tool, machine, sample->cpumode,
>  				     event->mmap2.flags);
> -		dso__put(dso);
>  	}
> +	dso__put(dso);
>  
>  	perf_event__repipe(tool, event, sample, machine);
>  
> -- 
> 2.31.1.818.g46aad6cb9e-goog
>