perf bpf-filter: Fix opts declaration on older libbpfs
Subsystems (2)
Ian Rogers
reviewerPATCH 1/1 perf bpf-filter: Fix opts declaration on older libbpfs
Building perf with LIBBPF_DYNAMIC (ie not the default static linking of libbpf with perf) is breaking as the libbpf isn't version 1.7 or newer, where dont_enable is added to bpf_perf_event_opts. To avoid this breakage add a compile time version check and don't declare the variable when not present.
Fixes 5e2ac8e8571d ("perf bpf-filter: Enable events manually")
Signed-off-by Ian Rogers <[email protected]>
--- tools/perf/util/bpf-filter.c | 8 ++++++++ 1 file changed, 8 insertions(+)
tools/perf/util/bpf-filter.c +8 -0
@@ -443,6 +443,10 @@ static int create_idx_hash(struct evsel *evsel, struct perf_bpf_filter_entry *enreturn -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;
@@ -451,8 +455,12 @@ int perf_bpf_filter__prepare(struct evsel *evsel, struct target *target)struct bpf_link *link;struct perf_bpf_filter_entry *entry;bool needs_idx_hash = !target__has_cpu (target); +#if LIBBPF_CURRENT_VERSION_GEQ (1 ,7 )DECLARE_LIBBPF_OPTS (bpf_perf_event_opts, pe_opts, .dont_enable = true); +#else +DECLARE_LIBBPF_OPTS (bpf_perf_event_opts, pe_opts); +#endif entry =calloc (MAX_FILTERS ,sizeof (*entry));if (entry ==NULL )
Signature · 1 line
2.51.0.318.gd7df087d1a-goog
Ian Rogers
reviewerQuoted 9 lines · Ian Rogers
Building perf with
LIBBPF_DYNAMIC(ie not the default static linking of libbpf with perf) is breaking as the libbpf isn't version 1.7 or newer, wheredont_enableis added tobpf_perf_event_opts. To avoid this breakage add a compile time version check and don't declare the variable when not present.Fixes 5e2ac8e8571d ("perf bpf-filter: Enable events manually")Signed-off-by Ian Rogers <[email protected]>
Ping.
Thanks,
Ian
Quoted 35 lines
--- tools/perf/util/bpf-filter.c | 8 ++++++++ 1 file changed, 8 insertions(+)tools/perf/util/bpf-filter.c +8
-1@@ -443,6 +443,10 @@ static int create_idx_hash(struct evsel *evsel, struct perf_bpf_filter_entry *enreturn -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;@@ -451,8 +455,12 @@ int perf_bpf_filter__prepare(struct evsel *evsel, struct target *target)struct bpf_link *link;struct perf_bpf_filter_entry *entry;bool needs_idx_hash = !target__has_cpu (target); +#if LIBBPF_CURRENT_VERSION_GEQ (1 ,7 )DECLARE_LIBBPF_OPTS (bpf_perf_event_opts, pe_opts, .dont_enable = true); +#else +DECLARE_LIBBPF_OPTS (bpf_perf_event_opts, pe_opts); +#endif entry =calloc (MAX_FILTERS ,sizeof (*entry));if (entry ==NULL ) --2.51.0.318.gd7df087d1a-goog