softlockup: fix to allow compiling with !DETECT_HUNG_TASK
Subsystems (4)
PATCH 1/1 softlockup: fix to allow compiling with !DETECT_HUNG_TASK
Quoted 9 lines · Ingo Molnar
doesnt build with !SOFTLOCKUP:
kernel/fork.c:1049: error: 'structtask_struct' has no member named 'last_switch_count'kernel/fork.c:1050: error: 'structtask_struct' has no member named 'last_switch_timestamp'Could you send a delta fix patch relative to -v4 please? Thanks,
Ingo
Oops. Will be more careful next time.
---
Fixes the following compile error:
kernel/fork.c:1049: error: 'struct task_struct' has no member named 'last_switch_count' kernel/fork.c:1050: error: 'struct task_struct' has no member named 'last_switch_timestamp'
--- kernel/fork.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
kernel/fork.c +1 -1
@@ -1045,7 +1045,7 @@ static struct task_struct *copy_process(unsigned long clone_flags, p->default_timer_slack_ns = current->timer_slack_ns; -#ifdef CONFIG_DETECT_SOFTLOCKUP +#ifdef CONFIG_DETECT_HUNG_TASK p->last_switch_count =0 ; p->last_switch_timestamp =0 ;#endif
Signature · 1 line
1.5.4.5
Quoted 4 lines · Mandeep Singh Baines
Quoted 3 lines · Ingo Molnar
doesnt build with !SOFTLOCKUP:
Quoted 8 lines
Quoted 6 lines
kernel/fork.c:1049: error: 'structtask_struct' has no member named 'last_switch_count'kernel/fork.c:1050: error: 'structtask_struct' has no member named 'last_switch_timestamp'Could you send a delta fix patch relative to -v4 please? Thanks,
Ingo
Oops. Will be more careful next time.
np - applied to tip/core/softlockup. Thanks,
Ingo
PATCH 1/1 softlockup: fix potential race in hung_task when resetting timeout
Patch against tip/core/softlockup.
---
A potential race exists if sysctl_hung_task_timeout_secs is reset to 0 while inside check_hung_uniterruptible_tasks(). If check_task() is entered, a comparison with 0 will result in a false hung_task being detected.
If sysctl_hung_task_panic is set, the system will panic.
--- kernel/hung_task.c | 24 ++++++++++++++++-------- 1 files changed, 16 insertions(+), 8 deletions(-)
kernel/hung_task.c +16 -8
@@ -72,7 +72,8 @@ static unsigned long get_timestamp(void)return cpu_clock (this_cpu) >>30LL ;/* 2^30 ~= 10^9 */ } -static void check_hung_task (struct task_struct *t,unsigned long now) +static void check_hung_task (struct task_struct *t,unsigned long now, +unsigned long timeout) {unsigned long switch_count = t->nvcsw + t->nivcsw;
@@ -84,8 +85,7 @@ static void check_hung_task(struct task_struct *t, unsigned long now) t->last_switch_timestamp = now;return ; } -if ((long )(now - t->last_switch_timestamp) < - sysctl_hung_task_timeout_secs) +if ((long )(now - t->last_switch_timestamp) < timeout)return ;if (!sysctl_hung_task_warnings)return ;
@@ -96,8 +96,7 @@ static void check_hung_task(struct task_struct *t, unsigned long now)* complain: */ printk (KERN_ERR "INFO: task %s:%d blocked for more than " -"%ld seconds.\n" , t->comm, t->pid, - sysctl_hung_task_timeout_secs); +"%ld seconds.\n" , t->comm, t->pid, timeout);printk (KERN_ERR "\"echo 0 > /proc/sys/kernel/hung_task_timeout_secs\"" " disables this message.\n" );sched_show_task (t);
@@ -115,7 +114,7 @@ static void check_hung_task(struct task_struct *t, unsigned long now)* a really long time (120 seconds). If that happens, print out * a warning. */ -static void check_hung_uninterruptible_tasks (void ) +static void check_hung_uninterruptible_tasks (unsigned long timeout) {int max_count = sysctl_hung_task_check_count;unsigned long now =get_timestamp ();
@@ -134,7 +133,7 @@ static void check_hung_uninterruptible_tasks(void) goto unlock;/* use "==" to skip the TASK_KILLABLE tasks waiting on NFS */ if (t->state ==TASK_UNINTERRUPTIBLE ) -check_hung_task (t, now); +check_hung_task (t, now, timeout); }while_each_thread (g, t); unlock:read_unlock (&tasklist_lock);
@@ -180,8 +179,17 @@ static int watchdog(void *dummy)update_poll_jiffies ();for ( ; ; ) { +unsigned long timeout; +while (schedule_timeout_interruptible (hung_task_poll_jiffies)); -check_hung_uninterruptible_tasks (); + +/* +* Need to cache timeout here to avoid timeout being set +* to 0 via sysctl while inside check_hung_*_tasks(). +*/ + timeout = sysctl_hung_task_timeout_secs; +if (timeout) +check_hung_uninterruptible_tasks (timeout); }return 0 ;
Signature · 1 line
1.5.4.5
Ingo Molnar
AppliedRe: [PATCH] softlockup: fix potential race in hung_task when resetting timeout
Quoted 9 lines · Mandeep Singh Baines
Patch against tip/core/softlockup.
---
A potential race exists if
sysctl_hung_task_timeout_secsis reset to 0 while insidecheck_hung_uniterruptible_tasks(). Ifcheck_task()is entered, a comparison with 0 will result in a falsehung_taskbeing detected.
Quoted 6 lines
If
sysctl_hung_task_panicis set, the system will panic.Signed-off-by Mandeep Singh Baines <[email protected]>--- kernel/hung_task.c | 24 ++++++++++++++++-------- 1 files changed, 16 insertions(+), 8 deletions(-)
Applied to tip/core/softlockup, thanks Mandeep!
Ingo