linux-kernel - Re: [PATCH 1/2] perf bpf: Move the LIBBPF_CURRENT_VERSION

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=fV2dWSczTMpvRA_byh++tXta2vB2OT1ehSiTVSFtEBkPg@mail.gmail.com>
Date: Fri, 19 Sep 2025 15:04:57 -0700
From: Ian Rogers <irogers@...gle.com>
To: Arnaldo Carvalho de Melo <acme@...nel.org>
Cc: Namhyung Kim <namhyung@...nel.org>, Ingo Molnar <mingo@...nel.org>, 
	Thomas Gleixner <tglx@...utronix.de>, James Clark <james.clark@...aro.org>, 
	Jiri Olsa <jolsa@...nel.org>, Adrian Hunter <adrian.hunter@...el.com>, 
	Kan Liang <kan.liang@...ux.intel.com>, Clark Williams <williams@...hat.com>, 
	linux-kernel@...r.kernel.org, linux-perf-users@...r.kernel.org, 
	Arnaldo Carvalho de Melo <acme@...hat.com>, Andrii Nakryiko <andrii@...nel.org>
Subject: Re: [PATCH 1/2] perf bpf: Move the LIBBPF_CURRENT_VERSION_GEQ macro
 to bpf-utils.h

On Fri, Sep 19, 2025 at 2:07 PM Arnaldo Carvalho de Melo
<acme@...nel.org> wrote:
>
> From: Arnaldo Carvalho de Melo <acme@...hat.com>
>
> We need it to fix some other libbpf version dependent issues when
> building with LIBBPF_DINAMYC=1

nit: s/DINAMYC/DYNAMIC/ :-)

Reviewed-by: Ian Rogers <irogers@...gle.com>

Thanks,
Ian

>
> Cc: Adrian Hunter <adrian.hunter@...el.com>
> Cc: Andrii Nakryiko <andrii@...nel.org>
> Cc: Ian Rogers <irogers@...gle.com>
> Cc: James Clark <james.clark@...aro.org>
> 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>
> ---
>  tools/perf/util/bpf-filter.c | 5 +----
>  tools/perf/util/bpf-utils.h  | 5 +++++
>  2 files changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/tools/perf/util/bpf-filter.c b/tools/perf/util/bpf-filter.c
> index 92308c38fbb567ba..1a2e7b388d57d367 100644
> --- a/tools/perf/util/bpf-filter.c
> +++ b/tools/perf/util/bpf-filter.c
> @@ -56,6 +56,7 @@
>  #include "util/debug.h"
>  #include "util/evsel.h"
>  #include "util/target.h"
> +#include "util/bpf-utils.h"
>
>  #include "util/bpf-filter.h"
>  #include <util/bpf-filter-flex.h>
> @@ -443,10 +444,6 @@ static int create_idx_hash(struct evsel *evsel, struct perf_bpf_filter_entry *en
>         return -1;
>  }
>
> -#define LIBBPF_CURRENT_VERSION_GEQ(major, minor)                       \
> -       (LIBBPF_MAJOR_VERSION > (major) ||                              \
> -        (LIBBPF_MAJOR_VERSION == (major) && LIBBPF_MINOR_VERSION >= (minor)))
> -
>  int perf_bpf_filter__prepare(struct evsel *evsel, struct target *target)
>  {
>         int i, x, y, fd, ret;
> diff --git a/tools/perf/util/bpf-utils.h b/tools/perf/util/bpf-utils.h
> index 86a5055cdfad6689..eafc43b8731f1e31 100644
> --- a/tools/perf/util/bpf-utils.h
> +++ b/tools/perf/util/bpf-utils.h
> @@ -8,6 +8,11 @@
>  #ifdef HAVE_LIBBPF_SUPPORT
>
>  #include <bpf/libbpf.h>
> +#include <bpf/libbpf_version.h>
> +
> +#define LIBBPF_CURRENT_VERSION_GEQ(major, minor)                       \
> +       (LIBBPF_MAJOR_VERSION > (major) ||                              \
> +        (LIBBPF_MAJOR_VERSION == (major) && LIBBPF_MINOR_VERSION >= (minor)))
>
>  /*
>   * Get bpf_prog_info in continuous memory
> --
> 2.51.0
>