Received-SPF: pass (google.com: domain of linux-kernel+bounces-173824-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1;
Precedence: bulk
MIME-Version: 1.0
References: <20240508141458.439017-1-james.clark@arm.com>
In-Reply-To: <20240508141458.439017-1-james.clark@arm.com>
From: Ian Rogers <irogers@google.com>
Date: Wed, 8 May 2024 14:04:58 -0700
Message-ID: <CAP-5=fWMbLDmT8=h_He7+9V+ntTdg1+5hmSTm87VJsTy2m3Bag@mail.gmail.com>
Subject: Re: [PATCH] perf dwarf-aux: Fix build with HAVE_DWARF_CFI_SUPPORT
To: James Clark <james.clark@arm.com>
Cc: linux-perf-users@vger.kernel.org, leo.yan@linux.dev, 
	Peter Zijlstra <peterz@infradead.org>, Ingo Molnar <mingo@redhat.com>, 
	Arnaldo Carvalho de Melo <acme@kernel.org>, Namhyung Kim <namhyung@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>, "Liang, Kan" <kan.liang@linux.intel.com>, 
	Masami Hiramatsu <mhiramat@kernel.org>, linux-kernel@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

On Wed, May 8, 2024 at 7:15=E2=80=AFAM James Clark <james.clark@arm.com> wr=
ote:
>
> 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=3Darm64 CROSS_COMPILE=3Daarch64-linux-gnu- LDFLAGS=3D"-stat=
ic" \
>     EXTRA_PERFLIBS=3D"-lexpat"
>
>   util/dwarf-aux.c:1723:6: error: implicit declaration of function 'check=
_allowed_ops'
>
> Fixes: 55442cc2f22d ("perf dwarf-aux: Check allowed DWARF Ops")
> Signed-off-by: James Clark <james.clark@arm.com>

Reviewed-by: Ian Rogers <irogers@google.com>
(eye-balled to see the #if problem exists and this is the correct fix)

Thanks,
Ian

> ---
>  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 th=
e given
> +        * register and offset exactly.  Thus it rejects any complex expr=
essions
> +        * and only allows a few of selected operators that doesn't chang=
e 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, s=
truct 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 th=
e given
> -        * register and offset exactly.  Thus it rejects any complex expr=
essions
> -        * and only allows a few of selected operators that doesn't chang=
e 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
>