public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* touch softlockup during
@ 2006-11-26  6:47 Dave Jones
  2006-11-26 19:26 ` Andi Kleen
  0 siblings, 1 reply; 3+ messages in thread
From: Dave Jones @ 2006-11-26  6:47 UTC (permalink / raw)
  To: Linux Kernel; +Cc: ak

Sometimes the soft watchdog fires after we're done oopsing.
See http://projects.info-pull.com/mokb/MOKB-25-11-2006.html for an example.

Signed-off-by: Dave Jones <davej@redhat.com>

--- linux-2.6.18.noarch/arch/i386/kernel/traps.c~	2006-11-26 01:40:58.000000000 -0500
+++ linux-2.6.18.noarch/arch/i386/kernel/traps.c	2006-11-26 01:41:28.000000000 -0500
@@ -243,6 +243,7 @@ void dump_trace(struct task_struct *task
 		stack = (unsigned long*)context->previous_esp;
 		if (!stack)
 			break;
+		touch_softlockup_watchdog();
 	}
 }
 EXPORT_SYMBOL(dump_trace);
-- 
http://www.codemonkey.org.uk

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

* Re: touch softlockup during
  2006-11-26  6:47 touch softlockup during Dave Jones
@ 2006-11-26 19:26 ` Andi Kleen
  2006-11-26 20:17   ` touch softlockup during stack unwinding Dave Jones
  0 siblings, 1 reply; 3+ messages in thread
From: Andi Kleen @ 2006-11-26 19:26 UTC (permalink / raw)
  To: Dave Jones; +Cc: Linux Kernel

On Sunday 26 November 2006 07:47, Dave Jones wrote:
> Sometimes the soft watchdog fires after we're done oopsing.
> See http://projects.info-pull.com/mokb/MOKB-25-11-2006.html for an example.
> 
> Signed-off-by: Dave Jones <davej@redhat.com>
> 
> --- linux-2.6.18.noarch/arch/i386/kernel/traps.c~	2006-11-26 01:40:58.000000000 -0500
> +++ linux-2.6.18.noarch/arch/i386/kernel/traps.c	2006-11-26 01:41:28.000000000 -0500
> @@ -243,6 +243,7 @@ void dump_trace(struct task_struct *task
>  		stack = (unsigned long*)context->previous_esp;
>  		if (!stack)
>  			break;
> +		touch_softlockup_watchdog();

These should be all touch_nmi_watchdog() (which does touch the soft watchdog
too) 

-Andi

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

* Re: touch softlockup during stack unwinding.
  2006-11-26 19:26 ` Andi Kleen
@ 2006-11-26 20:17   ` Dave Jones
  0 siblings, 0 replies; 3+ messages in thread
From: Dave Jones @ 2006-11-26 20:17 UTC (permalink / raw)
  To: Andi Kleen; +Cc: Linux Kernel

Sometimes the soft watchdog fires after we're done oopsing.
See http://projects.info-pull.com/mokb/MOKB-25-11-2006.html for an example.
The NMI watchdog could also fire, so tickle both watchdogs.

Signed-off-by: Dave Jones <davej@redhat.com>

--- linux-2.6/arch/i386/kernel/traps.c~	2006-11-26 01:44:58.000000000 -0500
+++ linux-2.6/arch/i386/kernel/traps.c	2006-11-26 01:45:32.000000000 -0500
@@ -29,6 +29,7 @@
 #include <linux/kexec.h>
 #include <linux/unwind.h>
 #include <linux/uaccess.h>
+#include <linux/nmi.h>
 
 #ifdef CONFIG_EISA
 #include <linux/ioport.h>
@@ -247,6 +247,7 @@ void dump_trace(struct task_struct *task
 		stack = (unsigned long*)context->previous_esp;
 		if (!stack)
 			break;
+		touch_nmi_watchdog();
 	}
 }
 EXPORT_SYMBOL(dump_trace);


-- 
http://www.codemonkey.org.uk

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

end of thread, other threads:[~2006-11-26 20:17 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-11-26  6:47 touch softlockup during Dave Jones
2006-11-26 19:26 ` Andi Kleen
2006-11-26 20:17   ` touch softlockup during stack unwinding Dave Jones

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox