]> git.baikalelectronics.ru Git - kernel.git/commitdiff
ftrace: Add cleanup to unregister_ftrace_direct_multi
authorJiri Olsa <jolsa@redhat.com>
Mon, 6 Dec 2021 18:20:31 +0000 (19:20 +0100)
committerSteven Rostedt (VMware) <rostedt@goodmis.org>
Wed, 8 Dec 2021 17:12:02 +0000 (12:12 -0500)
Adding ops cleanup to unregister_ftrace_direct_multi,
so it can be reused in another register call.

Link: https://lkml.kernel.org/r/20211206182032.87248-3-jolsa@kernel.org
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Heiko Carstens <hca@linux.ibm.com>
Fixes: f64dd4627ec6 ("ftrace: Add multi direct register/unregister interface")
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
kernel/trace/ftrace.c

index 7f0594e2822600ee37525203580b6312211b9623..be5f6b32a01221398693a57069786c975f2a1b60 100644 (file)
@@ -5542,6 +5542,10 @@ int unregister_ftrace_direct_multi(struct ftrace_ops *ops, unsigned long addr)
        err = unregister_ftrace_function(ops);
        remove_direct_functions_hash(hash, addr);
        mutex_unlock(&direct_mutex);
+
+       /* cleanup for possible another register call */
+       ops->func = NULL;
+       ops->trampoline = 0;
        return err;
 }
 EXPORT_SYMBOL_GPL(unregister_ftrace_direct_multi);