mirror of
https://github.com/linuxkit/linuxkit.git
synced 2025-07-31 22:47:12 +00:00
73 lines
2.1 KiB
Diff
73 lines
2.1 KiB
Diff
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
|
Date: Mon, 21 Nov 2016 19:31:08 +0100
|
|
Subject: [PATCH] kernel/sched: move stack + kprobe clean up to
|
|
__put_task_struct()
|
|
|
|
There is no need to free the stack before the task struct (except for reasons
|
|
mentioned in commit 68f24b08ee89 ("sched/core: Free the stack early if
|
|
CONFIG_THREAD_INFO_IN_TASK")). This also comes handy on -RT because we can't
|
|
free memory in preempt disabled region.
|
|
vfree_atomic() delays the memory cleanup to a worker. Since we move everything
|
|
to the RCU callback, we can also free it immediately.
|
|
|
|
Cc: stable-rt@vger.kernel.org #for kprobe_flush_task()
|
|
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
|
---
|
|
kernel/fork.c | 12 +++++++++++-
|
|
kernel/sched/core.c | 9 ---------
|
|
2 files changed, 11 insertions(+), 10 deletions(-)
|
|
|
|
--- a/kernel/fork.c
|
|
+++ b/kernel/fork.c
|
|
@@ -42,6 +42,7 @@
|
|
#include <linux/mmu_notifier.h>
|
|
#include <linux/fs.h>
|
|
#include <linux/mm.h>
|
|
+#include <linux/kprobes.h>
|
|
#include <linux/vmacache.h>
|
|
#include <linux/nsproxy.h>
|
|
#include <linux/capability.h>
|
|
@@ -288,7 +289,7 @@ static inline void free_thread_stack(str
|
|
return;
|
|
}
|
|
|
|
- vfree_atomic(tsk->stack);
|
|
+ vfree(tsk->stack);
|
|
return;
|
|
}
|
|
#endif
|
|
@@ -743,6 +744,15 @@ void __put_task_struct(struct task_struc
|
|
WARN_ON(refcount_read(&tsk->usage));
|
|
WARN_ON(tsk == current);
|
|
|
|
+ /*
|
|
+ * Remove function-return probe instances associated with this
|
|
+ * task and put them back on the free list.
|
|
+ */
|
|
+ kprobe_flush_task(tsk);
|
|
+
|
|
+ /* Task is done with its stack. */
|
|
+ put_task_stack(tsk);
|
|
+
|
|
io_uring_free(tsk);
|
|
cgroup_free(tsk);
|
|
task_numa_free(tsk, true);
|
|
--- a/kernel/sched/core.c
|
|
+++ b/kernel/sched/core.c
|
|
@@ -4284,15 +4284,6 @@ static struct rq *finish_task_switch(str
|
|
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);
|
|
-
|
|
put_task_struct_rcu_user(prev);
|
|
}
|
|
|