mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-02 15:18:19 +00:00
kernel/trace: Fix do not unregister tracepoints when register sched_migrate_task fail
commit50f9ad607e
upstream. In the function, if register_trace_sched_migrate_task() returns error, sched_switch/sched_wakeup_new/sched_wakeup won't unregister. That is why fail_deprobe_sched_switch was added. Link: http://lkml.kernel.org/r/20191231133530.2794-1-pilgrimtao@gmail.com Cc: stable@vger.kernel.org Fixes:478142c39c
("tracing: do not grab lock in wakeup latency function tracing") Signed-off-by: Kaitao Cheng <pilgrimtao@gmail.com> Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
cfa719c2cc
commit
654eced27a
1 changed files with 3 additions and 1 deletions
|
@ -630,7 +630,7 @@ static void start_wakeup_tracer(struct trace_array *tr)
|
|||
if (ret) {
|
||||
pr_info("wakeup trace: Couldn't activate tracepoint"
|
||||
" probe to kernel_sched_migrate_task\n");
|
||||
return;
|
||||
goto fail_deprobe_sched_switch;
|
||||
}
|
||||
|
||||
wakeup_reset(tr);
|
||||
|
@ -648,6 +648,8 @@ static void start_wakeup_tracer(struct trace_array *tr)
|
|||
printk(KERN_ERR "failed to start wakeup tracer\n");
|
||||
|
||||
return;
|
||||
fail_deprobe_sched_switch:
|
||||
unregister_trace_sched_switch(probe_wakeup_sched_switch, NULL);
|
||||
fail_deprobe_wake_new:
|
||||
unregister_trace_sched_wakeup_new(probe_wakeup, NULL);
|
||||
fail_deprobe:
|
||||
|
|
Loading…
Reference in a new issue