Received-SPF: pass (google.com: domain of linux-kernel+bounces-87813-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
Precedence: bulk
MIME-Version: 1.0
References: <20240229062048.558799-1-irogers@google.com>
In-Reply-To: <20240229062048.558799-1-irogers@google.com>
From: Namhyung Kim <namhyung@kernel.org>
Date: Thu, 29 Feb 2024 18:04:00 -0800
Message-ID: <CAM9d7cjCn-GFtjejw+DtK_Y6kNRGLQTAZNn6zarQfNDjvWHUXw@mail.gmail.com>
Subject: Re: [PATCH v1] perf map: Fix map reference count issues
To: Ian Rogers <irogers@google.com>
Cc: Peter Zijlstra <peterz@infradead.org>, Ingo Molnar <mingo@redhat.com>, 
	Arnaldo Carvalho de Melo <acme@kernel.org>, Mark Rutland <mark.rutland@arm.com>, 
	Alexander Shishkin <alexander.shishkin@linux.intel.com>, Jiri Olsa <jolsa@kernel.org>, 
	Adrian Hunter <adrian.hunter@intel.com>, Masami Hiramatsu <mhiramat@kernel.org>, 
	linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

On Wed, Feb 28, 2024 at 10:21=E2=80=AFPM Ian Rogers <irogers@google.com> wr=
ote:
>
> The find will get the map, ensure puts are done on all paths.
>
> Signed-off-by: Ian Rogers <irogers@google.com>

Acked-by: Namhyung Kim <namhyung@kernel.org>

Thanks,
Namhyung


> ---
>  tools/perf/util/maps.c        | 14 +++++++-------
>  tools/perf/util/probe-event.c |  4 +---
>  2 files changed, 8 insertions(+), 10 deletions(-)
>
> diff --git a/tools/perf/util/maps.c b/tools/perf/util/maps.c
> index 53aea6d2ef93..ce13145a9f8e 100644
> --- a/tools/perf/util/maps.c
> +++ b/tools/perf/util/maps.c
> @@ -611,14 +611,14 @@ struct symbol *maps__find_symbol(struct maps *maps,=
 u64 addr, struct map **mapp)
>         struct symbol *result =3D NULL;
>
>         /* Ensure map is loaded before using map->map_ip */
> -       if (map !=3D NULL && map__load(map) >=3D 0) {
> -               if (mapp)
> -                       *mapp =3D map;
> -
> +       if (map !=3D NULL && map__load(map) >=3D 0)
>                 result =3D map__find_symbol(map, map__map_ip(map, addr));
> -               if (!mapp)
> -                       map__put(map);
> -       }
> +
> +       if (mapp)
> +               *mapp =3D map;
> +       else
> +               map__put(map);
> +
>         return result;
>  }
>
> diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.=
c
> index be71abe8b9b0..2a0ad9ecf0a2 100644
> --- a/tools/perf/util/probe-event.c
> +++ b/tools/perf/util/probe-event.c
> @@ -2274,9 +2274,7 @@ static int find_perf_probe_point_from_map(struct pr=
obe_trace_point *tp,
>         ret =3D pp->function ? 0 : -ENOMEM;
>
>  out:
> -       if (map && !is_kprobe) {
> -               map__put(map);
> -       }
> +       map__put(map);
>
>         return ret;
>  }
> --
> 2.44.0.278.ge034bb2e1d-goog
>