History

uprobes: get rid of enum uprobe_filter_ctx in uprobe filter callbacks

It serves no purpose beyond adding unnecessray argument passed to the filter callback. Just get rid of it, no one is actually using it.

Andrii Nakryiko committed 2 years ago

Commit 59da8801 parent 86174084 files · +12 −28Browse files

Showing the changes to kernel/trace (2 of 4 files). Show all

Unified · Split

2 files
  1. kernel/trace/bpf_trace.c +1 −2
  2. kernel/trace/trace_uprobe.c +3 −6
kernel/trace/bpf_trace.c+1−2
@@ -3320,8 +3320,7 @@ static int uprobe_prog_run(struct bpf_uprobe *uprobe, · 3319 unmodified lines
33203320 }
33213321
33223322 static bool
3323−uprobe_multi_link_filter(struct uprobe_consumer *con, enum uprobe_filter_ctx ctx,
3324− struct mm_struct *mm)
3323+uprobe_multi_link_filter(struct uprobe_consumer *con, struct mm_struct *mm)
33253324 {
33263325 struct bpf_uprobe *uprobe;
33273326
kernel/trace/trace_uprobe.c+3−6
@@ -1078,9 +1078,7 @@ print_uprobe_event(struct trace_iterator *iter, int flags, struct trace_event *e · 1077 unmodified lines
10781078 return trace_handle_return(s);
10791079 }
10801080
1081−typedef bool (*filter_func_t)(struct uprobe_consumer *self,
1082− enum uprobe_filter_ctx ctx,
1083− struct mm_struct *mm);
1081+typedef bool (*filter_func_t)(struct uprobe_consumer *self, struct mm_struct *mm);
10841082
10851083 static int trace_uprobe_enable(struct trace_uprobe *tu, filter_func_t filter)
10861084 {
@@ -1339,8 +1337,7 @@ static int uprobe_perf_open(struct trace_event_call *call, · 252 unmodified lines
13391337 return err;
13401338 }
13411339
1342−static bool uprobe_perf_filter(struct uprobe_consumer *uc,
1343− enum uprobe_filter_ctx ctx, struct mm_struct *mm)
1340+static bool uprobe_perf_filter(struct uprobe_consumer *uc, struct mm_struct *mm)
13441341 {
13451342 struct trace_uprobe_filter *filter;
13461343 struct trace_uprobe *tu;
@@ -1426,7 +1423,7 @@ static void __uprobe_perf_func(struct trace_uprobe *tu, · 79 unmodified lines
14261423 static int uprobe_perf_func(struct trace_uprobe *tu, struct pt_regs *regs,
14271424 struct uprobe_cpu_buffer **ucbp)
14281425 {
1429− if (!uprobe_perf_filter(&tu->consumer, 0, current->mm))
1426+ if (!uprobe_perf_filter(&tu->consumer, current->mm))
14301427 return UPROBE_HANDLER_REMOVE;
14311428
14321429 if (!is_ret_probe(tu))

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t