Revision 6e2df0581f569038719cf2bc2b3baa3fcc83cab4 authored by Peter Zijlstra on 08 November 2019, 10:11:52 UTC, committed by Peter Zijlstra on 08 November 2019, 21:34:14 UTC
Commit 67692435c411 ("sched: Rework pick_next_task() slow-path")
inadvertly introduced a race because it changed a previously
unexplored dependency between dropping the rq->lock and
sched_class::put_prev_task().

The comments about dropping rq->lock, in for example
newidle_balance(), only mentions the task being current and ->on_cpu
being set. But when we look at the 'change' pattern (in for example
sched_setnuma()):

	queued = task_on_rq_queued(p); /* p->on_rq == TASK_ON_RQ_QUEUED */
	running = task_current(rq, p); /* rq->curr == p */

	if (queued)
		dequeue_task(...);
	if (running)
		put_prev_task(...);

	/* change task properties */

	if (queued)
		enqueue_task(...);
	if (running)
		set_next_task(...);

It becomes obvious that if we do this after put_prev_task() has
already been called on @p, things go sideways. This is exactly what
the commit in question allows to happen when it does:

	prev->sched_class->put_prev_task(rq, prev, rf);
	if (!rq->nr_running)
		newidle_balance(rq, rf);

The newidle_balance() call will drop rq->lock after we've called
put_prev_task() and that allows the above 'change' pattern to
interleave and mess up the state.

Furthermore, it turns out we lost the RT-pull when we put the last DL
task.

Fix both problems by extracting the balancing from put_prev_task() and
doing a multi-class balance() pass before put_prev_task().

Fixes: 67692435c411 ("sched: Rework pick_next_task() slow-path")
Reported-by: Quentin Perret <qperret@google.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Tested-by: Quentin Perret <qperret@google.com>
Tested-by: Valentin Schneider <valentin.schneider@arm.com>
1 parent e3b8b6a
History
File Mode Size
Kconfig -rw-r--r-- 3.0 KB
Makefile -rw-r--r-- 439 bytes
acl.c -rw-r--r-- 8.9 KB
acl.h -rw-r--r-- 1.0 KB
checkpoint.c -rw-r--r-- 40.7 KB
data.c -rw-r--r-- 76.9 KB
debug.c -rw-r--r-- 18.4 KB
dir.c -rw-r--r-- 26.6 KB
extent_cache.c -rw-r--r-- 19.7 KB
f2fs.h -rw-r--r-- 117.0 KB
file.c -rw-r--r-- 81.4 KB
gc.c -rw-r--r-- 38.6 KB
gc.h -rw-r--r-- 2.9 KB
hash.c -rw-r--r-- 2.8 KB
inline.c -rw-r--r-- 17.5 KB
inode.c -rw-r--r-- 21.8 KB
namei.c -rw-r--r-- 29.6 KB
node.c -rw-r--r-- 76.3 KB
node.h -rw-r--r-- 12.2 KB
recovery.c -rw-r--r-- 19.2 KB
segment.c -rw-r--r-- 115.6 KB
segment.h -rw-r--r-- 26.0 KB
shrinker.c -rw-r--r-- 3.1 KB
super.c -rw-r--r-- 97.1 KB
sysfs.c -rw-r--r-- 21.8 KB
trace.c -rw-r--r-- 3.4 KB
trace.h -rw-r--r-- 859 bytes
verity.c -rw-r--r-- 6.6 KB
xattr.c -rw-r--r-- 18.5 KB
xattr.h -rw-r--r-- 4.9 KB

back to top