diff options
author | 2022-08-22 13:18:19 +0200 | |
---|---|---|
committer | 2022-09-07 21:53:48 +0200 | |
commit | 9204a97f7ae862fc8a3330ec8335917534c3fb63 (patch) | |
tree | 6a0fff82fb0b537c80adcbef5d0c0c26bdbe2d7c /kernel/sched/core.c | |
parent | freezer,umh: Clean up freezer/initrd interaction (diff) | |
download | linux-9204a97f7ae862fc8a3330ec8335917534c3fb63.tar.gz linux-9204a97f7ae862fc8a3330ec8335917534c3fb63.tar.bz2 linux-9204a97f7ae862fc8a3330ec8335917534c3fb63.zip |
sched: Change wait_task_inactive()s match_state
Make wait_task_inactive()'s @match_state work like ttwu()'s @state.
That is, instead of an equal comparison, use it as a mask. This allows
matching multiple block conditions.
(removes the unlikely; it doesn't make sense how it's only part of the
condition)
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lore.kernel.org/r/20220822114648.856734578@infradead.org
Diffstat (limited to 'kernel/sched/core.c')
-rw-r--r-- | kernel/sched/core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 163018105bf8..43d71c696125 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -3294,7 +3294,7 @@ unsigned long wait_task_inactive(struct task_struct *p, unsigned int match_state * is actually now running somewhere else! */ while (task_on_cpu(rq, p)) { - if (match_state && unlikely(READ_ONCE(p->__state) != match_state)) + if (match_state && !(READ_ONCE(p->__state) & match_state)) return 0; cpu_relax(); } @@ -3309,7 +3309,7 @@ unsigned long wait_task_inactive(struct task_struct *p, unsigned int match_state running = task_on_cpu(rq, p); queued = task_on_rq_queued(p); ncsw = 0; - if (!match_state || READ_ONCE(p->__state) == match_state) + if (!match_state || (READ_ONCE(p->__state) & match_state)) ncsw = p->nvcsw | LONG_MIN; /* sets MSB */ task_rq_unlock(rq, p, &rf); |