linux-kernel - Re: [PATCH 1/1 perf-tools] perf python: Fix up the build on architectures without HAVE_KVM_STAT

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CAP-5=fUF1kfioGSgnXzPmadwKrd65mUpHPamPNt29ra9qZAzJw@mail.gmail.com>
Date: Wed, 23 Oct 2024 14:40:45 -0700
From: Ian Rogers <irogers@...gle.com>
To: Arnaldo Carvalho de Melo <acme@...nel.org>
Cc: Adrian Hunter <adrian.hunter@...el.com>, 
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, linux-perf-users@...r.kernel.org, 
	Jiri Olsa <jolsa@...nel.org>, Kan Liang <kan.liang@...ux.intel.com>, 
	Namhyung Kim <namhyung@...nel.org>
Subject: Re: [PATCH 1/1 perf-tools] perf python: Fix up the build on
 architectures without HAVE_KVM_STAT_SUPPORT

On Wed, Oct 23, 2024 at 2:05 PM Arnaldo Carvalho de Melo
<acme@...nel.org> wrote:
>
> Noticed while building on a raspbian arm 32-bit system.
>
> There was also this other case, fixed by adding a missing util/stat.h
> with the prototypes:
>
>   /tmp/tmp.MbiSHoF3dj/perf-6.12.0-rc3/tools/perf/util/python.c:1396:6: error: no previous prototype for ‘perf_stat__set_no_csv_summary’ [-Werror=missing-prototypes]
>    1396 | void perf_stat__set_no_csv_summary(int set __maybe_unused)
>         |      ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>   /tmp/tmp.MbiSHoF3dj/perf-6.12.0-rc3/tools/perf/util/python.c:1400:6: error: no previous prototype for ‘perf_stat__set_big_num’ [-Werror=missing-prototypes]
>    1400 | void perf_stat__set_big_num(int set __maybe_unused)
>         |      ^~~~~~~~~~~~~~~~~~~~~~
>   cc1: all warnings being treated as errors
>
> In other architectures this must be building due to some lucky indirect
> inclusion of that header.
>
> Fixes: 9dabf4003423c8d3 ("perf python: Switch module to linking libraries from building source")
> Cc: Adrian Hunter <adrian.hunter@...el.com>
> Cc: Ian Rogers <irogers@...gle.com>
> Cc: Jiri Olsa <jolsa@...nel.org>
> Cc: Kan Liang <kan.liang@...ux.intel.com>
> Cc: Namhyung Kim <namhyung@...nel.org>
> Signed-off-by: Arnaldo Carvalho de Melo <acme@...hat.com>

So this will at least conflict with:
https://lore.kernel.org/lkml/20241022173015.437550-6-irogers@google.com/
where the #ifdef-ed out functions are removed. Does that series fix
the ARM32 issue? Could we land that?

Thanks,
Ian

> ---
>  tools/perf/util/python.c | 3 +++
>  1 file changed, 3 insertions(+)
>
> diff --git a/tools/perf/util/python.c b/tools/perf/util/python.c
> index 31a223eaf8e65fa3..ee3d43a7ba4570f0 100644
> --- a/tools/perf/util/python.c
> +++ b/tools/perf/util/python.c
> @@ -19,6 +19,7 @@
>  #include "util/bpf-filter.h"
>  #include "util/env.h"
>  #include "util/kvm-stat.h"
> +#include "util/stat.h"
>  #include "util/kwork.h"
>  #include "util/sample.h"
>  #include "util/lock-contention.h"
> @@ -1355,6 +1356,7 @@ PyMODINIT_FUNC PyInit_perf(void)
>
>  unsigned int scripting_max_stack = PERF_MAX_STACK_DEPTH;
>
> +#ifdef HAVE_KVM_STAT_SUPPORT
>  bool kvm_entry_event(struct evsel *evsel __maybe_unused)
>  {
>         return false;
> @@ -1384,6 +1386,7 @@ void exit_event_decode_key(struct perf_kvm_stat *kvm __maybe_unused,
>                            char *decode __maybe_unused)
>  {
>  }
> +#endif // HAVE_KVM_STAT_SUPPORT
>
>  int find_scripts(char **scripts_array  __maybe_unused, char **scripts_path_array  __maybe_unused,
>                 int num  __maybe_unused, int pathlen __maybe_unused)
> --
> 2.46.0
>