Attachment 200301 Details for Bug 250994 – Patch to prevent softlockup from upstream

[patch] Patch to prevent softlockup from upstream

linux-2.6.18-xen-softlockup.patch (text/plain), 2.07 KB, created by Chris Lalancette on 2007-09-19 23:45:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Lalancette

Created: 2007-09-19 23:45:27 UTC

Size: 2.07 KB

patch

obsolete

>diff -urp linux-2.6.18.noarch.orig/include/linux/sched.h linux-2.6.18.noarch/include/linux/sched.h
>--- linux-2.6.18.noarch.orig/include/linux/sched.h	2007-08-16 15:36:17.000000000 -0400
>+++ linux-2.6.18.noarch/include/linux/sched.h	2007-08-16 15:41:07.000000000 -0400
>@@ -213,11 +213,16 @@ extern void update_process_times(int use
> extern void scheduler_tick(void);
> 
> #ifdef CONFIG_DETECT_SOFTLOCKUP
>+extern unsigned long softlockup_get_next_event(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 unsigned long softlockup_get_next_event(void)
>+{
>+	return MAX_JIFFY_OFFSET;
>+}
> static inline void softlockup_tick(void)
> {
> }
>diff -urp linux-2.6.18.noarch.orig/kernel/softlockup.c linux-2.6.18.noarch/kernel/softlockup.c
>--- linux-2.6.18.noarch.orig/kernel/softlockup.c	2007-08-16 15:36:14.000000000 -0400
>+++ linux-2.6.18.noarch/kernel/softlockup.c	2007-08-16 15:39:52.000000000 -0400
>@@ -40,6 +40,19 @@ void touch_softlockup_watchdog(void)
> }
> EXPORT_SYMBOL(touch_softlockup_watchdog);
> 
>+unsigned long softlockup_get_next_event(void)
>+{
>+	int this_cpu = smp_processor_id();
>+	unsigned long touch_timestamp = per_cpu(touch_timestamp, this_cpu);
>+
>+	if (per_cpu(print_timestamp, this_cpu) == touch_timestamp ||
>+		did_panic ||
>+			!per_cpu(watchdog_task, this_cpu))
>+		return MAX_JIFFY_OFFSET;
>+
>+	return max_t(long, 0, touch_timestamp + HZ - jiffies);
>+}
>+
> void touch_all_softlockup_watchdogs(void)
> {
> 	int cpu;
>diff -urp linux-2.6.18.noarch.orig/kernel/timer.c linux-2.6.18.noarch/kernel/timer.c
>--- linux-2.6.18.noarch.orig/kernel/timer.c	2007-08-16 15:36:17.000000000 -0400
>+++ linux-2.6.18.noarch/kernel/timer.c	2007-08-16 15:39:52.000000000 -0400
>@@ -616,7 +616,9 @@ unsigned long next_timer_interrupt(void)
> 		if (hr_expires < 3)
> 			return hr_expires + jiffies;
> 	}
>-	hr_expires += jiffies;
>+	hr_expires = min_t(unsigned long,
>+			   softlockup_get_next_event(),
>+			   hr_expires) + jiffies;
> 
> 	base = __get_cpu_var(tvec_bases);
> 	spin_lock(&base->lock);

Actions: View | Diff

Attachments on bug 250994: 200301