Skip to content

Commit

Permalink
freezer,sched: Do not restore saved_state of a thawed task
Browse files Browse the repository at this point in the history
It is possible for a task to be thawed multiple times when mixing the
*legacy* cgroup freezer and system-wide freezer. To do this, freeze the
cgroup, do system-wide freeze/thaw, then thaw the cgroup. When this
happens, then a stale saved_state can be written to the task's state
and cause task to hang indefinitely. Fix this by only trying to thaw
tasks that are actually frozen.

This change also has the marginal benefit avoiding unnecessary
wake_up_state(p, TASK_FROZEN) if we know the task is already thawed.
There is not possibility of time-of-compare/time-of-use race when we skip
the wake_up_state because entering/exiting TASK_FROZEN is guarded by
freezer_lock.

Fixes: 8f0eed4 ("freezer,sched: Use saved_state to reduce some spurious wakeups")
Signed-off-by: Elliot Berman <[email protected]>
Signed-off-by: Peter Zijlstra (Intel) <[email protected]>
Reviewed-by: Abhijeet Dharmapurikar <[email protected]>
Link: https://lore.kernel.org/r/20231120-freezer-state-multiple-thaws-v1-1-f2e1dd7ce5a2@quicinc.com
  • Loading branch information
eberman-quic authored and Peter Zijlstra committed Nov 29, 2023
1 parent 2cc14f5 commit 23ab79e
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion kernel/freezer.c
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ void __thaw_task(struct task_struct *p)
if (WARN_ON_ONCE(freezing(p)))
goto unlock;

if (task_call_func(p, __restore_freezer_state, NULL))
if (!frozen(p) || task_call_func(p, __restore_freezer_state, NULL))
goto unlock;

wake_up_state(p, TASK_FROZEN);
Expand Down

0 comments on commit 23ab79e

Please sign in to comment.