Merge tag 'net-next-6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev...

[platform/kernel/linux-rpi.git] / kernel / bpf / trampoline.c

diff --git a/kernel/bpf/trampoline.c b/kernel/bpf/trampoline.c
index f61d513..ac021bc 100644 (file)
--- a/kernel/bpf/trampoline.c
+++ b/kernel/bpf/trampoline.c
@@ -44,8 +44,8 @@ static int bpf_tramp_ftrace_ops_func(struct ftrace_ops *ops, enum ftrace_ops_cmd
                lockdep_assert_held_once(&tr->mutex);
 
                /* Instead of updating the trampoline here, we propagate
-                * -EAGAIN to register_ftrace_direct_multi(). Then we can
-                * retry register_ftrace_direct_multi() after updating the
+                * -EAGAIN to register_ftrace_direct(). Then we can
+                * retry register_ftrace_direct() after updating the
                 * trampoline.
                 */
                if ((tr->flags & BPF_TRAMP_F_CALL_ORIG) &&
@@ -177,7 +177,7 @@ static int unregister_fentry(struct bpf_trampoline *tr, void *old_addr)
        int ret;
 
        if (tr->func.ftrace_managed)
-               ret = unregister_ftrace_direct_multi(tr->fops, (long)old_addr);
+               ret = unregister_ftrace_direct(tr->fops, (long)old_addr, false);
        else
                ret = bpf_arch_text_poke(ip, BPF_MOD_CALL, old_addr, NULL);
 
@@ -192,9 +192,9 @@ static int modify_fentry(struct bpf_trampoline *tr, void *old_addr, void *new_ad
 
        if (tr->func.ftrace_managed) {
                if (lock_direct_mutex)
-                       ret = modify_ftrace_direct_multi(tr->fops, (long)new_addr);
+                       ret = modify_ftrace_direct(tr->fops, (long)new_addr);
                else
-                       ret = modify_ftrace_direct_multi_nolock(tr->fops, (long)new_addr);
+                       ret = modify_ftrace_direct_nolock(tr->fops, (long)new_addr);
        } else {
                ret = bpf_arch_text_poke(ip, BPF_MOD_CALL, old_addr, new_addr);
        }
@@ -217,7 +217,7 @@ static int register_fentry(struct bpf_trampoline *tr, void *new_addr)
 
        if (tr->func.ftrace_managed) {
                ftrace_set_filter_ip(tr->fops, (unsigned long)ip, 0, 1);
-               ret = register_ftrace_direct_multi(tr->fops, (long)new_addr);
+               ret = register_ftrace_direct(tr->fops, (long)new_addr);
        } else {
                ret = bpf_arch_text_poke(ip, BPF_MOD_CALL, NULL, new_addr);
        }