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.

Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: Oleg Nesterov <oleg@redhat.com>
Link: https://lore.kernel.org/r/20240903174603.3554182-4-andrii@kernel.org

diff --git a/include/linux/uprobes.h b/include/linux/uprobes.h
index f50df1fa93e7cdcf09ff5c1ee9bada41581a4497..63ae2ade348730870c4576f88edbf103ff873be9 100644 (file)
--- a/include/linux/uprobes.h
+++ b/include/linux/uprobes.h
@@ -28,20 +28,12 @@ struct page;
 
 #define MAX_URETPROBE_DEPTH            64
 
-enum uprobe_filter_ctx {
-       UPROBE_FILTER_REGISTER,
-       UPROBE_FILTER_UNREGISTER,
-       UPROBE_FILTER_MMAP,
-};
-
 struct uprobe_consumer {
        int (*handler)(struct uprobe_consumer *self, struct pt_regs *regs);
        int (*ret_handler)(struct uprobe_consumer *self,
                                unsigned long func,
                                struct pt_regs *regs);
-       bool (*filter)(struct uprobe_consumer *self,
-                               enum uprobe_filter_ctx ctx,
-                               struct mm_struct *mm);
+       bool (*filter)(struct uprobe_consumer *self, struct mm_struct *mm);
 
        struct uprobe_consumer *next;
 };

diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c
index d228d2ba30bb7590cf6a85124154cbb88e4a814b..87b499cd2334954a1847e4f8dfd40bf432005b25 100644 (file)
--- a/kernel/events/uprobes.c
+++ b/kernel/events/uprobes.c
@@ -918,21 +918,19 @@ static int prepare_uprobe(struct uprobe *uprobe, struct file *file,
        return ret;
 }
 
-static inline bool consumer_filter(struct uprobe_consumer *uc,
-                                  enum uprobe_filter_ctx ctx, struct mm_struct *mm)
+static inline bool consumer_filter(struct uprobe_consumer *uc, struct mm_struct *mm)
 {
-       return !uc->filter || uc->filter(uc, ctx, mm);
+       return !uc->filter || uc->filter(uc, mm);
 }
 
-static bool filter_chain(struct uprobe *uprobe,
-                        enum uprobe_filter_ctx ctx, struct mm_struct *mm)
+static bool filter_chain(struct uprobe *uprobe, struct mm_struct *mm)
 {
        struct uprobe_consumer *uc;
        bool ret = false;
 
        down_read(&uprobe->consumer_rwsem);
        for (uc = uprobe->consumers; uc; uc = uc->next) {
-               ret = consumer_filter(uc, ctx, mm);
+               ret = consumer_filter(uc, mm);
                if (ret)
                        break;
        }
@@ -1099,12 +1097,10 @@ register_for_each_vma(struct uprobe *uprobe, struct uprobe_consumer *new)
 
                if (is_register) {
                        /* consult only the "caller", new consumer. */
-                       if (consumer_filter(new,
-                                       UPROBE_FILTER_REGISTER, mm))
+                       if (consumer_filter(new, mm))
                                err = install_breakpoint(uprobe, mm, vma, info->vaddr);
                } else if (test_bit(MMF_HAS_UPROBES, &mm->flags)) {
-                       if (!filter_chain(uprobe,
-                                       UPROBE_FILTER_UNREGISTER, mm))
+                       if (!filter_chain(uprobe, mm))
                                err |= remove_breakpoint(uprobe, mm, info->vaddr);
                }
 
@@ -1387,7 +1383,7 @@ int uprobe_mmap(struct vm_area_struct *vma)
         */
        list_for_each_entry_safe(uprobe, u, &tmp_list, pending_list) {
                if (!fatal_signal_pending(current) &&
-                   filter_chain(uprobe, UPROBE_FILTER_MMAP, vma->vm_mm)) {
+                   filter_chain(uprobe, vma->vm_mm)) {
                        unsigned long vaddr = offset_to_vaddr(vma, uprobe->offset);
                        install_breakpoint(uprobe, vma->vm_mm, vma, vaddr);
                }

diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c
index 90cd30e9723ed069420785a8c53f5836263a3d97..c99bf06176025f164cba535af2e8682bca952827 100644 (file)
--- a/kernel/trace/bpf_trace.c
+++ b/kernel/trace/bpf_trace.c
@@ -3320,8 +3320,7 @@ static int uprobe_prog_run(struct bpf_uprobe *uprobe,
 }
 
 static bool
-uprobe_multi_link_filter(struct uprobe_consumer *con, enum uprobe_filter_ctx ctx,
-                        struct mm_struct *mm)
+uprobe_multi_link_filter(struct uprobe_consumer *con, struct mm_struct *mm)
 {
        struct bpf_uprobe *uprobe;
 

diff --git a/kernel/trace/trace_uprobe.c b/kernel/trace/trace_uprobe.c
index 52e76a73fa7ce48fea3f72cb4cd8b0e278bd0d9c..7eb79e0a535250dc75a7b40f710e9514a5b3894e 100644 (file)
--- a/kernel/trace/trace_uprobe.c
+++ b/kernel/trace/trace_uprobe.c
@@ -1078,9 +1078,7 @@ print_uprobe_event(struct trace_iterator *iter, int flags, struct trace_event *e
        return trace_handle_return(s);
 }
 
-typedef bool (*filter_func_t)(struct uprobe_consumer *self,
-                               enum uprobe_filter_ctx ctx,
-                               struct mm_struct *mm);
+typedef bool (*filter_func_t)(struct uprobe_consumer *self, struct mm_struct *mm);
 
 static int trace_uprobe_enable(struct trace_uprobe *tu, filter_func_t filter)
 {
@@ -1339,8 +1337,7 @@ static int uprobe_perf_open(struct trace_event_call *call,
        return err;
 }
 
-static bool uprobe_perf_filter(struct uprobe_consumer *uc,
-                               enum uprobe_filter_ctx ctx, struct mm_struct *mm)
+static bool uprobe_perf_filter(struct uprobe_consumer *uc, struct mm_struct *mm)
 {
        struct trace_uprobe_filter *filter;
        struct trace_uprobe *tu;
@@ -1426,7 +1423,7 @@ static void __uprobe_perf_func(struct trace_uprobe *tu,
 static int uprobe_perf_func(struct trace_uprobe *tu, struct pt_regs *regs,
                            struct uprobe_cpu_buffer **ucbp)
 {
-       if (!uprobe_perf_filter(&tu->consumer, 0, current->mm))
+       if (!uprobe_perf_filter(&tu->consumer, current->mm))
                return UPROBE_HANDLER_REMOVE;
 
        if (!is_ret_probe(tu))