Attachment 231371 Details for Bug 336541 – RHEL5 fix for this issue

[patch] RHEL5 fix for this issue

336541-v3.patch (text/plain), 12.69 KB, created by Prarit Bhargava on 2007-10-18 18:34:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Prarit Bhargava

Created: 2007-10-18 18:34:45 UTC

Size: 12.69 KB

patch

obsolete

>diff -urNp -x linux-2.6.18.i386/Documentation/dontdiff linux-2.6.18.i386.orig/arch/i386/kernel/apic.c linux-2.6.18.i386/arch/i386/kernel/apic.c
>--- linux-2.6.18.i386.orig/arch/i386/kernel/apic.c	2007-10-18 10:49:16.000000000 -0400
>+++ linux-2.6.18.i386/arch/i386/kernel/apic.c	2007-10-18 10:52:03.000000000 -0400
>@@ -1189,7 +1189,7 @@ inline void smp_local_timer_interrupt(st
> 	for (i = 0; i < tick_divider; i++) {
> 		profile_tick(CPU_PROFILING, regs);
> #ifdef CONFIG_SMP
>-		update_process_times(user_mode_vm(regs));
>+		update_process_times(user_mode_vm(regs), regs);
> #endif
> 	}
> 
>diff -urNp -x linux-2.6.18.i386/Documentation/dontdiff linux-2.6.18.i386.orig/arch/i386/kernel/time-xen.c linux-2.6.18.i386/arch/i386/kernel/time-xen.c
>--- linux-2.6.18.i386.orig/arch/i386/kernel/time-xen.c	2007-10-18 10:49:16.000000000 -0400
>+++ linux-2.6.18.i386/arch/i386/kernel/time-xen.c	2007-10-18 10:51:15.000000000 -0400
>@@ -736,7 +736,7 @@ irqreturn_t timer_interrupt(int irq, voi
> 		touch_softlockup_watchdog();
> 
> 	/* Local timer processing (see update_process_times()). */
>-	run_local_timers();
>+	run_local_timers(regs);
> 	if (rcu_pending(cpu))
> 		rcu_check_callbacks(cpu, user_mode(regs));
> 	scheduler_tick();
>diff -urNp -x linux-2.6.18.i386/Documentation/dontdiff linux-2.6.18.i386.orig/arch/i386/mach-voyager/voyager_smp.c linux-2.6.18.i386/arch/i386/mach-voyager/voyager_smp.c
>--- linux-2.6.18.i386.orig/arch/i386/mach-voyager/voyager_smp.c	2007-10-18 10:49:16.000000000 -0400
>+++ linux-2.6.18.i386/arch/i386/mach-voyager/voyager_smp.c	2007-10-18 10:52:18.000000000 -0400
>@@ -1295,7 +1295,7 @@ smp_local_timer_interrupt(struct pt_regs
> 						per_cpu(prof_counter, cpu);
> 		}
> 
>-		update_process_times(user_mode_vm(regs));
>+		update_process_times(user_mode_vm(regs), regs);
> 	}
> 
> 	if( ((1<<cpu) & voyager_extended_vic_processors) == 0)
>diff -urNp -x linux-2.6.18.i386/Documentation/dontdiff linux-2.6.18.i386.orig/arch/ia64/kernel/time.c linux-2.6.18.i386/arch/ia64/kernel/time.c
>--- linux-2.6.18.i386.orig/arch/ia64/kernel/time.c	2007-10-18 10:49:16.000000000 -0400
>+++ linux-2.6.18.i386/arch/ia64/kernel/time.c	2007-10-18 10:49:59.000000000 -0400
>@@ -118,7 +118,7 @@ consider_steal_time(unsigned long new_it
> 	if (stolen > 0 || blocked > 0) {
> 		account_steal_time(NULL, jiffies_to_cputime(stolen)); 
> 		account_steal_time(idle_task(cpu), jiffies_to_cputime(blocked)); 
>-		run_local_timers();
>+		run_local_timers(regs);
> 
> 		if (rcu_pending(cpu))
> 			rcu_check_callbacks(cpu, user_mode(regs));
>@@ -173,7 +173,7 @@ timer_interrupt (int irq, void *dev_id, 
> 	}
> 
> 	while (1) {
>-		update_process_times(user_mode(regs));
>+		update_process_times(user_mode(regs), regs);
> 
> 		new_itm += local_cpu_data->itm_delta;
> 
>diff -urNp -x linux-2.6.18.i386/Documentation/dontdiff linux-2.6.18.i386.orig/arch/powerpc/kernel/time.c linux-2.6.18.i386/arch/powerpc/kernel/time.c
>--- linux-2.6.18.i386.orig/arch/powerpc/kernel/time.c	2007-10-18 10:49:16.000000000 -0400
>+++ linux-2.6.18.i386/arch/powerpc/kernel/time.c	2007-10-18 10:55:56.000000000 -0400
>@@ -208,7 +208,7 @@ static void account_process_time(struct 
> 	int cpu = smp_processor_id();
> 
> 	account_process_vtime(current);
>-	run_local_timers();
>+	run_local_timers(regs);
> 	if (rcu_pending(cpu))
> 		rcu_check_callbacks(cpu, user_mode(regs));
> 	scheduler_tick();
>@@ -328,7 +328,7 @@ static void snapshot_purr(void)
> 
> #else /* ! CONFIG_VIRT_CPU_ACCOUNTING */
> #define calc_cputime_factors()
>-#define account_process_time(regs)	update_process_times(user_mode(regs))
>+#define account_process_time(regs)	update_process_times(user_mode(regs), regs)
> #define calculate_steal_time()		do { } while (0)
> #endif
> 
>diff -urNp -x linux-2.6.18.i386/Documentation/dontdiff linux-2.6.18.i386.orig/arch/ppc/kernel/time.c linux-2.6.18.i386/arch/ppc/kernel/time.c
>--- linux-2.6.18.i386.orig/arch/ppc/kernel/time.c	2007-10-18 10:49:16.000000000 -0400
>+++ linux-2.6.18.i386/arch/ppc/kernel/time.c	2007-10-18 10:56:47.000000000 -0400
>@@ -145,7 +145,7 @@ void timer_interrupt(struct pt_regs * re
> 		jiffy_stamp += tb_ticks_per_jiffy;
> 		
> 		profile_tick(CPU_PROFILING, regs);
>-		update_process_times(user_mode(regs));
>+		update_process_times(user_mode(regs), regs);
> 
> 	  	if (smp_processor_id())
> 			continue;
>diff -urNp -x linux-2.6.18.i386/Documentation/dontdiff linux-2.6.18.i386.orig/arch/s390/kernel/time.c linux-2.6.18.i386/arch/s390/kernel/time.c
>--- linux-2.6.18.i386.orig/arch/s390/kernel/time.c	2007-10-18 10:49:16.000000000 -0400
>+++ linux-2.6.18.i386/arch/s390/kernel/time.c	2007-10-18 10:56:18.000000000 -0400
>@@ -225,7 +225,7 @@ void account_ticks(struct pt_regs *regs)
> 	account_tick_vtime(current);
> #else
> 	while (ticks--)
>-		update_process_times(user_mode(regs));
>+		update_process_times(user_mode(regs), regs);
> #endif
> 
> 	s390_do_profile(regs);
>diff -urNp -x linux-2.6.18.i386/Documentation/dontdiff linux-2.6.18.i386.orig/arch/s390/kernel/vtime.c linux-2.6.18.i386/arch/s390/kernel/vtime.c
>--- linux-2.6.18.i386.orig/arch/s390/kernel/vtime.c	2007-10-18 10:49:16.000000000 -0400
>+++ linux-2.6.18.i386/arch/s390/kernel/vtime.c	2007-10-18 10:53:41.000000000 -0400
>@@ -64,7 +64,7 @@ void account_tick_vtime(struct task_stru
> 		account_steal_time(tsk, cputime);
> 	}
> 
>-	run_local_timers();
>+	run_local_timers(task_pt_regs(tsk));
> 	if (rcu_pending(smp_processor_id()))
> 		rcu_check_callbacks(smp_processor_id(), rcu_user_flag);
> 	scheduler_tick();
>diff -urNp -x linux-2.6.18.i386/Documentation/dontdiff linux-2.6.18.i386.orig/arch/x86_64/kernel/apic.c linux-2.6.18.i386/arch/x86_64/kernel/apic.c
>--- linux-2.6.18.i386.orig/arch/x86_64/kernel/apic.c	2007-10-18 10:49:16.000000000 -0400
>+++ linux-2.6.18.i386/arch/x86_64/kernel/apic.c	2007-10-18 10:49:59.000000000 -0400
>@@ -943,7 +943,7 @@ void smp_local_timer_interrupt(struct pt
> {
> 	profile_tick(CPU_PROFILING, regs);
> #ifdef CONFIG_SMP
>-	update_process_times(user_mode(regs));
>+	update_process_times(user_mode(regs), regs);
> #endif
> 	if (apic_runs_main_timer > 1 && smp_processor_id() == boot_cpu_id)
> 		main_timer_handler(regs);
>diff -urNp -x linux-2.6.18.i386/Documentation/dontdiff linux-2.6.18.i386.orig/arch/x86_64/kernel/apic-xen.c linux-2.6.18.i386/arch/x86_64/kernel/apic-xen.c
>--- linux-2.6.18.i386.orig/arch/x86_64/kernel/apic-xen.c	2007-10-18 10:49:16.000000000 -0400
>+++ linux-2.6.18.i386/arch/x86_64/kernel/apic-xen.c	2007-10-18 10:49:59.000000000 -0400
>@@ -67,7 +67,7 @@ void smp_local_timer_interrupt(struct pt
> 	profile_tick(CPU_PROFILING, regs);
> #ifndef CONFIG_XEN
> #ifdef CONFIG_SMP
>-		update_process_times(user_mode(regs));
>+		update_process_times(user_mode(regs), regs);
> #endif
> #endif
> 	/*
>diff -urNp -x linux-2.6.18.i386/Documentation/dontdiff linux-2.6.18.i386.orig/arch/x86_64/kernel/time.c linux-2.6.18.i386/arch/x86_64/kernel/time.c
>--- linux-2.6.18.i386.orig/arch/x86_64/kernel/time.c	2007-10-18 10:49:16.000000000 -0400
>+++ linux-2.6.18.i386/arch/x86_64/kernel/time.c	2007-10-18 10:49:59.000000000 -0400
>@@ -448,7 +448,7 @@ void main_timer_handler(struct pt_regs *
> 	for (i = 0; i < tick_divider; i++) {
> 		do_timer(regs);
> #ifndef CONFIG_SMP
>-		update_process_times(user_mode(regs));
>+		update_process_times(user_mode(regs), regs);
> #endif
> 
> 	/*
>diff -urNp -x linux-2.6.18.i386/Documentation/dontdiff linux-2.6.18.i386.orig/include/asm-i386/mach-default/do_timer.h linux-2.6.18.i386/include/asm-i386/mach-default/do_timer.h
>--- linux-2.6.18.i386.orig/include/asm-i386/mach-default/do_timer.h	2007-10-18 10:49:16.000000000 -0400
>+++ linux-2.6.18.i386/include/asm-i386/mach-default/do_timer.h	2007-10-18 10:52:26.000000000 -0400
>@@ -20,7 +20,7 @@ static inline void do_timer_interrupt_ho
> 	for (i = 0; i < tick_divider; i++) {
> 		do_timer(regs);
> #ifndef CONFIG_SMP
>-		update_process_times(user_mode_vm(regs));
>+		update_process_times(user_mode_vm(regs), regs);
> #endif
> 	}
> /*
>diff -urNp -x linux-2.6.18.i386/Documentation/dontdiff linux-2.6.18.i386.orig/include/asm-i386/mach-visws/do_timer.h linux-2.6.18.i386/include/asm-i386/mach-visws/do_timer.h
>--- linux-2.6.18.i386.orig/include/asm-i386/mach-visws/do_timer.h	2007-10-18 10:49:16.000000000 -0400
>+++ linux-2.6.18.i386/include/asm-i386/mach-visws/do_timer.h	2007-10-18 10:52:35.000000000 -0400
>@@ -13,7 +13,7 @@ static inline void do_timer_interrupt_ho
> 	for (i = 0; i < tick_divider; i++) {
> 		do_timer(regs);
> #ifndef CONFIG_SMP
>-		update_process_times(user_mode_vm(regs));
>+		update_process_times(user_mode_vm(regs), regs);
> #endif
> 	}
> /*
>diff -urNp -x linux-2.6.18.i386/Documentation/dontdiff linux-2.6.18.i386.orig/include/asm-i386/mach-voyager/do_timer.h linux-2.6.18.i386/include/asm-i386/mach-voyager/do_timer.h
>--- linux-2.6.18.i386.orig/include/asm-i386/mach-voyager/do_timer.h	2007-10-18 10:49:16.000000000 -0400
>+++ linux-2.6.18.i386/include/asm-i386/mach-voyager/do_timer.h	2007-10-18 10:52:43.000000000 -0400
>@@ -7,7 +7,7 @@ static inline void do_timer_interrupt_ho
> 	for (i = 0; i < tick_divider; i++) {
> 		do_timer(regs);
> #ifndef CONFIG_SMP
>-		update_process_times(user_mode_vm(regs));
>+		update_process_times(user_mode_vm(regs), regs);
> #endif
> 		voyager_timer_interrupt(regs);
> 	}
>diff -urNp -x linux-2.6.18.i386/Documentation/dontdiff linux-2.6.18.i386.orig/include/linux/sched.h linux-2.6.18.i386/include/linux/sched.h
>--- linux-2.6.18.i386.orig/include/linux/sched.h	2007-10-18 10:49:17.000000000 -0400
>+++ linux-2.6.18.i386/include/linux/sched.h	2007-10-18 10:49:59.000000000 -0400
>@@ -209,16 +209,16 @@ long io_schedule_timeout(long timeout);
> 
> extern void cpu_init (void);
> extern void trap_init(void);
>-extern void update_process_times(int user);
>+extern void update_process_times(int user, struct pt_regs *regs);
> extern void scheduler_tick(void);
> 
> #ifdef CONFIG_DETECT_SOFTLOCKUP
>-extern void softlockup_tick(void);
>+extern void softlockup_tick(struct pt_regs *regs);
> 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)
>+static inline void softlockup_tick(struct pt_regs *regs)
> {
> }
> static inline void spawn_softlockup_task(void)
>diff -urNp -x linux-2.6.18.i386/Documentation/dontdiff linux-2.6.18.i386.orig/include/linux/timer.h linux-2.6.18.i386/include/linux/timer.h
>--- linux-2.6.18.i386.orig/include/linux/timer.h	2007-10-18 10:49:17.000000000 -0400
>+++ linux-2.6.18.i386/include/linux/timer.h	2007-10-18 10:49:59.000000000 -0400
>@@ -94,7 +94,7 @@ static inline void add_timer(struct time
> #define del_singleshot_timer_sync(t) del_timer_sync(t)
> 
> extern void init_timers(void);
>-extern void run_local_timers(void);
>+extern void run_local_timers(struct pt_regs *regs);
> struct hrtimer;
> extern int it_real_fn(struct hrtimer *);
> 
>diff -urNp -x linux-2.6.18.i386/Documentation/dontdiff linux-2.6.18.i386.orig/kernel/softlockup.c linux-2.6.18.i386/kernel/softlockup.c
>--- linux-2.6.18.i386.orig/kernel/softlockup.c	2007-10-18 10:49:16.000000000 -0400
>+++ linux-2.6.18.i386/kernel/softlockup.c	2007-10-18 10:49:59.000000000 -0400
>@@ -13,6 +13,7 @@
> #include <linux/kthread.h>
> #include <linux/notifier.h>
> #include <linux/module.h>
>+#include <linux/sched.h>
> 
> static DEFINE_SPINLOCK(print_lock);
> 
>@@ -54,7 +55,7 @@ EXPORT_SYMBOL(touch_all_softlockup_watch
>  * This callback runs from the timer interrupt, and checks
>  * whether the watchdog thread has hung or not:
>  */
>-void softlockup_tick(void)
>+void softlockup_tick(struct pt_regs *regs)
> {
> 	int this_cpu = smp_processor_id();
> 	unsigned long touch_timestamp = per_cpu(touch_timestamp, this_cpu);
>@@ -82,7 +83,7 @@ void softlockup_tick(void)
> 		spin_lock(&print_lock);
> 		printk(KERN_ERR "BUG: soft lockup detected on CPU#%d!\n",
> 			this_cpu);
>-		dump_stack();
>+		show_regs(regs);
> 		spin_unlock(&print_lock);
> 	}
> }
>diff -urNp -x linux-2.6.18.i386/Documentation/dontdiff linux-2.6.18.i386.orig/kernel/timer.c linux-2.6.18.i386/kernel/timer.c
>--- linux-2.6.18.i386.orig/kernel/timer.c	2007-10-18 10:49:16.000000000 -0400
>+++ linux-2.6.18.i386/kernel/timer.c	2007-10-18 10:52:49.000000000 -0400
>@@ -1299,7 +1299,7 @@ static void update_wall_time(void)
>  * Called from the timer interrupt handler to charge one tick to the current 
>  * process.  user_tick is 1 if the tick is user time, 0 for system.
>  */
>-void update_process_times(int user_tick)
>+void update_process_times(int user_tick, struct pt_regs *regs)
> {
> 	struct task_struct *p = current;
> 	int cpu = smp_processor_id();
>@@ -1309,7 +1309,7 @@ void update_process_times(int user_tick)
> 		account_user_time(p, jiffies_to_cputime(1));
> 	else
> 		account_system_time(p, HARDIRQ_OFFSET, jiffies_to_cputime(1));
>-	run_local_timers();
>+	run_local_timers(regs);
> 	if (rcu_pending(cpu))
> 		rcu_check_callbacks(cpu, user_tick);
> 	scheduler_tick();
>@@ -1383,10 +1383,10 @@ static void run_timer_softirq(struct sof
> /*
>  * Called by the local, per-CPU timer interrupt on SMP.
>  */
>-void run_local_timers(void)
>+void run_local_timers(struct pt_regs *regs)
> {
> 	raise_softirq(TIMER_SOFTIRQ);
>-	softlockup_tick();
>+	softlockup_tick(regs);
> }
> 
> /*

Actions: View | Diff

Attachments on bug 336541: 231021 | 231081 | 231371