From: Peter Zijlstra <peterz@infradead.org>
To: Paul Burton <paul.burton@mips.com>
Cc: linux-kernel@vger.kernel.org,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>,
Paul McKenney <paulmck@linux.vnet.ibm.com>,
Tejun Heo <tj@kernel.org>
Subject: Re: [PATCH 1/2] sched: Make select_task_rq() require cpu_active() for user tasks
Date: Mon, 28 May 2018 16:49:24 +0200 [thread overview]
Message-ID: <20180528144924.GE12217@hirez.programming.kicks-ass.net> (raw)
In-Reply-To: <20180526154648.11635-2-paul.burton@mips.com>
On Sat, May 26, 2018 at 08:46:47AM -0700, Paul Burton wrote:
> --- a/kernel/sched/core.c
> +++ b/kernel/sched/core.c
> @@ -1565,7 +1565,8 @@ int select_task_rq(struct task_struct *p, int cpu, int sd_flags, int wake_flags)
> * not worry about this generic constraint ]
> */
> if (unlikely(!cpumask_test_cpu(cpu, &p->cpus_allowed) ||
> - !cpu_online(cpu)))
> + !cpu_online(cpu) ||
> + (!cpu_active(cpu) && !(p->flags & PF_KTHREAD))))
> cpu = select_fallback_rq(task_cpu(p), p);
That is not quite right.. and I find that the wrong patch:
955dbdf4ce87 ("sched: Allow migrating kthreads into online but inactive CPUs")
got merged over my suggested alternative :-(
http://lkml.kernel.org/r/20170725165821.cejhb7v2s3kecems@hirez.programming.kicks-ass.net
So, lets first fix that, and then your patch becomes something like the
below I think.
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -1562,7 +1562,7 @@ int select_task_rq(struct task_struct *p
* not worry about this generic constraint ]
*/
if (unlikely(!cpumask_test_cpu(cpu, &p->cpus_allowed) ||
- !cpu_online(cpu)))
+ (is_per_cpu_kthread(p) ? !cpu_online(cpu) : !cpu_active(cpu)))
cpu = select_fallback_rq(task_cpu(p), p);
return cpu;
next prev parent reply other threads:[~2018-05-28 14:49 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-26 15:46 [PATCH 0/2] sched: Fix a race between CPU onlining & user task scheduling Paul Burton
2018-05-26 15:46 ` [PATCH 1/2] sched: Make select_task_rq() require cpu_active() for user tasks Paul Burton
2018-05-28 14:49 ` Peter Zijlstra [this message]
2018-05-28 15:45 ` Paul Burton
2018-05-28 15:53 ` Peter Zijlstra
2018-05-28 16:10 ` Paul Burton
2018-05-31 12:28 ` [tip:sched/urgent] sched/core: Require cpu_active() in select_task_rq(), " tip-bot for Paul Burton
2018-05-26 15:46 ` [PATCH 2/2] sched: Warn if we fail to migrate a task Paul Burton
2018-05-28 15:06 ` Peter Zijlstra
2018-05-28 15:59 ` Paul Burton
2018-05-29 10:40 ` Peter Zijlstra
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=20180528144924.GE12217@hirez.programming.kicks-ass.net \
--to=peterz@infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=paul.burton@mips.com \
--cc=paulmck@linux.vnet.ibm.com \
--cc=tglx@linutronix.de \
--cc=tj@kernel.org \
/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