[src/trunk]: src/sys/arch/arm/vfp Limit arm32 fpu_kern_enter/leave to IPL_VM ...

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

details:   https://anonhg.NetBSD.org/src/rev/18d9e1ef78b6
branches:  trunk
changeset: 935942:18d9e1ef78b6
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Jul 13 16:53:06 2020 +0000

description:
Limit arm32 fpu_kern_enter/leave to IPL_VM or below.

diffstat:

 sys/arch/arm/vfp/vfp_init.c |  19 ++++++++++---------
 1 files changed, 10 insertions(+), 9 deletions(-)

diffs (49 lines):

diff -r 0b692c3b2239 -r 18d9e1ef78b6 sys/arch/arm/vfp/vfp_init.c
--- a/sys/arch/arm/vfp/vfp_init.c       Mon Jul 13 16:52:23 2020 +0000
+++ b/sys/arch/arm/vfp/vfp_init.c       Mon Jul 13 16:53:06 2020 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: vfp_init.c,v 1.66 2020/06/29 23:56:31 riastradh Exp $ */
+/*      $NetBSD: vfp_init.c,v 1.67 2020/07/13 16:53:06 riastradh Exp $ */
 
 /*
  * Copyright (c) 2008 ARM Ltd
@@ -32,7 +32,7 @@
 #include "opt_cputypes.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfp_init.c,v 1.66 2020/06/29 23:56:31 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfp_init.c,v 1.67 2020/07/13 16:53:06 riastradh Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
@@ -674,14 +674,15 @@
        int s;
 
        /*
-        * Block all interrupts.  We must block preemption since -- if
-        * this is a user thread -- there is nowhere to save the kernel
-        * fpu state, and if we want this to be usable in interrupts,
-        * we can't let interrupts interfere with the fpu state in use
-        * since there's nowhere for them to save it.
+        * Block interrupts up to IPL_VM.  We must block preemption
+        * since -- if this is a user thread -- there is nowhere to
+        * save the kernel fpu state, and if we want this to be usable
+        * in interrupts, we can't let interrupts interfere with the
+        * fpu state in use since there's nowhere for them to save it.
         */
-       s = splhigh();
+       s = splvm();
        ci = curcpu();
+       KASSERTMSG(ci->ci_cpl <= IPL_VM, "cpl=%d", ci->ci_cpl);
        KASSERT(ci->ci_kfpu_spl == -1);
        ci->ci_kfpu_spl = s;
 
@@ -709,7 +710,7 @@
        int s;
        uint32_t fpexc;
 
-       KASSERT(ci->ci_cpl == IPL_HIGH);
+       KASSERT(ci->ci_cpl == IPL_VM);
        KASSERT(ci->ci_kfpu_spl != -1);
 
        /*