Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4;
MIME-Version: 1.0
References: <20231127220902.1315692-1-irogers@google.com> <20231127220902.1315692-17-irogers@google.com>
 <CAM9d7cgj4Wj+0ZFQ3XfG12kkp4ThE4RT1+g=A1aSOinCXM9w+Q@mail.gmail.com>
In-Reply-To: <CAM9d7cgj4Wj+0ZFQ3XfG12kkp4ThE4RT1+g=A1aSOinCXM9w+Q@mail.gmail.com>
From:   Ian Rogers <irogers@google.com>
Date:   Wed, 6 Dec 2023 15:28:58 -0800
Message-ID: <CAP-5=fX2FFsF5C2DAZq1YrmDQFDq1fknCZ1kkpiQQyK1RpUscQ@mail.gmail.com>
Subject: Re: [PATCH v5 16/50] perf maps: Add remove maps function to remove a
 map based on callback
To:     Namhyung Kim <namhyung@kernel.org>
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>,
        Nick Terrell <terrelln@fb.com>,
        Kan Liang <kan.liang@linux.intel.com>,
        Andi Kleen <ak@linux.intel.com>,
        Kajol Jain <kjain@linux.ibm.com>,
        Athira Rajeev <atrajeev@linux.vnet.ibm.com>,
        Huacai Chen <chenhuacai@kernel.org>,
        Masami Hiramatsu <mhiramat@kernel.org>,
        Vincent Whitchurch <vincent.whitchurch@axis.com>,
        "Steinar H. Gunderson" <sesse@google.com>,
        Liam Howlett <liam.howlett@oracle.com>,
        Miguel Ojeda <ojeda@kernel.org>,
        Colin Ian King <colin.i.king@gmail.com>,
        Dmitrii Dolgov <9erthalion6@gmail.com>,
        Yang Jihong <yangjihong1@huawei.com>,
        Ming Wang <wangming01@loongson.cn>,
        James Clark <james.clark@arm.com>,
        K Prateek Nayak <kprateek.nayak@amd.com>,
        Sean Christopherson <seanjc@google.com>,
        Leo Yan <leo.yan@linaro.org>,
        Ravi Bangoria <ravi.bangoria@amd.com>,
        German Gomez <german.gomez@arm.com>,
        Changbin Du <changbin.du@huawei.com>,
        Paolo Bonzini <pbonzini@redhat.com>, Li Dong <lidong@vivo.com>,
        Sandipan Das <sandipan.das@amd.com>,
        liuwenyu <liuwenyu7@huawei.com>, linux-kernel@vger.kernel.org,
        linux-perf-users@vger.kernel.org,
        Guilherme Amadio <amadio@gentoo.org>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

On Mon, Dec 4, 2023 at 3:50=E2=80=AFPM Namhyung Kim <namhyung@kernel.org> w=
rote:
>
> On Mon, Nov 27, 2023 at 2:10=E2=80=AFPM Ian Rogers <irogers@google.com> w=
rote:
> >
> > Removing maps wasn't being done under the write lock. Similar to
> > maps__for_each_map, iterate the entries but in this case remove the
> > entry based on the result of the callback. If an entry was removed
> > then maps_by_name also needs updating, so add missed flush.
> >
> > In dso__load_kcore, the test of map to save would always be false with
> > REFCNT_CHECKING because of a missing RC_CHK_ACCESS.
> >
> > Signed-off-by: Ian Rogers <irogers@google.com>
>
> Acked-by: Namhyung Kim <namhyung@kernel.org>
>
> A nitpick below,
>
> > ---
> [SNIP]
> > diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c
> > index 72f03b875478..30da8a405d11 100644
> > --- a/tools/perf/util/symbol.c
> > +++ b/tools/perf/util/symbol.c
> > @@ -1239,13 +1239,23 @@ static int kcore_mapfn(u64 start, u64 len, u64 =
pgoff, void *data)
> >         return 0;
> >  }
> >
> > +static bool remove_old_maps(struct map *map, void *data)
> > +{
> > +       const struct map *map_to_save =3D data;
> > +
> > +       /*
> > +        * We need to preserve eBPF maps even if they are covered by kc=
ore,
> > +        * because we need to access eBPF dso for source data.
> > +        */
> > +       return RC_CHK_ACCESS(map) !=3D RC_CHK_ACCESS(map_to_save) && !_=
_map__is_bpf_prog(map);
>
> RC_CHK_EQUAL(map, map_to_save) ?

Done in v6.

Thanks,
Ian

> Thanks,
> Namhyung
>
>
> > +}
> > +
> >  static int dso__load_kcore(struct dso *dso, struct map *map,
> >                            const char *kallsyms_filename)
> >  {
> >         struct maps *kmaps =3D map__kmaps(map);
> >         struct kcore_mapfn_data md;
> >         struct map *replacement_map =3D NULL;
> > -       struct map_rb_node *old_node, *next;
> >         struct machine *machine;
> >         bool is_64_bit;
> >         int err, fd;
> > @@ -1292,17 +1302,7 @@ static int dso__load_kcore(struct dso *dso, stru=
ct map *map,
> >         }
> >
> >         /* Remove old maps */
> > -       maps__for_each_entry_safe(kmaps, old_node, next) {
> > -               struct map *old_map =3D old_node->map;
> > -
> > -               /*
> > -                * We need to preserve eBPF maps even if they are
> > -                * covered by kcore, because we need to access
> > -                * eBPF dso for source data.
> > -                */
> > -               if (old_map !=3D map && !__map__is_bpf_prog(old_map))
> > -                       maps__remove(kmaps, old_map);
> > -       }
> > +       maps__remove_maps(kmaps, remove_old_maps, map);
> >         machine->trampolines_mapped =3D false;
> >
> >         /* Find the kernel map using the '_stext' symbol */
> > --
> > 2.43.0.rc1.413.gea7ed67945-goog
> >