From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C8CBEC7619A for ; Wed, 5 Apr 2023 13:25:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238058AbjDENZR (ORCPT ); Wed, 5 Apr 2023 09:25:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40010 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238074AbjDENZQ (ORCPT ); Wed, 5 Apr 2023 09:25:16 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D525F46B0; Wed, 5 Apr 2023 06:25:10 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 54E9062665; Wed, 5 Apr 2023 13:25:10 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5922EC433EF; Wed, 5 Apr 2023 13:25:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1680701109; bh=9/CRT5dAHqbJL43zAPLWpSF2r6dXnm7Bj54C26pxSPc=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=L9CjF6TEK3BJ+x68a4Zs+oo11fSzT5nGAvSicFKiVDHI+4/N8KaZQq3g3M4Q5I0iW DgVgauloSnDA6KXu3x6RW0+8c+z2NzmZQlJCKN3n+x3VreRLgYHiqNxwA9bG9oj/Yt ubS7eVn+eq6bMWA6H+Y6EO/4OIxkKLULO7NGEw8uIl8Ceusq77zyf3euCVSnAGPfeg uHJTq07xbmvxPcb9UlGanPu1D4UaPChyp4GXqfoFANhrvFQ64crZypHD5uRvhqWQxZ VQe+Wco5p3sPsWfcq2AU84ya9CGuBhMeNlcN+46ccuqb3cd8kLBS8iHl0WHIcdv/SB YRwA20A4XfiXw== Received: by quaco.ghostprotocols.net (Postfix, from userid 1000) id E6E3B4052D; Wed, 5 Apr 2023 10:25:06 -0300 (-03) Date: Wed, 5 Apr 2023 10:25:06 -0300 From: Arnaldo Carvalho de Melo To: Ian Rogers Cc: Peter Zijlstra , Ingo Molnar , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Thomas Gleixner , Darren Hart , Davidlohr Bueso , James Clark , John Garry , Riccardo Mancini , Yury Norov , Andy Shevchenko , Andrew Morton , Adrian Hunter , Leo Yan , Andi Kleen , Thomas Richter , Kan Liang , Madhavan Srinivasan , Shunsuke Nakamura , Song Liu , Masami Hiramatsu , Steven Rostedt , Miaoqian Lin , Stephen Brennan , Kajol Jain , Alexey Bayduraev , German Gomez , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, Eric Dumazet , Dmitry Vyukov , Hao Luo , Stephane Eranian Subject: Re: [PATCH v6 01/12] perf map: Rename map_ip and unmap_ip Message-ID: References: <20230404205954.2245628-1-irogers@google.com> <20230404205954.2245628-2-irogers@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230404205954.2245628-2-irogers@google.com> X-Url: http://acmel.wordpress.com Precedence: bulk List-ID: X-Mailing-List: linux-perf-users@vger.kernel.org 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 > --- > 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()? - 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