Attachment 149958 Details for Bug 206366 – Upstream fix for this issue

[patch] Upstream fix for this issue

upstream.patch (text/plain), 1.87 KB, created by Prarit Bhargava on 2007-03-13 17:47:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Prarit Bhargava

Created: 2007-03-13 17:47:49 UTC

Size: 1.87 KB

patch

obsolete

>There are some debug situations when soft lockup warnings are expected in the
>kernel.  For example when doing an alt-sysrq-t on a large number of processes
>the dump to console can take a long time and spinlocks may be held over that
>period.
>
>This patch introduces touch_all_softlockup_watchdogs in order to touch all
>cpu's touch_timestamp so that the soft lockup warning message is avoided.
>
>Signed-off-by: Prarit Bhargava <prarit@redhat.com>
>
>diff --git a/include/linux/sched.h b/include/linux/sched.h
>index 49fe299..4c99d73 100644
>--- a/include/linux/sched.h
>+++ b/include/linux/sched.h
>@@ -226,6 +226,7 @@ extern void scheduler_tick(void);
> extern void softlockup_tick(void);
> extern void spawn_softlockup_task(void);
> extern void touch_softlockup_watchdog(void);
>+extern void touch_all_softlockup_watchdogs(void);
> #else
> static inline void softlockup_tick(void)
> {
>diff --git a/kernel/sched.c b/kernel/sched.c
>index a4ca632..0e028c8 100644
>--- a/kernel/sched.c
>+++ b/kernel/sched.c
>@@ -4783,6 +4783,7 @@ void show_state_filter(unsigned long state_filter)
> 		if (p->state & state_filter)
> 			show_task(p);
> 	} while_each_thread(g, p);
>+	touch_all_softlockup_watchdogs();
> 
> 	read_unlock(&tasklist_lock);
> 	/*
>diff --git a/kernel/softlockup.c b/kernel/softlockup.c
>index 50afeb8..168d901 100644
>--- a/kernel/softlockup.c
>+++ b/kernel/softlockup.c
>@@ -8,6 +8,7 @@
>  */
> #include <linux/mm.h>
> #include <linux/cpu.h>
>+#include <linux/cpumask.h>
> #include <linux/init.h>
> #include <linux/delay.h>
> #include <linux/kthread.h>
>@@ -40,6 +41,16 @@ void touch_softlockup_watchdog(void)
> }
> EXPORT_SYMBOL(touch_softlockup_watchdog);
> 
>+void touch_all_softlockup_watchdogs(void)
>+{
>+	int cpu;
>+
>+	for_each_possible_cpu(cpu)
>+		per_cpu(touch_timestamp, cpu) = jiffies;
>+}
>+
>+extern atomic_t suspend_softlockup;
>+
> /*
>  * This callback runs from the timer interrupt, and checks
>  * whether the watchdog thread has hung or not:

Actions: View | Diff

Attachments on bug 206366: 136213 | 149958 | 149959 | 149961 | 149963 | 150074 | 150075 | 151651 | 161096 | 161097 | 161098 | 161099