diff mbox

[SRU,Trusty,1/3] sched/numa: Move task_numa_free() to __put_task_struct()

Message ID 1457791755-7266-2-git-send-email-gavin.guo@canonical.com
State New
Headers show

Commit Message

Gavin Guo March 12, 2016, 2:09 p.m. UTC 
From: Mike Galbraith <bitbucket@online.de>

BugLink: https://bugs.launchpad.net/bugs/1527643

Bad idea on -rt:

[  908.026136]  [<ffffffff8150ad6a>] rt_spin_lock_slowlock+0xaa/0x2c0
[  908.026145]  [<ffffffff8108f701>] task_numa_free+0x31/0x130
[  908.026151]  [<ffffffff8108121e>] finish_task_switch+0xce/0x100
[  908.026156]  [<ffffffff81509c0a>] thread_return+0x48/0x4ae
[  908.026160]  [<ffffffff8150a095>] schedule+0x25/0xa0
[  908.026163]  [<ffffffff8150ad95>] rt_spin_lock_slowlock+0xd5/0x2c0
[  908.026170]  [<ffffffff810658cf>] get_signal_to_deliver+0xaf/0x680
[  908.026175]  [<ffffffff8100242d>] do_signal+0x3d/0x5b0
[  908.026179]  [<ffffffff81002a30>] do_notify_resume+0x90/0xe0
[  908.026186]  [<ffffffff81513176>] int_signal+0x12/0x17
[  908.026193]  [<00007ff2a388b1d0>] 0x7ff2a388b1cf

and since upstream does not mind where we do this, be a bit nicer ...

Signed-off-by: Mike Galbraith <bitbucket@online.de>
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Cc: Mel Gorman <mgorman@suse.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1393568591.6018.27.camel@marge.simpson.net
Signed-off-by: Ingo Molnar <mingo@kernel.org>
(backported from commit 156654f491dd8d52687a5fbe1637f472a52ce75b)
Signed-off-by: Gavin Guo <gavin.guo@canonical.com>

Conflicts:
	kernel/sched/core.c
---
 kernel/fork.c       | 1 +
 kernel/sched/core.c | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)
diff mbox

Patch

diff --git a/kernel/fork.c b/kernel/fork.c
index 52651f1a6a5e..f5e5831b67c3 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -237,6 +237,7 @@  void __put_task_struct(struct task_struct *tsk)
 	WARN_ON(atomic_read(&tsk->usage));
 	WARN_ON(tsk == current);
 
+	task_numa_free(tsk);
 	security_task_free(tsk);
 	exit_creds(tsk);
 	delayacct_tsk_free(tsk);
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 42d354e60c3d..da8f1eab7f17 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -2037,7 +2037,6 @@  static void finish_task_switch(struct rq *rq, struct task_struct *prev)
 	if (mm)
 		mmdrop(mm);
 	if (unlikely(prev_state == TASK_DEAD)) {
-		task_numa_free(prev);
 
 		/*
 		 * Remove function-return probe instances associated with this