Re: [PATCH v6 01/12] perf map: Rename map_ip and unmap_ip
From: Ian Rogers
Date: Thu Apr 06 2023 - 20:40:54 EST
On Wed, Apr 5, 2023 at 6:32 AM Arnaldo Carvalho de Melo <acme@xxxxxxxxxx> wrote:
>
> Em Wed, Apr 05, 2023 at 10:25:06AM -0300, Arnaldo Carvalho de Melo escreveu:
> > Em Tue, Apr 04, 2023 at 01:59:43PM -0700, Ian Rogers escreveu:
> > > Add dso to match comment. This avoids a naming conflict with later
> > > added accessor functions for variables in struct map.
> > >
> > > Signed-off-by: Ian Rogers <irogers@xxxxxxxxxx>
> > > ---
> > > tools/perf/builtin-kmem.c | 2 +-
> > > tools/perf/builtin-script.c | 4 ++--
> > > tools/perf/util/machine.c | 4 ++--
> > > tools/perf/util/map.c | 8 ++++----
> > > tools/perf/util/map.h | 4 ++--
> > > tools/perf/util/symbol-elf.c | 4 ++--
> > > 6 files changed, 13 insertions(+), 13 deletions(-)
> > >
> > > diff --git a/tools/perf/builtin-kmem.c b/tools/perf/builtin-kmem.c
> > > index f3029742b800..4d4b770a401c 100644
> > > --- a/tools/perf/builtin-kmem.c
> > > +++ b/tools/perf/builtin-kmem.c
> > > @@ -423,7 +423,7 @@ static u64 find_callsite(struct evsel *evsel, struct perf_sample *sample)
> > > if (!caller) {
> > > /* found */
> > > if (node->ms.map)
> > > - addr = map__unmap_ip(node->ms.map, node->ip);
> > > + addr = map__dso_unmap_ip(node->ms.map, node->ip);
> >
> > As we chatted, I think this is a good opportunity to make this more
> > clear, perhaps rename map__unmap_ip() to map__addr_offset_to_virt() and
> > map__map_ip() to map__addr_virt_to_offset()?
>
> Maybe prefix both with __, i.e. __map__addr_offset_to_virt() and __map__addr_virt_to_offset(), since
> then you need to wrap map->unmap_ip() to
> map__map__addr_offset_to_virt(), that in some cases will map to
> __map__addr_offset_to_virt(), modulo in identity maps, like with the
> kernel where we use identify__map_ip().
Thanks Arnaldo, I'm not following what you are asking here. As it is a
refactor unrelated to reference count checking, could you follow up
this patch set with it?
Ian
> - Arnaldo
>
> > - Arnaldo
> >
> > > else
> > > addr = node->ip;
> > >
> > > diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c
> > > index 1d078106abc4..af0a69c7f41f 100644
> > > --- a/tools/perf/builtin-script.c
> > > +++ b/tools/perf/builtin-script.c
> > > @@ -1012,11 +1012,11 @@ static int perf_sample__fprintf_brstackoff(struct perf_sample *sample,
> > >
> > > if (thread__find_map_fb(thread, sample->cpumode, from, &alf) &&
> > > !map__dso(alf.map)->adjust_symbols)
> > > - from = map__map_ip(alf.map, from);
> > > + from = map__dso_map_ip(alf.map, from);
> > >
> > > if (thread__find_map_fb(thread, sample->cpumode, to, &alt) &&
> > > !map__dso(alt.map)->adjust_symbols)
> > > - to = map__map_ip(alt.map, to);
> > > + to = map__dso_map_ip(alt.map, to);
> > >
> > > printed += fprintf(fp, " 0x%"PRIx64, from);
> > > if (PRINT_FIELD(DSO)) {
> > > diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c
> > > index 7852b97da10a..9d24980a0a93 100644
> > > --- a/tools/perf/util/machine.c
> > > +++ b/tools/perf/util/machine.c
> > > @@ -3058,7 +3058,7 @@ static int append_inlines(struct callchain_cursor *cursor, struct map_symbol *ms
> > > if (!symbol_conf.inline_name || !map || !sym)
> > > return ret;
> > >
> > > - addr = map__map_ip(map, ip);
> > > + addr = map__dso_map_ip(map, ip);
> > > addr = map__rip_2objdump(map, addr);
> > > dso = map__dso(map);
> > >
> > > @@ -3103,7 +3103,7 @@ static int unwind_entry(struct unwind_entry *entry, void *arg)
> > > * its corresponding binary.
> > > */
> > > if (entry->ms.map)
> > > - addr = map__map_ip(entry->ms.map, entry->ip);
> > > + addr = map__dso_map_ip(entry->ms.map, entry->ip);
> > >
> > > srcline = callchain_srcline(&entry->ms, addr);
> > > return callchain_cursor_append(cursor, entry->ip, &entry->ms,
> > > diff --git a/tools/perf/util/map.c b/tools/perf/util/map.c
> > > index 416fc449bde8..d97a6d20626f 100644
> > > --- a/tools/perf/util/map.c
> > > +++ b/tools/perf/util/map.c
> > > @@ -109,8 +109,8 @@ void map__init(struct map *map, u64 start, u64 end, u64 pgoff, struct dso *dso)
> > > map->pgoff = pgoff;
> > > map->reloc = 0;
> > > map->dso = dso__get(dso);
> > > - map->map_ip = map__map_ip;
> > > - map->unmap_ip = map__unmap_ip;
> > > + map->map_ip = map__dso_map_ip;
> > > + map->unmap_ip = map__dso_unmap_ip;
> > > map->erange_warned = false;
> > > refcount_set(&map->refcnt, 1);
> > > }
> > > @@ -590,12 +590,12 @@ struct maps *map__kmaps(struct map *map)
> > > return kmap->kmaps;
> > > }
> > >
> > > -u64 map__map_ip(const struct map *map, u64 ip)
> > > +u64 map__dso_map_ip(const struct map *map, u64 ip)
> > > {
> > > return ip - map__start(map) + map->pgoff;
> > > }
> > >
> > > -u64 map__unmap_ip(const struct map *map, u64 ip)
> > > +u64 map__dso_unmap_ip(const struct map *map, u64 ip)
> > > {
> > > return ip + map__start(map) - map->pgoff;
> > > }
> > > diff --git a/tools/perf/util/map.h b/tools/perf/util/map.h
> > > index 16646b94fa3a..9b0a84e46e48 100644
> > > --- a/tools/perf/util/map.h
> > > +++ b/tools/perf/util/map.h
> > > @@ -41,9 +41,9 @@ struct kmap *map__kmap(struct map *map);
> > > struct maps *map__kmaps(struct map *map);
> > >
> > > /* ip -> dso rip */
> > > -u64 map__map_ip(const struct map *map, u64 ip);
> > > +u64 map__dso_map_ip(const struct map *map, u64 ip);
> > > /* dso rip -> ip */
> > > -u64 map__unmap_ip(const struct map *map, u64 ip);
> > > +u64 map__dso_unmap_ip(const struct map *map, u64 ip);
> > > /* Returns ip */
> > > u64 identity__map_ip(const struct map *map __maybe_unused, u64 ip);
> > >
> > > diff --git a/tools/perf/util/symbol-elf.c b/tools/perf/util/symbol-elf.c
> > > index e715869eab8a..c55981116f68 100644
> > > --- a/tools/perf/util/symbol-elf.c
> > > +++ b/tools/perf/util/symbol-elf.c
> > > @@ -1357,8 +1357,8 @@ static int dso__process_kernel_symbol(struct dso *dso, struct map *map,
> > > map->start = shdr->sh_addr + ref_reloc(kmap);
> > > map->end = map__start(map) + shdr->sh_size;
> > > map->pgoff = shdr->sh_offset;
> > > - map->map_ip = map__map_ip;
> > > - map->unmap_ip = map__unmap_ip;
> > > + map->map_ip = map__dso_map_ip;
> > > + map->unmap_ip = map__dso_unmap_ip;
> > > /* Ensure maps are correctly ordered */
> > > if (kmaps) {
> > > int err;
> > > --
> > > 2.40.0.348.gf938b09366-goog
> > >
> >
> > --
> >
> > - Arnaldo
>
> --
>
> - Arnaldo