From: Rusty Russell <rusty@rustcorp.com.au>
To: Ingo Molnar <mingo@elte.hu>
Cc: Mike Travis <travis@sgi.com>, linux-kernel@vger.kernel.org
Subject: [PATCH 3/3] Fix locking error caused by e76bd8d9850c2296a7e8e24c9dce9b5e6b55fe2f
Date: Tue, 25 Nov 2008 09:59:20 +1030 [thread overview]
Message-ID: <200811250959.20652.rusty@rustcorp.com.au> (raw)
In-Reply-To: <200811250958.41573.rusty@rustcorp.com.au>
We can't call cpuset_cpus_allowed_locked() with the rq lock held.
However, the rq lock merely protects us from (1) cpu_online_mask changing
and (2) someone else changing p->cpus_allowed.
The first can't happen because we're being called from a cpu hotplug
notifier. The second doesn't really matter: we are forcing the task off
a CPU it was affine to, so we're not doing very well anyway.
So we remove the rq lock from this path, and all is good.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
diff --git a/kernel/sched.c b/kernel/sched.c
index 1aa840a..7acf95f 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -6126,7 +6126,6 @@ static int __migrate_task_irq(struct task_struct *p, int src_cpu, int
dest_cpu)
*/
static void move_task_off_dead_cpu(int dead_cpu, struct task_struct *p)
{
- unsigned long flags;
struct rq *rq;
int dest_cpu;
/* FIXME: Use cpumask_of_node here. */
@@ -6146,10 +6145,8 @@ again:
/* No more Mr. Nice Guy. */
if (dest_cpu >= nr_cpu_ids) {
- rq = task_rq_lock(p, &flags);
cpuset_cpus_allowed_locked(p, &p->cpus_allowed);
dest_cpu = cpumask_any_and(cpu_online_mask, &p->cpus_allowed);
- task_rq_unlock(rq, &flags);
/*
* Don't tell them about moving exiting tasks or
next prev parent reply other threads:[~2008-11-24 23:32 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-11-24 16:08 [PULL] cpumask conversion patches for sched Rusty Russell
2008-11-24 17:17 ` Ingo Molnar
2008-11-24 17:22 ` Ingo Molnar
2008-11-24 17:23 ` Ingo Molnar
2008-11-24 19:19 ` [PATCH] sched: fix-local_cpu_mask Mike Travis
2008-11-25 15:10 ` Mike Travis
2008-11-24 23:27 ` [PULL] cpumask conversion patches for sched Rusty Russell
2008-11-26 6:59 ` Ingo Molnar
2008-11-24 23:27 ` [PATCH 1/3] Fix commits 7d1e6a9b and dcc30a35 for UP build Rusty Russell
2008-11-24 23:28 ` [PATCH 2/3] Fix commit 0e3900e6 " Rusty Russell
2008-11-24 23:29 ` Rusty Russell [this message]
2008-11-25 16:52 ` [PATCH 3/3] Fix locking error caused by e76bd8d9850c2296a7e8e24c9dce9b5e6b55fe2f Mike Travis
2008-11-25 16:55 ` [PATCH 1/1] Slight fix for locking-fix patch to remove compiler warning Mike Travis
2008-11-26 7:56 ` Rusty Russell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200811250959.20652.rusty@rustcorp.com.au \
--to=rusty@rustcorp.com.au \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=travis@sgi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox