Skip to content

Commit f718faf

Browse files
Chen RidongIngo Molnar
authored andcommitted
freezer, sched: Report frozen tasks as 'D' instead of 'R'
Before commit: f5d39b0 ("freezer,sched: Rewrite core freezer logic") the frozen task stat was reported as 'D' in cgroup v1. However, after rewriting the core freezer logic, the frozen task stat is reported as 'R'. This is confusing, especially when a task with stat of 'S' is frozen. This bug can be reproduced with these steps: $ cd /sys/fs/cgroup/freezer/ $ mkdir test $ sleep 1000 & [1] 739 // task whose stat is 'S' $ echo 739 > test/cgroup.procs $ echo FROZEN > test/freezer.state $ ps -aux | grep 739 root 739 0.1 0.0 8376 1812 pts/0 R 10:56 0:00 sleep 1000 As shown above, a task whose stat is 'S' was changed to 'R' when it was frozen. To solve this regression, simply maintain the same reported state as before the rewrite. [ mingo: Enhanced the changelog and comments ] Fixes: f5d39b0 ("freezer,sched: Rewrite core freezer logic") Signed-off-by: Chen Ridong <chenridong@huawei.com> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Signed-off-by: Ingo Molnar <mingo@kernel.org> Acked-by: Tejun Heo <tj@kernel.org> Acked-by: Michal Koutný <mkoutny@suse.com> Link: https://lore.kernel.org/r/20241217004818.3200515-1-chenridong@huaweicloud.com
1 parent 78d4f34 commit f718faf

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

include/linux/sched.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1637,8 +1637,9 @@ static inline unsigned int __task_state_index(unsigned int tsk_state,
16371637
* We're lying here, but rather than expose a completely new task state
16381638
* to userspace, we can make this appear as if the task has gone through
16391639
* a regular rt_mutex_lock() call.
1640+
* Report frozen tasks as uninterruptible.
16401641
*/
1641-
if (tsk_state & TASK_RTLOCK_WAIT)
1642+
if ((tsk_state & TASK_RTLOCK_WAIT) || (tsk_state & TASK_FROZEN))
16421643
state = TASK_UNINTERRUPTIBLE;
16431644

16441645
return fls(state);

0 commit comments

Comments
 (0)