From: Namhyung Kim <namhyung@kernel.org>
To: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Ian Rogers <irogers@google.com>, Jiri Olsa <jolsa@kernel.org>,
Adrian Hunter <adrian.hunter@intel.com>,
Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@kernel.org>,
LKML <linux-kernel@vger.kernel.org>,
linux-perf-users@vger.kernel.org,
Linus Torvalds <torvalds@linux-foundation.org>,
Stephane Eranian <eranian@google.com>,
Masami Hiramatsu <mhiramat@kernel.org>,
linux-toolchains@vger.kernel.org,
linux-trace-devel@vger.kernel.org
Subject: Re: [PATCH 01/23] perf dwarf-aux: Remove unused pc argument
Date: Tue, 19 Mar 2024 10:39:56 -0700 [thread overview]
Message-ID: <CAM9d7cgm_-zyiZpCVoKH2dfqEESO5ohZYHYRnnBFWxagDiMrqA@mail.gmail.com> (raw)
In-Reply-To: <ZfmWgbkApCMoeWHm@x1>
On Tue, Mar 19, 2024 at 6:43 AM Arnaldo Carvalho de Melo
<acme@kernel.org> wrote:
>
> On Mon, Mar 18, 2024 at 10:50:53PM -0700, Namhyung Kim wrote:
> > It's not used, let's get rid of it.
>
> I looked for data->pc, there is usage somewhere else, but not via
> __die_find_var_addr_cb() nor match_var_offset().
>
> I think renaming:
>
> struct find_var_data data;
>
> to:
>
> struct find_var_data var;
>
> And:
>
> struct find_scope_data data;
>
> to:
>
> struct find_scope_data scope;
>
> Helps with grepping for 'data->pc', but that can be left for later.
Ok, I can rename them later.
>
> Reviewed-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Thanks for the review!
Namhyung
>
> > Signed-off-by: Namhyung Kim <namhyung@kernel.org>
> > ---
> > tools/perf/util/annotate-data.c | 4 ++--
> > tools/perf/util/dwarf-aux.c | 7 ++-----
> > tools/perf/util/dwarf-aux.h | 6 ++----
> > 3 files changed, 6 insertions(+), 11 deletions(-)
> >
> > diff --git a/tools/perf/util/annotate-data.c b/tools/perf/util/annotate-data.c
> > index 30c4d19fcf11..59ce5f4f4a40 100644
> > --- a/tools/perf/util/annotate-data.c
> > +++ b/tools/perf/util/annotate-data.c
> > @@ -263,7 +263,7 @@ static int find_data_type_die(struct debuginfo *di, u64 pc, u64 addr,
> > offset = loc->offset;
> >
> > if (reg == DWARF_REG_PC) {
> > - if (die_find_variable_by_addr(&cu_die, pc, addr, &var_die, &offset)) {
> > + if (die_find_variable_by_addr(&cu_die, addr, &var_die, &offset)) {
> > ret = check_variable(&var_die, type_die, offset,
> > /*is_pointer=*/false);
> > loc->offset = offset;
> > @@ -312,7 +312,7 @@ static int find_data_type_die(struct debuginfo *di, u64 pc, u64 addr,
> > /* Search from the inner-most scope to the outer */
> > for (i = nr_scopes - 1; i >= 0; i--) {
> > if (reg == DWARF_REG_PC) {
> > - if (!die_find_variable_by_addr(&scopes[i], pc, addr,
> > + if (!die_find_variable_by_addr(&scopes[i], addr,
> > &var_die, &offset))
> > continue;
> > } else {
> > diff --git a/tools/perf/util/dwarf-aux.c b/tools/perf/util/dwarf-aux.c
> > index 2791126069b4..e84d0d6a7750 100644
> > --- a/tools/perf/util/dwarf-aux.c
> > +++ b/tools/perf/util/dwarf-aux.c
> > @@ -1456,7 +1456,6 @@ static int __die_find_var_addr_cb(Dwarf_Die *die_mem, void *arg)
> > /**
> > * die_find_variable_by_addr - Find variable located at given address
> > * @sc_die: a scope DIE
> > - * @pc: the program address to find
> > * @addr: the data address to find
> > * @die_mem: a buffer to save the resulting DIE
> > * @offset: the offset in the resulting type
> > @@ -1464,12 +1463,10 @@ static int __die_find_var_addr_cb(Dwarf_Die *die_mem, void *arg)
> > * Find the variable DIE located at the given address (in PC-relative mode).
> > * This is usually for global variables.
> > */
> > -Dwarf_Die *die_find_variable_by_addr(Dwarf_Die *sc_die, Dwarf_Addr pc,
> > - Dwarf_Addr addr, Dwarf_Die *die_mem,
> > - int *offset)
> > +Dwarf_Die *die_find_variable_by_addr(Dwarf_Die *sc_die, Dwarf_Addr addr,
> > + Dwarf_Die *die_mem, int *offset)
> > {
> > struct find_var_data data = {
> > - .pc = pc,
> > .addr = addr,
> > };
> > Dwarf_Die *result;
> > diff --git a/tools/perf/util/dwarf-aux.h b/tools/perf/util/dwarf-aux.h
> > index 85dd527ae1f7..9973801a20c1 100644
> > --- a/tools/perf/util/dwarf-aux.h
> > +++ b/tools/perf/util/dwarf-aux.h
> > @@ -146,9 +146,8 @@ Dwarf_Die *die_find_variable_by_reg(Dwarf_Die *sc_die, Dwarf_Addr pc, int reg,
> > Dwarf_Die *die_mem);
> >
> > /* Find a (global) variable located in the 'addr' */
> > -Dwarf_Die *die_find_variable_by_addr(Dwarf_Die *sc_die, Dwarf_Addr pc,
> > - Dwarf_Addr addr, Dwarf_Die *die_mem,
> > - int *offset);
> > +Dwarf_Die *die_find_variable_by_addr(Dwarf_Die *sc_die, Dwarf_Addr addr,
> > + Dwarf_Die *die_mem, int *offset);
> >
> > #else /* HAVE_DWARF_GETLOCATIONS_SUPPORT */
> >
> > @@ -170,7 +169,6 @@ static inline Dwarf_Die *die_find_variable_by_reg(Dwarf_Die *sc_die __maybe_unus
> > }
> >
> > static inline Dwarf_Die *die_find_variable_by_addr(Dwarf_Die *sc_die __maybe_unused,
> > - Dwarf_Addr pc __maybe_unused,
> > Dwarf_Addr addr __maybe_unused,
> > Dwarf_Die *die_mem __maybe_unused,
> > int *offset __maybe_unused)
> > --
> > 2.44.0.291.gc1ea87d7ee-goog
> >
next prev parent reply other threads:[~2024-03-19 17:40 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-19 5:50 [PATCHSET 00/23] Remaining bits of data type profiling (v7) Namhyung Kim
2024-03-19 5:50 ` [PATCH 01/23] perf dwarf-aux: Remove unused pc argument Namhyung Kim
2024-03-19 13:43 ` Arnaldo Carvalho de Melo
2024-03-19 17:39 ` Namhyung Kim [this message]
2024-03-19 5:50 ` [PATCH 02/23] perf dwarf-aux: Add die_collect_vars() Namhyung Kim
2024-03-19 13:45 ` Arnaldo Carvalho de Melo
2024-03-19 5:50 ` [PATCH 03/23] perf dwarf-aux: Handle type transfer for memory access Namhyung Kim
2024-03-19 13:55 ` Arnaldo Carvalho de Melo
2024-03-19 17:41 ` Namhyung Kim
2024-03-19 5:50 ` [PATCH 04/23] perf dwarf-aux: Add die_find_func_rettype() Namhyung Kim
2024-03-19 13:56 ` Arnaldo Carvalho de Melo
2024-03-19 17:42 ` Namhyung Kim
2024-03-19 18:19 ` Arnaldo Carvalho de Melo
2024-03-19 20:33 ` Namhyung Kim
2024-03-19 5:50 ` [PATCH 05/23] perf map: Add map__objdump_2rip() Namhyung Kim
2024-03-19 5:50 ` [PATCH 06/23] perf annotate-data: Introduce struct data_loc_info Namhyung Kim
2024-03-19 5:50 ` [PATCH 07/23] perf annotate: Add annotate_get_basic_blocks() Namhyung Kim
2024-03-19 5:51 ` [PATCH 08/23] perf annotate-data: Add debug messages Namhyung Kim
2024-03-19 14:05 ` Arnaldo Carvalho de Melo
2024-03-19 5:51 ` [PATCH 09/23] perf annotate-data: Maintain variable type info Namhyung Kim
2024-03-19 14:07 ` Arnaldo Carvalho de Melo
2024-03-19 17:44 ` Namhyung Kim
2024-03-19 18:12 ` Arnaldo Carvalho de Melo
2024-03-19 20:34 ` Namhyung Kim
2024-03-19 5:51 ` [PATCH 10/23] perf annotate-data: Add update_insn_state() Namhyung Kim
2024-03-19 5:51 ` [PATCH 11/23] perf annotate-data: Add get_global_var_type() Namhyung Kim
2024-03-19 5:51 ` [PATCH 12/23] perf annotate-data: Handle global variable access Namhyung Kim
2024-03-19 5:51 ` [PATCH 13/23] perf annotate-data: Handle call instructions Namhyung Kim
2024-03-19 5:51 ` [PATCH 14/23] perf annotate-data: Implement instruction tracking Namhyung Kim
2024-03-19 5:51 ` [PATCH 15/23] perf annotate-data: Check register state for type Namhyung Kim
2024-03-19 5:51 ` [PATCH 16/23] perf annotate: Parse x86 segment register location Namhyung Kim
2024-03-19 5:51 ` [PATCH 17/23] perf annotate-data: Handle this-cpu variables in kernel Namhyung Kim
2024-03-19 5:51 ` [PATCH 18/23] perf annotate-data: Track instructions with a this-cpu variable Namhyung Kim
2024-03-19 5:51 ` [PATCH 19/23] perf annotate-data: Support general per-cpu access Namhyung Kim
2024-03-19 5:51 ` [PATCH 20/23] perf annotate-data: Handle ADD instructions Namhyung Kim
2024-03-19 5:51 ` [PATCH 21/23] perf annotate-data: Add stack canary type Namhyung Kim
2024-03-19 5:51 ` [PATCH 22/23] perf annotate-data: Add a cache for global variable types Namhyung Kim
2024-03-19 18:05 ` Namhyung Kim
2024-03-19 18:07 ` Arnaldo Carvalho de Melo
2024-03-19 18:09 ` Arnaldo Carvalho de Melo
2024-03-19 18:09 ` Namhyung Kim
2024-03-19 5:51 ` [PATCH 23/23] perf annotate-data: Do not retry for invalid types Namhyung Kim
2024-03-19 14:17 ` [PATCHSET 00/23] Remaining bits of data type profiling (v7) Arnaldo Carvalho de Melo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAM9d7cgm_-zyiZpCVoKH2dfqEESO5ohZYHYRnnBFWxagDiMrqA@mail.gmail.com \
--to=namhyung@kernel.org \
--cc=acme@kernel.org \
--cc=adrian.hunter@intel.com \
--cc=eranian@google.com \
--cc=irogers@google.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=linux-toolchains@vger.kernel.org \
--cc=linux-trace-devel@vger.kernel.org \
--cc=mhiramat@kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).