Skip to contentSkip to conversation

hung_task: change sysctl_hung_task_check_count to int

PATCH Superseded Li Zefan 2 participants 4 messages Sep 14, 2013

Subsystems (2)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Li Zefan

author
#0 lore raw

PATCH 1/1 hung_task: change sysctl_hung_task_check_count to int

As sysctl_hung_task_check_count is unsigned long, when this value is assigned to max_count in check_hung_uninterruptible_tasks(), it's truncated to int type.

Therefore if we write 2^32 to sysctl.hung_task_check_count, hung task detection will be effectively disabled.

Not a big deal, but still it's better to fix this inconsistency.

---
 include/linux/sched/sysctl.h | 2 +-
 kernel/hung_task.c           | 2 +-
 kernel/sysctl.c              | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)
include/linux/sched/sysctl.h +1 -1
index bf8086b..9552afa 100644
@@ -2,8 +2,8 @@
 #define _SCHED_SYSCTL_H
 
 #ifdef CONFIG_DETECT_HUNG_TASK
+extern int	     sysctl_hung_task_check_count;
 extern unsigned int  sysctl_hung_task_panic;
-extern unsigned long sysctl_hung_task_check_count;
 extern unsigned long sysctl_hung_task_timeout_secs;
 extern unsigned long sysctl_hung_task_warnings;
 extern int proc_dohung_task_timeout_secs(struct ctl_table *table, int write,
kernel/hung_task.c +1 -1
index 6df6149..b5a5d42 100644
@@ -19,7 +19,7 @@
 /*
  * The number of tasks checked:
  */
-unsigned long __read_mostly sysctl_hung_task_check_count = PID_MAX_LIMIT;
+int __read_mostly sysctl_hung_task_check_count = PID_MAX_LIMIT;
 
 /*
  * Limit number of tasks checked in a batch.
kernel/sysctl.c +2 -2
index 07f6fc4..5e5cc21 100644
@@ -962,9 +962,9 @@ static struct ctl_table kern_table[] = {
 	{
 		.procname	= "hung_task_check_count",
 		.data		= &sysctl_hung_task_check_count,
-		.maxlen		= sizeof(unsigned long),
+		.maxlen		= sizeof(int),
 		.mode		= 0644,
-		.proc_handler	= proc_doulongvec_minmax,
+		.proc_handler	= proc_dointvec_minmax,
 	},
 	{
 		.procname	= "hung_task_timeout_secs",
Signature · 1 line
1.8.0.2
author
#1 lore raw
Cc Ingo, as this touched include/linux/sched/.
Quoted 60 lines · Li Zefan

As sysctl_hung_task_check_count is unsigned long, when this value is assigned to max_count in check_hung_uninterruptible_tasks(), it's truncated to int type.

Therefore if we write 2^32 to sysctl.hung_task_check_count, hung task detection will be effectively disabled.

Not a big deal, but still it's better to fix this inconsistency.

---
 include/linux/sched/sysctl.h | 2 +-
 kernel/hung_task.c           | 2 +-
 kernel/sysctl.c              | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)
include/linux/sched/sysctl.h +1 -1
index bf8086b..9552afa 100644
@@ -2,8 +2,8 @@
 #define _SCHED_SYSCTL_H
 
 #ifdef CONFIG_DETECT_HUNG_TASK
+extern int	     sysctl_hung_task_check_count;
 extern unsigned int  sysctl_hung_task_panic;
-extern unsigned long sysctl_hung_task_check_count;
 extern unsigned long sysctl_hung_task_timeout_secs;
 extern unsigned long sysctl_hung_task_warnings;
 extern int proc_dohung_task_timeout_secs(struct ctl_table *table, int write,
kernel/hung_task.c +1 -1
index 6df6149..b5a5d42 100644
@@ -19,7 +19,7 @@
 /*
  * The number of tasks checked:
  */
-unsigned long __read_mostly sysctl_hung_task_check_count = PID_MAX_LIMIT;
+int __read_mostly sysctl_hung_task_check_count = PID_MAX_LIMIT;
 
 /*
  * Limit number of tasks checked in a batch.
kernel/sysctl.c +2 -2
index 07f6fc4..5e5cc21 100644
@@ -962,9 +962,9 @@ static struct ctl_table kern_table[] = {
 	{
 		.procname	= "hung_task_check_count",
 		.data		= &sysctl_hung_task_check_count,
-		.maxlen		= sizeof(unsigned long),
+		.maxlen		= sizeof(int),
 		.mode		= 0644,
-		.proc_handler	= proc_doulongvec_minmax,
+		.proc_handler	= proc_dointvec_minmax,
 	},
 	{
 		.procname	= "hung_task_timeout_secs",
Acked-by
#2 lore raw
Quoted 26 lines · Li Zefan
Cc Ingo, as this touched include/linux/sched/.
Quoted 23 lines · Li Zefan

As sysctl_hung_task_check_count is unsigned long, when this value is assigned to max_count in check_hung_uninterruptible_tasks(), it's truncated to int type.

Therefore if we write 2^32 to sysctl.hung_task_check_count, hung task detection will be effectively disabled.

Not a big deal, but still it's better to fix this inconsistency.

---
 include/linux/sched/sysctl.h | 2 +-
 kernel/hung_task.c           | 2 +-
 kernel/sysctl.c              | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)
include/linux/sched/sysctl.h +0 -0
index bf8086b..9552afa 100644
@@ -2,8 +2,8 @@
 #define _SCHED_SYSCTL_H
 
Quoted 7 lines

include/linux/sched/sysctl.h

Quoted 7 lines
include/linux/sched/sysctl.h +1 -1
 #ifdef CONFIG_DETECT_HUNG_TASK
+extern int	     sysctl_hung_task_check_count;
 extern unsigned int  sysctl_hung_task_panic;
-extern unsigned long sysctl_hung_task_check_count;
 extern unsigned long sysctl_hung_task_timeout_secs; extern unsigned 
 long sysctl_hung_task_warnings; extern int 
 proc_dohung_task_timeout_secs(struct ctl_table *table, int write,

Looks good, but I suppose most of the unsigned longs above ought to be downgraded to int as well?

Thanks,

Ingo

author
#3 lore raw
Quoted 24 lines
Quoted 24 lines · Li Zefan
Quoted 23 lines

As sysctl_hung_task_check_count is unsigned long, when this value is assigned to max_count in check_hung_uninterruptible_tasks(), it's truncated to int type.

Therefore if we write 2^32 to sysctl.hung_task_check_count, hung task detection will be effectively disabled.

Not a big deal, but still it's better to fix this inconsistency.

---
 include/linux/sched/sysctl.h | 2 +-
 kernel/hung_task.c           | 2 +-
 kernel/sysctl.c              | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)
include/linux/sched/sysctl.h +0 -0
index bf8086b..9552afa 100644
@@ -2,8 +2,8 @@
 #define _SCHED_SYSCTL_H
 
Quoted 11 lines
Quoted 7 lines

include/linux/sched/sysctl.h

Quoted 7 lines
include/linux/sched/sysctl.h +1 -1
 #ifdef CONFIG_DETECT_HUNG_TASK
+extern int	     sysctl_hung_task_check_count;
 extern unsigned int  sysctl_hung_task_panic;
-extern unsigned long sysctl_hung_task_check_count;
 extern unsigned long sysctl_hung_task_timeout_secs; extern unsigned 
 long sysctl_hung_task_warnings; extern int 
 proc_dohung_task_timeout_secs(struct ctl_table *table, int write,

Looks good, but I suppose most of the unsigned longs above ought to be downgraded to int as well?

They can be, but they don't have to be.

Quoted 1 line

Thanks!