Skip to contentSkip to conversation

scheduler fix

GIT PULL Merged Ingo Molnar 2 participants 2 messages Dec 29, 2024 Scheduler

lore
Share & tools
lore

Ingo Molnar

author
#0 lore raw

Linus,

Please pull the latest sched/urgent Git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git sched-urgent-2024-12-29

# HEAD: f718faf3940e95d5d34af9041f279f598396ab7d freezer, sched: Report frozen tasks as 'D' instead of 'R'

Fix a procfs task state reporting regression when freezing sleeping tasks.

Thanks,

Ingo

------------------>
Chen Ridong (1):
freezer, sched: Report frozen tasks as 'D' instead of 'R'

 include/linux/sched.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
include/linux/sched.h +2 -1
index 66b311fbd5d6..64934e0830af 100644
@@ -1637,8 +1637,9 @@ static inline unsigned int __task_state_index(unsigned int tsk_state,
 	 * We're lying here, but rather than expose a completely new task state
 	 * to userspace, we can make this appear as if the task has gone through
 	 * a regular rt_mutex_lock() call.
+	 * Report frozen tasks as uninterruptible.
 	 */
-	if (tsk_state & TASK_RTLOCK_WAIT)
+	if ((tsk_state & TASK_RTLOCK_WAIT) || (tsk_state & TASK_FROZEN))
 		state = TASK_UNINTERRUPTIBLE;
 
 	return fls(state);
merge bot Merged
#1 lore raw
The pull request you sent on Sun, 29 Dec 2024 10:16:28 +0100:

The pull request you sent on Sun, 29 Dec 2024 10:16:28 +0100:

Quoted 1 line

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git sched-urgent-2024-12-29

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/4099a71718b056d16af5ba095c91016c3b107862

Thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html