[src/trunk]: src/sys/arch/i386/i386 HANDLE_DEFERRED_FPU has to be donne with ...

[bouyer <bouyer%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/bce42d878da8
branches:  trunk
changeset: 932230:bce42d878da8
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Sat May 02 18:49:57 2020 +0000

description:
HANDLE_DEFERRED_FPU has to be donne with interrupt disabled;
move it before STIC.
Fix fpudna panic on i386 PV

diffstat:

 sys/arch/i386/i386/i386_trap.S |  8 ++++----
 sys/arch/i386/i386/locore.S    |  8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diffs (72 lines):

diff -r c377f569ff2d -r bce42d878da8 sys/arch/i386/i386/i386_trap.S
--- a/sys/arch/i386/i386/i386_trap.S    Sat May 02 18:43:02 2020 +0000
+++ b/sys/arch/i386/i386/i386_trap.S    Sat May 02 18:49:57 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i386_trap.S,v 1.21 2020/04/25 15:26:17 bouyer Exp $    */
+/*     $NetBSD: i386_trap.S,v 1.22 2020/05/02 18:49:57 bouyer Exp $    */
 
 /*
  * Copyright 2002 (c) Wasabi Systems, Inc.
@@ -66,7 +66,7 @@
 
 #if 0
 #include <machine/asm.h>
-__KERNEL_RCSID(0, "$NetBSD: i386_trap.S,v 1.21 2020/04/25 15:26:17 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i386_trap.S,v 1.22 2020/05/02 18:49:57 bouyer Exp $");
 #endif
 
 /*
@@ -434,6 +434,8 @@
 3:     CHECK_DEFERRED_SWITCH
        jnz     9f
 
+       HANDLE_DEFERRED_FPU
+
 #ifdef XENPV
        STIC(%eax)
        jz      22f
@@ -458,8 +460,6 @@
 22:
 #endif /* XEN */
 
-       HANDLE_DEFERRED_FPU
-
 6:
 #ifdef DIAGNOSTIC
        cmpl    CPUVAR(ILEVEL),%ebx
diff -r c377f569ff2d -r bce42d878da8 sys/arch/i386/i386/locore.S
--- a/sys/arch/i386/i386/locore.S       Sat May 02 18:43:02 2020 +0000
+++ b/sys/arch/i386/i386/locore.S       Sat May 02 18:49:57 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locore.S,v 1.182 2020/05/02 16:44:35 bouyer Exp $      */
+/*     $NetBSD: locore.S,v 1.183 2020/05/02 18:49:57 bouyer Exp $      */
 
 /*
  * Copyright-o-rama!
@@ -128,7 +128,7 @@
  */
 
 #include <machine/asm.h>
-__KERNEL_RCSID(0, "$NetBSD: locore.S,v 1.182 2020/05/02 16:44:35 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: locore.S,v 1.183 2020/05/02 18:49:57 bouyer Exp $");
 
 #include "opt_copy_symtab.h"
 #include "opt_ddb.h"
@@ -1560,6 +1560,8 @@
        orl     CPUVAR(WANT_PMAPLOAD), %eax
        jnz     9f
 
+       HANDLE_DEFERRED_FPU
+
 #ifdef XENPV
        STIC(%eax)
        jz      14f
@@ -1589,8 +1591,6 @@
        jne     3f
 #endif
 
-       HANDLE_DEFERRED_FPU
-
        INTRFASTEXIT
 
 #ifdef DIAGNOSTIC