Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
From:   NeilBrown <neilb@suse.de>
Subject: [PATCH] sched: report correct state for TASK_IDLE | TASK_FREEZABLE
To:     Ingo Molnar <mingo@redhat.com>,
        Peter Zijlstra <peterz@infradead.org>,
        Juri Lelli <juri.lelli@redhat.com>,
        Vincent Guittot <vincent.guittot@linaro.org>
cc:     Dietmar Eggemann <dietmar.eggemann@arm.com>,
        Steven Rostedt <rostedt@goodmis.org>,
        Ben Segall <bsegall@google.com>, Mel Gorman <mgorman@suse.de>,
        Daniel Bristot de Oliveira <bristot@redhat.com>,
        Valentin Schneider <vschneid@redhat.com>,
        linux-kernel@vger.kernel.org, Chuck Lever <chuck.lever@oracle.com>,
        linux-nfs@vger.kernel.org
Date:   Wed, 30 Aug 2023 09:04:19 +1000
Message-id: <169335025927.5133.4781141800413736103@noble.neil.brown.name>
Precedence: bulk


task_state_index() ignores uninteresting state flags (such as
TASK_FREEZABLE) for most states, but for TASK_IDLE and TASK_RTLOCK_WAIT
it does not.
So if a task is waiting TASK_IDLE|TASK_FREEZABLE it gets incorrectly
reported as TASK_UNINTERRUPTIBLE or "D".  (it is planned for nfsd to
change to use this state).

Fix this by only testing the interesting bits and not the irrelevant
bits in __task_state_index()

Signed-off-by: NeilBrown <neilb@suse.de>
---
 include/linux/sched.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/linux/sched.h b/include/linux/sched.h
index 177b3f3676ef..c0a21a3b106c 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -1671,7 +1671,7 @@ static inline unsigned int __task_state_index(unsigned =
int tsk_state,
=20
 	BUILD_BUG_ON_NOT_POWER_OF_2(TASK_REPORT_MAX);
=20
-	if (tsk_state =3D=3D TASK_IDLE)
+	if ((tsk_state & TASK_IDLE) =3D=3D TASK_IDLE)
 		state =3D TASK_REPORT_IDLE;
=20
 	/*
@@ -1679,7 +1679,7 @@ static inline unsigned int __task_state_index(unsigned =
int tsk_state,
 	 * to userspace, we can make this appear as if the task has gone through
 	 * a regular rt_mutex_lock() call.
 	 */
-	if (tsk_state =3D=3D TASK_RTLOCK_WAIT)
+	if (tsk_state & TASK_RTLOCK_WAIT)
 		state =3D TASK_UNINTERRUPTIBLE;
=20
 	return fls(state);
--=20
2.41.0