stable.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v2] hung_task : check the value of "sysctl_hung_task_timeout_sec"
@ 2014-03-23  7:54 Liu Hua
  2014-03-23 20:50 ` Satoru Takeuchi
  0 siblings, 1 reply; 6+ messages in thread
From: Liu Hua @ 2014-03-23  7:54 UTC (permalink / raw)
  To: paul.gortmaker
  Cc: mingo, wangnan0, linux-kernel, peifeiyue, lizefan, Liu Hua,
	stable

As sysctl_hung_task_timeout_sec is unsigned long, when this value is
larger then LONG_MAX/HZ, the function schedule_timeout_interruptible in
watchdog will return immediately without sleep and with print :

[  205.452934] schedule_timeout: wrong timeout value ffffffffffffff83

and then the funtion watchdog will call schedule_timeout_interruptible again
and again. The screen will be filled with
	"schedule_timeout: wrong timeout value ffffffffffffff83"

This patch does some check and correction in timeout_jiffies, to let the
function schedule_timeout_interruptible allways get the valid parameter.

Cc: <stable@vger.kernel.org>
Signed-off-by: Liu Hua <sdu.liu@huawei.com>
---
 kernel/hung_task.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/kernel/hung_task.c b/kernel/hung_task.c
index 6df6149..f992286 100644
--- a/kernel/hung_task.c
+++ b/kernel/hung_task.c
@@ -174,8 +174,12 @@ static void check_hung_uninterruptible_tasks(unsigned long timeout)
 
 static unsigned long timeout_jiffies(unsigned long timeout)
 {
-	/* timeout of 0 will disable the watchdog */
-	return timeout ? timeout * HZ : MAX_SCHEDULE_TIMEOUT;
+	/* timeout of 0 or >= LONG_MAX/HZ will disable the watchdog */
+	if ((timeout == 0) || (timeout > MAX_SCHEDULE_TIMEOUT))
+		return MAX_SCHEDULE_TIMEOUT;
+
+	return (timeout * HZ) < MAX_SCHEDULE_TIMEOUT ?
+			timeout * HZ : MAX_SCHEDULE_TIMEOUT;
 }
 
 /*
-- 
1.9.0


^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2014-03-28 11:56 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-03-23  7:54 [PATCH v2] hung_task : check the value of "sysctl_hung_task_timeout_sec" Liu Hua
2014-03-23 20:50 ` Satoru Takeuchi
2014-03-25  8:58   ` Liu hua
2014-03-25 16:25     ` Satoru Takeuchi
2014-03-26  7:56       ` Liu hua
2014-03-28 11:56         ` Satoru Takeuchi

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).