[PATCH 0/2] LIBBPF_DYNAMIC=1 fixes

[PATCH 0/2] LIBBPF_DYNAMIC=1 fixes

[Arnaldo Carvalho de Melo]

Hi,

	Please take a look, noticed after processing a patch from Ian
for another such issue, on a hurry now, haven't checked when that
emit_string was introduced.

- Arnaldo

Arnaldo Carvalho de Melo (2):
  perf bpf: Move the LIBBPF_CURRENT_VERSION_GEQ macro to bpf-utils.h
  perf bpf: Check libbpf version to use
    btf_dump_type_data_opts.emit_strings

 tools/perf/util/bpf-event.c  | 2 ++
 tools/perf/util/bpf-filter.c | 5 +----
 tools/perf/util/bpf-utils.h  | 5 +++++
 3 files changed, 8 insertions(+), 4 deletions(-)

-- 
2.51.0

[PATCH 1/2] perf bpf: Move the LIBBPF_CURRENT_VERSION_GEQ macro to bpf-utils.h

[Arnaldo Carvalho de Melo]

From: Arnaldo Carvalho de Melo <acme@redhat.com>

We need it to fix some other libbpf version dependent issues when
building with LIBBPF_DINAMYC=1

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Andrii Nakryiko <andrii@kernel.org>
Cc: Ian Rogers <irogers@google.com>
Cc: James Clark <james.clark@linaro.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.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

Re: [PATCH 1/2] perf bpf: Move the LIBBPF_CURRENT_VERSION_GEQ macro to bpf-utils.h

[Ian Rogers]

On Fri, Sep 19, 2025 at 2:07 PM Arnaldo Carvalho de Melo
<acme@kernel.org> wrote:
>
> From: Arnaldo Carvalho de Melo <acme@redhat.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@google.com>

Thanks,
Ian

>
> Cc: Adrian Hunter <adrian.hunter@intel.com>
> Cc: Andrii Nakryiko <andrii@kernel.org>
> Cc: Ian Rogers <irogers@google.com>
> Cc: James Clark <james.clark@linaro.org>
> Cc: Jiri Olsa <jolsa@kernel.org>
> Cc: Kan Liang <kan.liang@linux.intel.com>
> Cc: Namhyung Kim <namhyung@kernel.org>
> Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.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
>

[PATCH 2/2] perf bpf: Check libbpf version to use btf_dump_type_data_opts.emit_strings

[Arnaldo Carvalho de Melo]

From: Arnaldo Carvalho de Melo <acme@redhat.com>

When building perf with LIBBPF_DINAMIC=1 on a fedora system with
libbpf-devel 1.5 I it was breaking with:

util/bpf-event.c: In function ‘format_btf_variable’:
util/bpf-event.c:291:18: error: ‘const struct btf_dump_type_data_opts’ has no member named ‘emit_strings’
  291 |                 .emit_strings = 1,
      |                  ^~~~~~~~~~~~
util/bpf-event.c:291:33: error: initialized field overwritten [-Werror=override-init]
  291 |                 .emit_strings = 1,
      |                                 ^
util/bpf-event.c:291:33: note: (near initialization for ‘opts.skip_names’)

Check the version before using that feature.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Andrii Nakryiko <andrii@kernel.org>
Cc: Ian Rogers <irogers@google.com>
Cc: James Clark <james.clark@linaro.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/util/bpf-event.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/perf/util/bpf-event.c b/tools/perf/util/bpf-event.c
index 2298cd396c4235e2..59f84aef91b4a2ec 100644
--- a/tools/perf/util/bpf-event.c
+++ b/tools/perf/util/bpf-event.c
@@ -288,7 +288,9 @@ static void format_btf_variable(struct btf *btf, char *buf, size_t buf_size,
 		.sz = sizeof(struct btf_dump_type_data_opts),
 		.skip_names = 1,
 		.compact = 1,
+#if LIBBPF_CURRENT_VERSION_GEQ(1, 7)
 		.emit_strings = 1,
+#endif
 	};
 	struct btf_dump *d;
 	size_t btf_size;
-- 
2.51.0

Re: [PATCH 2/2] perf bpf: Check libbpf version to use btf_dump_type_data_opts.emit_strings

[Ian Rogers]

On Fri, Sep 19, 2025 at 2:07 PM Arnaldo Carvalho de Melo
<acme@kernel.org> wrote:
>
> From: Arnaldo Carvalho de Melo <acme@redhat.com>
>
> When building perf with LIBBPF_DINAMIC=1 on a fedora system with

nit: s/DINAMIC/DYNAMIC/

> libbpf-devel 1.5 I it was breaking with:
>
> util/bpf-event.c: In function ‘format_btf_variable’:
> util/bpf-event.c:291:18: error: ‘const struct btf_dump_type_data_opts’ has no member named ‘emit_strings’
>   291 |                 .emit_strings = 1,
>       |                  ^~~~~~~~~~~~
> util/bpf-event.c:291:33: error: initialized field overwritten [-Werror=override-init]
>   291 |                 .emit_strings = 1,
>       |                                 ^
> util/bpf-event.c:291:33: note: (near initialization for ‘opts.skip_names’)
>
> Check the version before using that feature.
>
> Cc: Adrian Hunter <adrian.hunter@intel.com>
> Cc: Andrii Nakryiko <andrii@kernel.org>
> Cc: Ian Rogers <irogers@google.com>
> Cc: James Clark <james.clark@linaro.org>
> Cc: Jiri Olsa <jolsa@kernel.org>
> Cc: Kan Liang <kan.liang@linux.intel.com>
> Cc: Namhyung Kim <namhyung@kernel.org>
> Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

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

Thanks,
Ian

> ---
>  tools/perf/util/bpf-event.c | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/tools/perf/util/bpf-event.c b/tools/perf/util/bpf-event.c
> index 2298cd396c4235e2..59f84aef91b4a2ec 100644
> --- a/tools/perf/util/bpf-event.c
> +++ b/tools/perf/util/bpf-event.c
> @@ -288,7 +288,9 @@ static void format_btf_variable(struct btf *btf, char *buf, size_t buf_size,
>                 .sz = sizeof(struct btf_dump_type_data_opts),
>                 .skip_names = 1,
>                 .compact = 1,
> +#if LIBBPF_CURRENT_VERSION_GEQ(1, 7)
>                 .emit_strings = 1,
> +#endif
>         };
>         struct btf_dump *d;
>         size_t btf_size;
> --
> 2.51.0
>

Re: [PATCH 0/2] LIBBPF_DYNAMIC=1 fixes

[Namhyung Kim]

On Fri, Sep 19, 2025 at 06:06:52PM -0300, Arnaldo Carvalho de Melo wrote:
> Hi,
> 
> 	Please take a look, noticed after processing a patch from Ian
> for another such issue, on a hurry now, haven't checked when that
> emit_string was introduced.
> 
> - Arnaldo
> 
> Arnaldo Carvalho de Melo (2):
>   perf bpf: Move the LIBBPF_CURRENT_VERSION_GEQ macro to bpf-utils.h
>   perf bpf: Check libbpf version to use
>     btf_dump_type_data_opts.emit_strings

Acked-by: Namhyung Kim <namhyung@kernel.org>

Thanks,
Namhyung

> 
>  tools/perf/util/bpf-event.c  | 2 ++
>  tools/perf/util/bpf-filter.c | 5 +----
>  tools/perf/util/bpf-utils.h  | 5 +++++
>  3 files changed, 8 insertions(+), 4 deletions(-)
> 
> -- 
> 2.51.0
> 

Re: [PATCH 0/2] LIBBPF_DYNAMIC=1 fixes

[Ian Rogers]

On Fri, Sep 19, 2025 at 2:58 PM Namhyung Kim <namhyung@kernel.org> wrote:
>
> On Fri, Sep 19, 2025 at 06:06:52PM -0300, Arnaldo Carvalho de Melo wrote:
> > Hi,
> >
> >       Please take a look, noticed after processing a patch from Ian
> > for another such issue, on a hurry now, haven't checked when that
> > emit_string was introduced.

emit_strings was added in Linux v6.17 and libbpf was tagged as version
1.7 prior to that.

Thanks,
Ian

> >
> > - Arnaldo
> >
> > Arnaldo Carvalho de Melo (2):
> >   perf bpf: Move the LIBBPF_CURRENT_VERSION_GEQ macro to bpf-utils.h
> >   perf bpf: Check libbpf version to use
> >     btf_dump_type_data_opts.emit_strings
>
> Acked-by: Namhyung Kim <namhyung@kernel.org>
>
> Thanks,
> Namhyung
>
> >
> >  tools/perf/util/bpf-event.c  | 2 ++
> >  tools/perf/util/bpf-filter.c | 5 +----
> >  tools/perf/util/bpf-utils.h  | 5 +++++
> >  3 files changed, 8 insertions(+), 4 deletions(-)
> >
> > --
> > 2.51.0
> >

Re: [PATCH 0/2] LIBBPF_DYNAMIC=1 fixes

[Ian Rogers]

On Fri, Sep 19, 2025 at 3:10 PM Ian Rogers <irogers@google.com> wrote:
>
> On Fri, Sep 19, 2025 at 2:58 PM Namhyung Kim <namhyung@kernel.org> wrote:
> >
> > On Fri, Sep 19, 2025 at 06:06:52PM -0300, Arnaldo Carvalho de Melo wrote:
> > > Hi,
> > >
> > >       Please take a look, noticed after processing a patch from Ian
> > > for another such issue, on a hurry now, haven't checked when that
> > > emit_string was introduced.
>
> emit_strings was added in Linux v6.17 and libbpf was tagged as version
> 1.7 prior to that.
>
> Thanks,
> Ian

Ping.

When this lands I can rebase:
https://lore.kernel.org/lkml/20250830053549.1966520-1-irogers@google.com/
on it.

Thanks,
Ian

> > >
> > > - Arnaldo
> > >
> > > Arnaldo Carvalho de Melo (2):
> > >   perf bpf: Move the LIBBPF_CURRENT_VERSION_GEQ macro to bpf-utils.h
> > >   perf bpf: Check libbpf version to use
> > >     btf_dump_type_data_opts.emit_strings
> >
> > Acked-by: Namhyung Kim <namhyung@kernel.org>
> >
> > Thanks,
> > Namhyung
> >
> > >
> > >  tools/perf/util/bpf-event.c  | 2 ++
> > >  tools/perf/util/bpf-filter.c | 5 +----
> > >  tools/perf/util/bpf-utils.h  | 5 +++++
> > >  3 files changed, 8 insertions(+), 4 deletions(-)
> > >
> > > --
> > > 2.51.0
> > >

Re: [PATCH 0/2] LIBBPF_DYNAMIC=1 fixes

[Arnaldo Carvalho de Melo]

On Tue, Sep 30, 2025 at 01:10:59PM -0700, Ian Rogers wrote:
> On Fri, Sep 19, 2025 at 3:10 PM Ian Rogers <irogers@google.com> wrote:
> >
> > On Fri, Sep 19, 2025 at 2:58 PM Namhyung Kim <namhyung@kernel.org> wrote:
> > >
> > > On Fri, Sep 19, 2025 at 06:06:52PM -0300, Arnaldo Carvalho de Melo wrote:
> > > > Hi,
> > > >
> > > >       Please take a look, noticed after processing a patch from Ian
> > > > for another such issue, on a hurry now, haven't checked when that
> > > > emit_string was introduced.
> >
> > emit_strings was added in Linux v6.17 and libbpf was tagged as version
> > 1.7 prior to that.
> >
> > Thanks,
> > Ian
> 
> Ping.
> 
> When this lands I can rebase:
> https://lore.kernel.org/lkml/20250830053549.1966520-1-irogers@google.com/
> on it.

I'm testing this now.

- Arnaldo
 
> Thanks,
> Ian
> 
> > > >
> > > > - Arnaldo
> > > >
> > > > Arnaldo Carvalho de Melo (2):
> > > >   perf bpf: Move the LIBBPF_CURRENT_VERSION_GEQ macro to bpf-utils.h
> > > >   perf bpf: Check libbpf version to use
> > > >     btf_dump_type_data_opts.emit_strings
> > >
> > > Acked-by: Namhyung Kim <namhyung@kernel.org>
> > >
> > > Thanks,
> > > Namhyung
> > >
> > > >
> > > >  tools/perf/util/bpf-event.c  | 2 ++
> > > >  tools/perf/util/bpf-filter.c | 5 +----
> > > >  tools/perf/util/bpf-utils.h  | 5 +++++
> > > >  3 files changed, 8 insertions(+), 4 deletions(-)
> > > >
> > > > --
> > > > 2.51.0
> > > >