Commit c041d33b authored by Song Liu's avatar Song Liu Committed by Arnaldo Carvalho de Melo
Browse files

perf evsel: Separate bpf_counter_list and bpf_filters, can be used at the same time 



'struct evsel' uses a union for the two lists. This turned out to be
error prone.

For example:

  [root@quaco ~]# perf stat --bpf-prog 5246
  Error: cpu-clock event does not have sample flags 66c660
  failed to set filter "(null)" on event cpu-clock with 2 (No such file or directory)
  [root@quaco ~]# perf stat --bpf-prog 5246

Fix this issue by separating the two lists.

Fixes: 56ec9457 ("perf bpf filter: Implement event sample filtering")
Signed-off-by: default avatarSong Liu <song@kernel.org>
Acked-by: default avatarNamhyung Kim <namhyung@kernel.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: kernel-team@meta.com
Link: https://lore.kernel.org/r/20230519235757.3613719-1-song@kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent c8268a9b

tools/perf/util/evsel.c

+1 −0
Original line number Diff line number Diff line
@@ -282,6 +282,7 @@ void evsel__init(struct evsel *evsel, 
	evsel->bpf_fd	   = -1;

	INIT_LIST_HEAD(&evsel->config_terms);

	INIT_LIST_HEAD(&evsel->bpf_counter_list);

	INIT_LIST_HEAD(&evsel->bpf_filters);

	perf_evsel__object.init(evsel);

	evsel->sample_size = __evsel__sample_size(attr->sample_type);

	evsel__calc_id_pos(evsel);

tools/perf/util/evsel.h

+2 −4
Original line number Diff line number Diff line
@@ -151,10 +151,8 @@ struct evsel { 
	 */

	struct bpf_counter_ops	*bpf_counter_ops;



	union {

	struct list_head	bpf_counter_list; /* for perf-stat -b */

	struct list_head	bpf_filters; /* for perf-record --filter */

	};



	/* for perf-stat --use-bpf */

	int			bperf_leader_prog_fd;