Attachment 21098 Details for Bug 56951

[patch] proposed patch

fpu-hang-fix (text/plain), 6.30 KB, created by Andreas Kleen on 2004-06-13 05:44:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andreas Kleen

Created: 2004-06-13 05:44:26 UTC

Size: 6.30 KB

patch

obsolete

>diff -u linux-2.6.7rc3-bk3/include/asm-x86_64/i387.h-o linux-2.6.7rc3-bk3/include/asm-x86_64/i387.h
>--- linux-2.6.7rc3-bk3/include/asm-x86_64/i387.h-o	2004-06-11 03:03:15.000000000 +0200
>+++ linux-2.6.7rc3-bk3/include/asm-x86_64/i387.h	2004-06-12 21:55:34.000000000 +0200
>@@ -46,9 +46,20 @@
> 		save_init_fpu(tsk); \
> } while (0)
> 
>+/* Ignore delayed exceptions from user space */
>+static inline void tolerant_fwait(void)
>+{ 
>+	asm volatile("1: fwait\n"
>+		     "2:\n"
>+		     "   .section __ex_table,\"a\"\n"
>+		     "	.align 8\n"
>+		     "	.quad 1b,2b\n"
>+		     "	.previous\n");
>+} 
>+
> #define clear_fpu(tsk) do { \
> 	if ((tsk)->thread_info->status & TS_USEDFPU) {		\
>-		asm volatile("fwait");				\
>+		tolerant_fwait();				\
> 		(tsk)->thread_info->status &= ~TS_USEDFPU;	\
> 		stts();						\
> 	}							\
>diff -u linux-2.6.7rc3-bk3/include/asm-i386/i387.h-o linux-2.6.7rc3-bk3/include/asm-i386/i387.h
>--- linux-2.6.7rc3-bk3/include/asm-i386/i387.h-o	2004-05-10 09:44:21.000000000 +0200
>+++ linux-2.6.7rc3-bk3/include/asm-i386/i387.h	2004-06-12 22:16:04.000000000 +0200
>@@ -28,6 +28,17 @@
> extern void kernel_fpu_begin(void);
> #define kernel_fpu_end() do { stts(); preempt_enable(); } while(0)
> 
>+/* Ignore delayed exceptions from user space */
>+static inline void tolerant_fwait(void)
>+{ 
>+	asm volatile("1: fwait\n"
>+		     "2:\n"
>+		     "   .section __ex_table,\"a\"\n"
>+		     "	.align 4\n"
>+		     "	.long 1b,2b\n"
>+		     "	.previous\n");
>+} 
>+
> /*
>  * These must be called with preempt disabled
>  */
>@@ -37,8 +48,9 @@
> 		asm volatile( "fxsave %0 ; fnclex"
> 			      : "=m" (tsk->thread.i387.fxsave) );
> 	} else {
>-		asm volatile( "fnsave %0 ; fwait"
>+		asm volatile( "fnsave %0"
> 			      : "=m" (tsk->thread.i387.fsave) );
>+		tolerant_fwait();
> 	}
> 	tsk->thread_info->status &= ~TS_USEDFPU;
> }
>@@ -51,7 +63,7 @@
> #define __clear_fpu( tsk )					\
> do {								\
> 	if ((tsk)->thread_info->status & TS_USEDFPU) {		\
>-		asm volatile("fwait");				\
>+		tolerant_fwait();				\
> 		(tsk)->thread_info->status &= ~TS_USEDFPU;	\
> 		stts();						\
> 	}							\
>diff -u linux-2.6.7rc3-bk3/arch/i386/kernel/i8259.c-o linux-2.6.7rc3-bk3/arch/i386/kernel/i8259.c
>--- linux-2.6.7rc3-bk3/arch/i386/kernel/i8259.c-o	2004-05-10 09:43:22.000000000 +0200
>+++ linux-2.6.7rc3-bk3/arch/i386/kernel/i8259.c	2004-06-12 22:04:37.000000000 +0200
>@@ -329,7 +329,7 @@
> #endif
> 	if (ignore_fpu_irq || !boot_cpu_data.hard_math)
> 		return IRQ_NONE;
>-	math_error((void *)regs->eip);
>+	math_error(regs);
> 	return IRQ_HANDLED;
> }
> 
>diff -u linux-2.6.7rc3-bk3/arch/i386/kernel/traps.c-o linux-2.6.7rc3-bk3/arch/i386/kernel/traps.c
>--- linux-2.6.7rc3-bk3/arch/i386/kernel/traps.c-o	2004-06-11 03:02:34.000000000 +0200
>+++ linux-2.6.7rc3-bk3/arch/i386/kernel/traps.c	2004-06-12 22:18:05.000000000 +0200
>@@ -660,12 +660,23 @@
>  * the correct behaviour even in the presence of the asynchronous
>  * IRQ13 behaviour
>  */
>-void math_error(void *eip)
>+void math_error(struct pt_regs *regs)
> {
>+	void *eip = (void *)regs->eip;
> 	struct task_struct * task;
> 	siginfo_t info;
> 	unsigned short cwd, swd;
> 
>+	if ((regs->xcs & 3) == 0) {
>+		const struct exception_table_entry *fixup;
>+		fixup = search_exception_tables(regs->eip);
>+		if (fixup) {
>+			regs->eip = fixup->fixup;
>+			return;
>+		}
>+		die("kernel math error", regs, 0);
>+	}
>+
> 	/*
> 	 * Save the info for the exception handler and clear the error.
> 	 */
>@@ -719,15 +730,26 @@
> asmlinkage void do_coprocessor_error(struct pt_regs * regs, long error_code)
> {
> 	ignore_fpu_irq = 1;
>-	math_error((void *)regs->eip);
>+	math_error(regs);
> }
> 
>-void simd_math_error(void *eip)
>+void simd_math_error(struct pt_regs *regs)
> {
>+	void *eip = (void *)regs->eip;
> 	struct task_struct * task;
> 	siginfo_t info;
> 	unsigned short mxcsr;
> 
>+	if ((regs->xcs & 3) == 0) {
>+		const struct exception_table_entry *fixup;
>+		fixup = search_exception_tables(regs->eip);
>+		if (fixup) {
>+			regs->eip = fixup->fixup;
>+			return;
>+		}
>+		die("kernel math error", regs, 0);
>+	}
>+
> 	/*
> 	 * Save the info for the exception handler and clear the error.
> 	 */
>@@ -776,7 +798,7 @@
> 	if (cpu_has_xmm) {
> 		/* Handle SIMD FPU exceptions on PIII+ processors. */
> 		ignore_fpu_irq = 1;
>-		simd_math_error((void *)regs->eip);
>+		simd_math_error(regs);
> 	} else {
> 		/*
> 		 * Handle strange cache flush from user space exception
>diff -u linux-2.6.7rc3-bk3/arch/x86_64/kernel/traps.c-o linux-2.6.7rc3-bk3/arch/x86_64/kernel/traps.c
>--- linux-2.6.7rc3-bk3/arch/x86_64/kernel/traps.c-o	2004-06-11 03:02:42.000000000 +0200
>+++ linux-2.6.7rc3-bk3/arch/x86_64/kernel/traps.c	2004-06-12 22:00:28.000000000 +0200
>@@ -686,11 +686,25 @@
>  * the correct behaviour even in the presence of the asynchronous
>  * IRQ13 behaviour
>  */
>-void math_error(void *rip)
>+asmlinkage void do_coprocessor_error(struct pt_regs * regs)
> {
>+	void *rip = (void *)regs->rip;
> 	struct task_struct * task;
> 	siginfo_t info;
> 	unsigned short cwd, swd;
>+
>+	conditional_sti(regs);
>+	if ((regs->cs & 3) == 0) {
>+		const struct exception_table_entry *fixup;
>+		fixup = search_exception_tables(regs->rip);
>+		if (fixup) {
>+			regs->rip = fixup->fixup;
>+			return;
>+		}
>+		notify_die(DIE_GPF, "kernel math error", regs, 0, 16, SIGFPE); 
>+		die("kernel math error", regs, 0);
>+	}
>+		
> 	/*
> 	 * Save the info for the exception handler and clear the error.
> 	 */
>@@ -740,23 +754,30 @@
> 	force_sig_info(SIGFPE, &info, task);
> }
> 
>-asmlinkage void do_coprocessor_error(struct pt_regs * regs)
>-{
>-	conditional_sti(regs);
>-	math_error((void *)regs->rip);
>-}
>-
> asmlinkage void bad_intr(void)
> {
> 	printk("bad interrupt"); 
> }
> 
>-static inline void simd_math_error(void *rip)
>+asmlinkage void do_simd_coprocessor_error(struct pt_regs * regs)
> {
>+	void *rip = (void *)regs->rip;
> 	struct task_struct * task;
> 	siginfo_t info;
> 	unsigned short mxcsr;
> 
>+	conditional_sti(regs);
>+	if ((regs->cs & 3) == 0) {
>+		const struct exception_table_entry *fixup;
>+		fixup = search_exception_tables(regs->rip);
>+		if (fixup) {
>+			regs->rip = fixup->fixup;
>+			return;
>+		}
>+		notify_die(DIE_GPF, "kernel simd error", regs, 0, 16, SIGFPE); 
>+		die("kernel simd error", regs, 0);
>+	}
>+
> 	/*
> 	 * Save the info for the exception handler and clear the error.
> 	 */
>@@ -799,12 +820,6 @@
> 	force_sig_info(SIGFPE, &info, task);
> }
> 
>-asmlinkage void do_simd_coprocessor_error(struct pt_regs * regs)
>-{
>-	conditional_sti(regs);
>-		simd_math_error((void *)regs->rip);
>-}
>-
> asmlinkage void do_spurious_interrupt_bug(struct pt_regs * regs)
> {
> }

Actions: View | Diff

Attachments on bug 56951: 21095 | 21098 | 21103 | 21181