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

Unified · Split

4 files
  1. include/linux/uprobes.h +1 −9
  2. kernel/events/uprobes.c +7 −11
  3. kernel/trace/bpf_trace.c +1 −2
  4. kernel/trace/trace_uprobe.c +3 −6
include/linux/uprobes.h+1−9
@@ -28,20 +28,12 @@ struct page; · 27 unmodified lines
28 28
29#define MAX_URETPROBE_DEPTH 6429#define MAX_URETPROBE_DEPTH 64
30 30
31enum uprobe_filter_ctx {
32 UPROBE_FILTER_REGISTER,
33 UPROBE_FILTER_UNREGISTER,
34 UPROBE_FILTER_MMAP,
35};
36
37struct uprobe_consumer {31struct uprobe_consumer {
38 int (*handler)(struct uprobe_consumer *self, struct pt_regs *regs);32 int (*handler)(struct uprobe_consumer *self, struct pt_regs *regs);
39 int (*ret_handler)(struct uprobe_consumer *self,33 int (*ret_handler)(struct uprobe_consumer *self,
40 unsigned long func,34 unsigned long func,
41 struct pt_regs *regs);35 struct pt_regs *regs);
42 bool (*filter)(struct uprobe_consumer *self,36 bool (*filter)(struct uprobe_consumer *self, struct mm_struct *mm);
43 enum uprobe_filter_ctx ctx,
44 struct mm_struct *mm);
45 37
46 struct uprobe_consumer *next;38 struct uprobe_consumer *next;
47};39};
kernel/events/uprobes.c+7−11
@@ -918,21 +918,19 @@ static int prepare_uprobe(struct uprobe *uprobe, struct file *file, · 917 unmodified lines
918 return ret;918 return ret;
919}919}
920 920
921static inline bool consumer_filter(struct uprobe_consumer *uc,921static inline bool consumer_filter(struct uprobe_consumer *uc, struct mm_struct *mm)
922 enum uprobe_filter_ctx ctx, struct mm_struct *mm)
923{922{
924 return !uc->filter || uc->filter(uc, ctx, mm);923 return !uc->filter || uc->filter(uc, mm);
925}924}
926 925
927static bool filter_chain(struct uprobe *uprobe,926static bool filter_chain(struct uprobe *uprobe, struct mm_struct *mm)
928 enum uprobe_filter_ctx ctx, struct mm_struct *mm)
929{927{
930 struct uprobe_consumer *uc;928 struct uprobe_consumer *uc;
931 bool ret = false;929 bool ret = false;
932 930
933 down_read(&uprobe->consumer_rwsem);931 down_read(&uprobe->consumer_rwsem);
934 for (uc = uprobe->consumers; uc; uc = uc->next) {932 for (uc = uprobe->consumers; uc; uc = uc->next) {
935 ret = consumer_filter(uc, ctx, mm);933 ret = consumer_filter(uc, mm);
936 if (ret)934 if (ret)
937 break;935 break;
938 }936 }
@@ -1099,12 +1097,10 @@ register_for_each_vma(struct uprobe *uprobe, struct uprobe_consumer *new) · 160 unmodified lines
1099 1097
1100 if (is_register) {1098 if (is_register) {
1101 /* consult only the "caller", new consumer. */1099 /* consult only the "caller", new consumer. */
1102 if (consumer_filter(new,1100 if (consumer_filter(new, mm))
1103 UPROBE_FILTER_REGISTER, mm))
1104 err = install_breakpoint(uprobe, mm, vma, info->vaddr);1101 err = install_breakpoint(uprobe, mm, vma, info->vaddr);
1105 } else if (test_bit(MMF_HAS_UPROBES, &mm->flags)) {1102 } else if (test_bit(MMF_HAS_UPROBES, &mm->flags)) {
1106 if (!filter_chain(uprobe,1103 if (!filter_chain(uprobe, mm))
1107 UPROBE_FILTER_UNREGISTER, mm))
1108 err |= remove_breakpoint(uprobe, mm, info->vaddr);1104 err |= remove_breakpoint(uprobe, mm, info->vaddr);
1109 }1105 }
1110 1106
@@ -1387,7 +1383,7 @@ int uprobe_mmap(struct vm_area_struct *vma) · 276 unmodified lines
1387 */1383 */
1388 list_for_each_entry_safe(uprobe, u, &tmp_list, pending_list) {1384 list_for_each_entry_safe(uprobe, u, &tmp_list, pending_list) {
1389 if (!fatal_signal_pending(current) &&1385 if (!fatal_signal_pending(current) &&
1390 filter_chain(uprobe, UPROBE_FILTER_MMAP, vma->vm_mm)) {1386 filter_chain(uprobe, vma->vm_mm)) {
1391 unsigned long vaddr = offset_to_vaddr(vma, uprobe->offset);1387 unsigned long vaddr = offset_to_vaddr(vma, uprobe->offset);
1392 install_breakpoint(uprobe, vma->vm_mm, vma, vaddr);1388 install_breakpoint(uprobe, vma->vm_mm, vma, vaddr);
1393 }1389 }
kernel/trace/bpf_trace.c+1−2
@@ -3320,8 +3320,7 @@ static int uprobe_prog_run(struct bpf_uprobe *uprobe, · 3319 unmodified lines
3320}3320}
3321 3321
3322static bool3322static bool
3323uprobe_multi_link_filter(struct uprobe_consumer *con, enum uprobe_filter_ctx ctx,3323uprobe_multi_link_filter(struct uprobe_consumer *con, struct mm_struct *mm)
3324 struct mm_struct *mm)
3325{3324{
3326 struct bpf_uprobe *uprobe;3325 struct bpf_uprobe *uprobe;
3327 3326
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
1078 return trace_handle_return(s);1078 return trace_handle_return(s);
1079}1079}
1080 1080
1081typedef bool (*filter_func_t)(struct uprobe_consumer *self,1081typedef bool (*filter_func_t)(struct uprobe_consumer *self, struct mm_struct *mm);
1082 enum uprobe_filter_ctx ctx,
1083 struct mm_struct *mm);
1084 1082
1085static int trace_uprobe_enable(struct trace_uprobe *tu, filter_func_t filter)1083static int trace_uprobe_enable(struct trace_uprobe *tu, filter_func_t filter)
1086{1084{
@@ -1339,8 +1337,7 @@ static int uprobe_perf_open(struct trace_event_call *call, · 252 unmodified lines
1339 return err;1337 return err;
1340}1338}
1341 1339
1342static bool uprobe_perf_filter(struct uprobe_consumer *uc,1340static bool uprobe_perf_filter(struct uprobe_consumer *uc, struct mm_struct *mm)
1343 enum uprobe_filter_ctx ctx, struct mm_struct *mm)
1344{1341{
1345 struct trace_uprobe_filter *filter;1342 struct trace_uprobe_filter *filter;
1346 struct trace_uprobe *tu;1343 struct trace_uprobe *tu;
@@ -1426,7 +1423,7 @@ static void __uprobe_perf_func(struct trace_uprobe *tu, · 79 unmodified lines
1426static int uprobe_perf_func(struct trace_uprobe *tu, struct pt_regs *regs,1423static int uprobe_perf_func(struct trace_uprobe *tu, struct pt_regs *regs,
1427 struct uprobe_cpu_buffer **ucbp)1424 struct uprobe_cpu_buffer **ucbp)
1428{1425{
1429 if (!uprobe_perf_filter(&tu->consumer, 0, current->mm))1426 if (!uprobe_perf_filter(&tu->consumer, current->mm))
1430 return UPROBE_HANDLER_REMOVE;1427 return UPROBE_HANDLER_REMOVE;
1431 1428
1432 if (!is_ret_probe(tu))1429 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