From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D05B48494 for ; Sun, 29 Dec 2024 09:16:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735463793; cv=none; b=fvDPtVchLkF/IiLcrUJ4LYjQD7zs4jleU/72kRb0bIUvEYSNsbUigpjUQRa/62H5pCW1FWUPc9PfVLCF+AWQ2jAkvC8IA5kEBgvXXBCClEDj4KKGxM0EoHutaX+YX/g64+6KcIqVQvM6ogR6Nu/gWYvKVRkELUkyodYejYZ+VE0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1735463793; c=relaxed/simple; bh=Yq0lkhgn4lDGQUv6Kn6GAfjF0sLHgp41vdfKpyopul0=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type: Content-Disposition; b=Zw6mQQBCvYXeJpldYUSifRZCJaGFe+PireKO0Ce5OHzjXfTu29XNQL2xaicguDtBX0JNuH9yLEUqYtwbjO9uRLiQ8S6kxXctrZmOz10yaYeMhQ/EANZjAT7WRv/u72VepR40CThrgzfpfQANV2M3HNeQeCHc67dzkYr53GI4tqY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ANXxkDZ0; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="ANXxkDZ0" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 63BE1C4CED1; Sun, 29 Dec 2024 09:16:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1735463793; bh=Yq0lkhgn4lDGQUv6Kn6GAfjF0sLHgp41vdfKpyopul0=; h=Date:From:To:Cc:Subject:From; b=ANXxkDZ0X4vOSMXrPZn/fvN9WFgnkhO4EdOwuW8TdOd1A3YqtQCWhe10iurb7iejy uTLjAv5aAoqLJU8xzSDNtWRrDScgVVYE2Gp2nnfKMqyaNF89Y6L6xH15/R4bYxwgLl PAVBeAiYuqfDQ6dh1jtZ47I470JFSHLHJPapA0bcTKmN5uKSmt6gTnuYiVayJ11jVp anuvRkwmydphtZ9FoFg8tB31UZrtVdgA5bI8wsjRb8Q18jZBa+LccHB8Rdl3bCJsi7 HA51PBvZGRIepAkl+6N2/vnL789ipcbGXsRCa3ieJn31KeT/oNk93dn+/1Do/fMyKO jmHzRdP0Ct+RA== Date: Sun, 29 Dec 2024 10:16:28 +0100 From: Ingo Molnar To: Linus Torvalds Cc: linux-kernel@vger.kernel.org, Peter Zijlstra , Juri Lelli , Vincent Guittot , Dietmar Eggemann , Steven Rostedt , Ben Segall , Mel Gorman , Daniel Bristot de Oliveira , Valentin Schneider , Thomas Gleixner , Andrew Morton Subject: [GIT PULL] scheduler fix Message-ID: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline 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(-) diff --git a/include/linux/sched.h b/include/linux/sched.h index 66b311fbd5d6..64934e0830af 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -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);