From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Masami Hiramatsu <mhiramat@kernel.org>
Cc: James Clark <james.clark@arm.com>,
linux-perf-users@vger.kernel.org, leo.yan@linux.dev,
Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@redhat.com>,
Namhyung Kim <namhyung@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Jiri Olsa <jolsa@kernel.org>, Ian Rogers <irogers@google.com>,
Adrian Hunter <adrian.hunter@intel.com>,
"Liang, Kan" <kan.liang@linux.intel.com>,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] perf dwarf-aux: Fix build with HAVE_DWARF_CFI_SUPPORT
Date: Thu, 9 May 2024 18:21:55 -0300 [thread overview]
Message-ID: <Zj0-c7Ac0qHkuLNt@x1> (raw)
In-Reply-To: <20240509101136.5b0e0f2bf8df640fc2e65624@kernel.org>
On Thu, May 09, 2024 at 10:11:36AM +0900, Masami Hiramatsu wrote:
> On Wed, 8 May 2024 15:14:57 +0100
> James Clark <james.clark@arm.com> wrote:
>
> > check_allowed_ops() is used from both HAVE_DWARF_GETLOCATIONS_SUPPORT
> > and HAVE_DWARF_CFI_SUPPORT sections, so move it into the right place so
> > that it's available when either are defined. This shows up when doing
> > a static cross compile for arm64:
> >
> > $ make ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- LDFLAGS="-static" \
> > EXTRA_PERFLIBS="-lexpat"
> >
> > util/dwarf-aux.c:1723:6: error: implicit declaration of function 'check_allowed_ops'
> >
>
> Looks good to me.
>
> Acked-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
>
> Thanks!
Thanks, applied to perf-tools-next,
- Arnaldo
> > Fixes: 55442cc2f22d ("perf dwarf-aux: Check allowed DWARF Ops")
> > Signed-off-by: James Clark <james.clark@arm.com>
> > ---
> > tools/perf/util/dwarf-aux.c | 56 ++++++++++++++++++-------------------
> > 1 file changed, 28 insertions(+), 28 deletions(-)
> >
> > diff --git a/tools/perf/util/dwarf-aux.c b/tools/perf/util/dwarf-aux.c
> > index c0a492e65388..c9584563cd56 100644
> > --- a/tools/perf/util/dwarf-aux.c
> > +++ b/tools/perf/util/dwarf-aux.c
> > @@ -1215,6 +1215,34 @@ static int offset_from_dwarf_op(Dwarf_Op *op)
> > }
> > return -1;
> > }
> > +
> > +static bool check_allowed_ops(Dwarf_Op *ops, size_t nops)
> > +{
> > + /* The first op is checked separately */
> > + ops++;
> > + nops--;
> > +
> > + /*
> > + * It needs to make sure if the location expression matches to the given
> > + * register and offset exactly. Thus it rejects any complex expressions
> > + * and only allows a few of selected operators that doesn't change the
> > + * location.
> > + */
> > + while (nops) {
> > + switch (ops->atom) {
> > + case DW_OP_stack_value:
> > + case DW_OP_deref_size:
> > + case DW_OP_deref:
> > + case DW_OP_piece:
> > + break;
> > + default:
> > + return false;
> > + }
> > + ops++;
> > + nops--;
> > + }
> > + return true;
> > +}
> > #endif /* HAVE_DWARF_GETLOCATIONS_SUPPORT || HAVE_DWARF_CFI_SUPPORT */
> >
> > #ifdef HAVE_DWARF_GETLOCATIONS_SUPPORT
> > @@ -1395,34 +1423,6 @@ static bool match_var_offset(Dwarf_Die *die_mem, struct find_var_data *data,
> > return true;
> > }
> >
> > -static bool check_allowed_ops(Dwarf_Op *ops, size_t nops)
> > -{
> > - /* The first op is checked separately */
> > - ops++;
> > - nops--;
> > -
> > - /*
> > - * It needs to make sure if the location expression matches to the given
> > - * register and offset exactly. Thus it rejects any complex expressions
> > - * and only allows a few of selected operators that doesn't change the
> > - * location.
> > - */
> > - while (nops) {
> > - switch (ops->atom) {
> > - case DW_OP_stack_value:
> > - case DW_OP_deref_size:
> > - case DW_OP_deref:
> > - case DW_OP_piece:
> > - break;
> > - default:
> > - return false;
> > - }
> > - ops++;
> > - nops--;
> > - }
> > - return true;
> > -}
> > -
> > /* Only checks direct child DIEs in the given scope. */
> > static int __die_find_var_reg_cb(Dwarf_Die *die_mem, void *arg)
> > {
> > --
> > 2.34.1
> >
> >
>
>
> --
> Masami Hiramatsu (Google) <mhiramat@kernel.org>
prev parent reply other threads:[~2024-05-09 21:21 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-08 14:14 [PATCH] perf dwarf-aux: Fix build with HAVE_DWARF_CFI_SUPPORT James Clark
2024-05-08 21:04 ` Ian Rogers
2024-05-08 21:10 ` Namhyung Kim
2024-05-09 1:11 ` Masami Hiramatsu
2024-05-09 21:21 ` Arnaldo Carvalho de Melo [this message]
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=Zj0-c7Ac0qHkuLNt@x1 \
--to=acme@kernel.org \
--cc=adrian.hunter@intel.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=irogers@google.com \
--cc=james.clark@arm.com \
--cc=jolsa@kernel.org \
--cc=kan.liang@linux.intel.com \
--cc=leo.yan@linux.dev \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mhiramat@kernel.org \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.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).