diff options
| author | Peter Zijlstra <peterz@infradead.org> | 2026-05-26 11:32:34 +0200 |
|---|---|---|
| committer | Peter Zijlstra <peterz@infradead.org> | 2026-06-02 12:26:08 +0200 |
| commit | 708024b575b4ea58c5956e7c09f2d2f48facd478 (patch) | |
| tree | a1449552f56f076f79e27d2940b67a6154f329ca | |
| parent | abc40cca0efdf5ba28b7bc37f1db445a8cc840bd (diff) | |
sched: Be more strict about p->is_blocked
Upon entry to try_to_block_task(), p->is_blocked should be false. After all,
the prior wakeup would have made it so per ttwu_do_wakeup().
Ensure this is the case, rather than clearing it in the path that doesn't set
it.
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: John Stultz <jstultz@google.com>
Link: https://patch.msgid.link/20260526113322.364017314%40infradead.org
| -rw-r--r-- | kernel/sched/core.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/sched/core.c b/kernel/sched/core.c index a06d5a57adc8..8b7eb126c254 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -6676,8 +6676,9 @@ static bool try_to_block_task(struct rq *rq, struct task_struct *p, { unsigned long task_state = *task_state_p; + WARN_ON_ONCE(p->is_blocked); + if (signal_pending_state(task_state, p)) { - p->is_blocked = 0; WRITE_ONCE(p->__state, TASK_RUNNING); *task_state_p = TASK_RUNNING; clear_task_blocked_on(p, NULL); |