Skip to content

Commit

Permalink
sched: Move kprobes cleanup out of finish_task_switch()
Browse files Browse the repository at this point in the history
Doing cleanups in the tail of schedule() is a latency punishment for the
incoming task. The point of invoking kprobes_task_flush() for a dead task
is that the instances are returned and cannot leak when __schedule() is
kprobed.

Move it into the delayed cleanup.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/20210928122411.537994026@linutronix.de
  • Loading branch information
Thomas Gleixner authored and Peter Zijlstra committed Oct 5, 2021
1 parent 539fbb5 commit 670721c
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 10 deletions.
2 changes: 2 additions & 0 deletions kernel/exit.c
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@
#include <linux/rcuwait.h>
#include <linux/compat.h>
#include <linux/io_uring.h>
#include <linux/kprobes.h>

#include <linux/uaccess.h>
#include <asm/unistd.h>
Expand Down Expand Up @@ -168,6 +169,7 @@ static void delayed_put_task_struct(struct rcu_head *rhp)
{
struct task_struct *tsk = container_of(rhp, struct task_struct, rcu);

kprobe_flush_task(tsk);
perf_event_delayed_put(tsk);
trace_sched_process_free(tsk);
put_task_struct(tsk);
Expand Down
8 changes: 4 additions & 4 deletions kernel/kprobes.c
Original file line number Diff line number Diff line change
Expand Up @@ -1250,10 +1250,10 @@ void kprobe_busy_end(void)
}

/*
* This function is called from finish_task_switch when task tk becomes dead,
* so that we can recycle any function-return probe instances associated
* with this task. These left over instances represent probed functions
* that have been called but will never return.
* This function is called from delayed_put_task_struct() when a task is
* dead and cleaned up to recycle any function-return probe instances
* associated with this task. These left over instances represent probed
* functions that have been called but will never return.
*/
void kprobe_flush_task(struct task_struct *tk)
{
Expand Down
6 changes: 0 additions & 6 deletions kernel/sched/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -4846,12 +4846,6 @@ static struct rq *finish_task_switch(struct task_struct *prev)
if (prev->sched_class->task_dead)
prev->sched_class->task_dead(prev);

/*
* Remove function-return probe instances associated with this
* task and put them back on the free list.
*/
kprobe_flush_task(prev);

/* Task is done with its stack. */
put_task_stack(prev);

Expand Down

0 comments on commit 670721c

Please sign in to comment.