perf bpf-event: Use libbpf version rather than feature check
Subsystems (2)
Ian Rogers
reviewerPATCH 1/2 perf bpf-event: Use libbpf version rather than feature check
The feature check guarded the -DHAVE_LIBBPF_STRINGS_SUPPORT is unnecessary as it is sufficient and easier to use the LIBBPF_CURRENT_VERSION_GEQ macro.
--- tools/perf/Makefile.config | 7 ------- tools/perf/builtin-check.c | 1 + tools/perf/util/bpf-event.c | 2 -- tools/perf/util/bpf-utils.h | 5 +++++ 4 files changed, 6 insertions(+), 9 deletions(-)
tools/perf/Makefile.config +0 -7
@@ -596,13 +596,6 @@ ifndef NO_LIBELF LIBBPF_INCLUDE = $(LIBBPF_DIR)/.. endif endif - - FEATURE_CHECK_CFLAGS-libbpf-strings="-I$(LIBBPF_INCLUDE)" - $(call feature_check,libbpf-strings) - ifeq ($(feature-libbpf-strings), 1) - $(call detected,CONFIG_LIBBPF_STRINGS) - CFLAGS += -DHAVE_LIBBPF_STRINGS_SUPPORT - endif endif endif # NO_LIBBPF endif # NO_LIBELF
tools/perf/builtin-check.c +1 -0
@@ -1,6 +1,7 @@// SPDX-License-Identifier: GPL-2.0 #include "builtin.h" #include "color.h" +#include "util/bpf-utils.h" #include "util/debug.h" #include "util/header.h" #include <tools/config.h>
tools/perf/util/bpf-event.c +0 -2
@@ -288,9 +288,7 @@ 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;
tools/perf/util/bpf-utils.h +5 -0
@@ -14,6 +14,11 @@ (LIBBPF_MAJOR_VERSION > (major) || \ (LIBBPF_MAJOR_VERSION == (major) && LIBBPF_MINOR_VERSION >= (minor))) +#if LIBBPF_CURRENT_VERSION_GEQ (1 ,7 ) +// libbpf 1.7+ support the btf_dump_type_data_opts.emit_strings option. +#define HAVE_LIBBPF_STRINGS_SUPPORT 1 +#endif +/* * Get bpf_prog_info in continuous memory *
Signature · 1 line
2.51.0.618.g983fd99d29-goog
Ian Rogers
reviewerPATCH 2/2 tools build: Remove libbpf-strings feature test
The feature test is unnecessary as the LIBBPF_CURRENT_VERSION_GEQ(1,7) macro can be used instead. The only use was in perf and this is now removed.
--- tools/build/Makefile.feature | 1 - tools/build/feature/Makefile | 4 ---- tools/build/feature/test-libbpf-strings.c | 10 ---------- 3 files changed, 15 deletions(-) delete mode 100644 tools/build/feature/test-libbpf-strings.c
tools/build/Makefile.feature +0 -1
@@ -124,7 +124,6 @@ FEATURE_TESTS_EXTRA := \ llvm \ clang \ libbpf \ - libbpf-strings \ libpfm4 \ libdebuginfod \ clang-bpf-co-re \
tools/build/feature/Makefile +0 -4
@@ -57,7 +57,6 @@ FILES= \ test-lzma.bin \ test-bpf.bin \ test-libbpf.bin \ - test-libbpf-strings.bin \ test-get_cpuid.bin \ test-sdt.bin \ test-cxx.bin \
@@ -332,9 +331,6 @@ $(OUTPUT)test-bpf.bin: $(OUTPUT)test-libbpf.bin: $(BUILD) -lbpf -$(OUTPUT)test-libbpf-strings.bin: - $(BUILD) - $(OUTPUT)test-sdt.bin: $(BUILD)
tools/build/feature/test-libbpf-strings.c deleted +0 -10
@@ -1,10 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -#include <bpf/btf.h> - -int main (void ) -{ -struct btf_dump_type_data_opts opts; - - opts.emit_strings =0 ; -return opts.emit_strings; -}
Signature · 1 line
2.51.0.618.g983fd99d29-goog
Arnaldo Carvalho de Melo
maintainerQuoted 47 lines · Ian Rogers
The feature check guarded the -DHAVE_LIBBPF_STRINGS_SUPPORT is unnecessary as it is sufficient and easier to use the
LIBBPF_CURRENT_VERSION_GEQmacro.Signed-off-by Ian Rogers <[email protected]>--- tools/perf/Makefile.config | 7 ------- tools/perf/builtin-check.c | 1 + tools/perf/util/bpf-event.c | 2 -- tools/perf/util/bpf-utils.h | 5 +++++ 4 files changed, 6 insertions(+), 9 deletions(-)tools/perf/Makefile.config +0
-7@@ -596,13 +596,6 @@ ifndef NO_LIBELF LIBBPF_INCLUDE = $(LIBBPF_DIR)/.. endif endif - - FEATURE_CHECK_CFLAGS-libbpf-strings="-I$(LIBBPF_INCLUDE)" - $(call feature_check,libbpf-strings) - ifeq ($(feature-libbpf-strings), 1) - $(call detected,CONFIG_LIBBPF_STRINGS) - CFLAGS += -DHAVE_LIBBPF_STRINGS_SUPPORT - endif endif endif # NO_LIBBPF endif # NO_LIBELFtools/perf/builtin-check.c +1
-0@@ -1,6 +1,7 @@// SPDX-License-Identifier: GPL-2.0 #include "builtin.h" #include "color.h" +#include "util/bpf-utils.h" #include "util/debug.h" #include "util/header.h" #include <tools/config.h> tools/perf/util/bpf-event.c +0
-0
tools/perf/util/bpf-event.c static void format_btf_variable(struct btf *btf, char *buf, size_t buf_size, · line 293
Quoted 6 lines
tools/perf/util/bpf-event.c +0
-2@@ -288,9 +288,7 @@ 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
I see, this is already under HAVE_LIBBPF_STRINGS_SUPPORT
Applying,
- Arnaldo
Quoted 21 lines
tools/perf/util/bpf-event.c +0
-0};struct btf_dump *d;size_t btf_size;tools/perf/util/bpf-utils.h +5
-0@@ -14,6 +14,11 @@ (LIBBPF_MAJOR_VERSION > (major) || \ (LIBBPF_MAJOR_VERSION == (major) && LIBBPF_MINOR_VERSION >= (minor))) +#if LIBBPF_CURRENT_VERSION_GEQ (1 ,7 ) +// libbpf 1.7+ support the btf_dump_type_data_opts.emit_strings option. +#define HAVE_LIBBPF_STRINGS_SUPPORT 1 +#endif +/* * Get bpf_prog_info in continuous memory * Signature · 1 line
2.51.0.618.g983fd99d29-goog