Skip to content

Commit cff5f49

Browse files
timvpGooglehtejun
authored andcommitted
cgroup_freezer: cgroup_freezing: Check if not frozen
__thaw_task() was recently updated to warn if the task being thawed was part of a freezer cgroup that is still currently freezing: void __thaw_task(struct task_struct *p) { ... if (WARN_ON_ONCE(freezing(p))) goto unlock; This has exposed a bug in cgroup1 freezing where when CGROUP_FROZEN is asserted, the CGROUP_FREEZING bits are not also cleared at the same time. Meaning, when a cgroup is marked FROZEN it continues to be marked FREEZING as well. This causes the WARNING to trigger, because cgroup_freezing() thinks the cgroup is still freezing. There are two ways to fix this: 1. Whenever FROZEN is set, clear FREEZING for the cgroup and all children cgroups. 2. Update cgroup_freezing() to also verify that FROZEN is not set. This patch implements option (2), since it's smaller and more straightforward. Signed-off-by: Tim Van Patten <timvp@google.com> Tested-by: Mark Hasemeyer <markhas@chromium.org> Fixes: f5d39b0 ("freezer,sched: Rewrite core freezer logic") Cc: stable@vger.kernel.org # v6.1+ Signed-off-by: Tejun Heo <tj@kernel.org>
1 parent 037266a commit cff5f49

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

kernel/cgroup/legacy_freezer.c

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,15 @@ static struct freezer *parent_freezer(struct freezer *freezer)
6666
bool cgroup_freezing(struct task_struct *task)
6767
{
6868
bool ret;
69+
unsigned int state;
6970

7071
rcu_read_lock();
71-
ret = task_freezer(task)->state & CGROUP_FREEZING;
72+
/* Check if the cgroup is still FREEZING, but not FROZEN. The extra
73+
* !FROZEN check is required, because the FREEZING bit is not cleared
74+
* when the state FROZEN is reached.
75+
*/
76+
state = task_freezer(task)->state;
77+
ret = (state & CGROUP_FREEZING) && !(state & CGROUP_FROZEN);
7278
rcu_read_unlock();
7379

7480
return ret;

0 commit comments

Comments
 (0)