Commit 966854e7 authored by Namhyung Kim's avatar Namhyung Kim Committed by Arnaldo Carvalho de Melo

perf bpf-filter: Pass 'target' to perf_bpf_filter__prepare()

This is needed to prepare target-specific actions in the later patch.
We want to reuse the pinned BPF program and map for regular users to
profile their own processes.
Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: KP Singh <kpsingh@kernel.org>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Song Liu <song@kernel.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: bpf@vger.kernel.org
Link: https://lore.kernel.org/r/20240703223035.2024586-3-namhyung@kernel.orgSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent edb08cdd
...@@ -1389,7 +1389,7 @@ static int record__open(struct record *rec) ...@@ -1389,7 +1389,7 @@ static int record__open(struct record *rec)
"even with a suitable vmlinux or kallsyms file.\n\n"); "even with a suitable vmlinux or kallsyms file.\n\n");
} }
if (evlist__apply_filters(evlist, &pos)) { if (evlist__apply_filters(evlist, &pos, &opts->target)) {
pr_err("failed to set filter \"%s\" on event %s with %d (%s)\n", pr_err("failed to set filter \"%s\" on event %s with %d (%s)\n",
pos->filter ?: "BPF", evsel__name(pos), errno, pos->filter ?: "BPF", evsel__name(pos), errno,
str_error_r(errno, msg, sizeof(msg))); str_error_r(errno, msg, sizeof(msg)));
......
...@@ -833,7 +833,7 @@ static int __run_perf_stat(int argc, const char **argv, int run_idx) ...@@ -833,7 +833,7 @@ static int __run_perf_stat(int argc, const char **argv, int run_idx)
return -1; return -1;
} }
if (evlist__apply_filters(evsel_list, &counter)) { if (evlist__apply_filters(evsel_list, &counter, &target)) {
pr_err("failed to set filter \"%s\" on event %s with %d (%s)\n", pr_err("failed to set filter \"%s\" on event %s with %d (%s)\n",
counter->filter, evsel__name(counter), errno, counter->filter, evsel__name(counter), errno,
str_error_r(errno, msg, sizeof(msg))); str_error_r(errno, msg, sizeof(msg)));
......
...@@ -1055,7 +1055,7 @@ static int perf_top__start_counters(struct perf_top *top) ...@@ -1055,7 +1055,7 @@ static int perf_top__start_counters(struct perf_top *top)
} }
} }
if (evlist__apply_filters(evlist, &counter)) { if (evlist__apply_filters(evlist, &counter, &opts->target)) {
pr_err("failed to set filter \"%s\" on event %s with %d (%s)\n", pr_err("failed to set filter \"%s\" on event %s with %d (%s)\n",
counter->filter ?: "BPF", evsel__name(counter), errno, counter->filter ?: "BPF", evsel__name(counter), errno,
str_error_r(errno, msg, sizeof(msg))); str_error_r(errno, msg, sizeof(msg)));
......
...@@ -4135,7 +4135,7 @@ static int trace__run(struct trace *trace, int argc, const char **argv) ...@@ -4135,7 +4135,7 @@ static int trace__run(struct trace *trace, int argc, const char **argv)
err = trace__expand_filters(trace, &evsel); err = trace__expand_filters(trace, &evsel);
if (err) if (err)
goto out_delete_evlist; goto out_delete_evlist;
err = evlist__apply_filters(evlist, &evsel); err = evlist__apply_filters(evlist, &evsel, &trace->opts.target);
if (err < 0) if (err < 0)
goto out_error_apply_filters; goto out_error_apply_filters;
......
...@@ -91,7 +91,7 @@ static int check_sample_flags(struct evsel *evsel, struct perf_bpf_filter_expr * ...@@ -91,7 +91,7 @@ static int check_sample_flags(struct evsel *evsel, struct perf_bpf_filter_expr *
return -1; return -1;
} }
int perf_bpf_filter__prepare(struct evsel *evsel) int perf_bpf_filter__prepare(struct evsel *evsel, struct target *target __maybe_unused)
{ {
int i, x, y, fd, ret; int i, x, y, fd, ret;
struct sample_filter_bpf *skel; struct sample_filter_bpf *skel;
......
...@@ -16,6 +16,7 @@ struct perf_bpf_filter_expr { ...@@ -16,6 +16,7 @@ struct perf_bpf_filter_expr {
}; };
struct evsel; struct evsel;
struct target;
#ifdef HAVE_BPF_SKEL #ifdef HAVE_BPF_SKEL
struct perf_bpf_filter_expr *perf_bpf_filter_expr__new(enum perf_bpf_filter_term term, struct perf_bpf_filter_expr *perf_bpf_filter_expr__new(enum perf_bpf_filter_term term,
...@@ -23,7 +24,7 @@ struct perf_bpf_filter_expr *perf_bpf_filter_expr__new(enum perf_bpf_filter_term ...@@ -23,7 +24,7 @@ struct perf_bpf_filter_expr *perf_bpf_filter_expr__new(enum perf_bpf_filter_term
enum perf_bpf_filter_op op, enum perf_bpf_filter_op op,
unsigned long val); unsigned long val);
int perf_bpf_filter__parse(struct list_head *expr_head, const char *str); int perf_bpf_filter__parse(struct list_head *expr_head, const char *str);
int perf_bpf_filter__prepare(struct evsel *evsel); int perf_bpf_filter__prepare(struct evsel *evsel, struct target *target);
int perf_bpf_filter__destroy(struct evsel *evsel); int perf_bpf_filter__destroy(struct evsel *evsel);
u64 perf_bpf_filter__lost_count(struct evsel *evsel); u64 perf_bpf_filter__lost_count(struct evsel *evsel);
...@@ -34,7 +35,8 @@ static inline int perf_bpf_filter__parse(struct list_head *expr_head __maybe_unu ...@@ -34,7 +35,8 @@ static inline int perf_bpf_filter__parse(struct list_head *expr_head __maybe_unu
{ {
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }
static inline int perf_bpf_filter__prepare(struct evsel *evsel __maybe_unused) static inline int perf_bpf_filter__prepare(struct evsel *evsel __maybe_unused,
struct target *target __maybe_unused)
{ {
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }
......
...@@ -1086,7 +1086,8 @@ int evlist__create_maps(struct evlist *evlist, struct target *target) ...@@ -1086,7 +1086,8 @@ int evlist__create_maps(struct evlist *evlist, struct target *target)
return -1; return -1;
} }
int evlist__apply_filters(struct evlist *evlist, struct evsel **err_evsel) int evlist__apply_filters(struct evlist *evlist, struct evsel **err_evsel,
struct target *target)
{ {
struct evsel *evsel; struct evsel *evsel;
int err = 0; int err = 0;
...@@ -1108,7 +1109,7 @@ int evlist__apply_filters(struct evlist *evlist, struct evsel **err_evsel) ...@@ -1108,7 +1109,7 @@ int evlist__apply_filters(struct evlist *evlist, struct evsel **err_evsel)
* non-tracepoint events can have BPF filters. * non-tracepoint events can have BPF filters.
*/ */
if (!list_empty(&evsel->bpf_filters)) { if (!list_empty(&evsel->bpf_filters)) {
err = perf_bpf_filter__prepare(evsel); err = perf_bpf_filter__prepare(evsel, target);
if (err) { if (err) {
*err_evsel = evsel; *err_evsel = evsel;
break; break;
......
...@@ -20,6 +20,7 @@ struct pollfd; ...@@ -20,6 +20,7 @@ struct pollfd;
struct thread_map; struct thread_map;
struct perf_cpu_map; struct perf_cpu_map;
struct record_opts; struct record_opts;
struct target;
/* /*
* State machine of bkw_mmap_state: * State machine of bkw_mmap_state:
...@@ -212,7 +213,8 @@ void evlist__enable_non_dummy(struct evlist *evlist); ...@@ -212,7 +213,8 @@ void evlist__enable_non_dummy(struct evlist *evlist);
void evlist__set_selected(struct evlist *evlist, struct evsel *evsel); void evlist__set_selected(struct evlist *evlist, struct evsel *evsel);
int evlist__create_maps(struct evlist *evlist, struct target *target); int evlist__create_maps(struct evlist *evlist, struct target *target);
int evlist__apply_filters(struct evlist *evlist, struct evsel **err_evsel); int evlist__apply_filters(struct evlist *evlist, struct evsel **err_evsel,
struct target *target);
u64 __evlist__combined_sample_type(struct evlist *evlist); u64 __evlist__combined_sample_type(struct evlist *evlist);
u64 evlist__combined_sample_type(struct evlist *evlist); u64 evlist__combined_sample_type(struct evlist *evlist);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment