diff options
| author | riastradh <riastradh@NetBSD.org> | 2023-02-25 13:52:09 +0000 |
|---|---|---|
| committer | riastradh <riastradh@NetBSD.org> | 2023-02-25 13:52:09 +0000 |
| commit | d30037bb2e03dc3db2fa59701ff2276dc15b60fe (patch) | |
| tree | 1967530aa57861a155d495f738e27923de9b84d0 /sys | |
| parent | 4e508b71acf6f955ac46c5ea6d6c614ff092976a (diff) | |
i386/bioscall: Disable preemption while we load the kernel pmap.
Fixes crash on boot in new KASSERT(kpreempt_disabled()) in
cpu_load_pmap.
We could do KASSERT(kpreempt_disabled() || cold), but I don't know if
bioscall is ever reachable after warm boot; this way is safer.
XXX Would be nice if bioscall were a C function, not asm -- I don't
see any reason why we need it to be asm?
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/i386/i386/bioscall.S | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sys/arch/i386/i386/bioscall.S b/sys/arch/i386/i386/bioscall.S index 7d6100313fc..2c6b9b064f2 100644 --- a/sys/arch/i386/i386/bioscall.S +++ b/sys/arch/i386/i386/bioscall.S @@ -1,4 +1,4 @@ -/* $NetBSD: bioscall.S,v 1.10 2018/07/14 14:29:40 maxv Exp $ */ +/* $NetBSD: bioscall.S,v 1.11 2023/02/25 13:52:09 riastradh Exp $ */ /*- * Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <machine/asm.h> -__KERNEL_RCSID(0, "$NetBSD: bioscall.S,v 1.10 2018/07/14 14:29:40 maxv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bioscall.S,v 1.11 2023/02/25 13:52:09 riastradh Exp $"); #include <machine/bioscall.h> @@ -67,6 +67,8 @@ ENTRY(bioscall) pushl %ebp movl %esp,%ebp /* set up frame ptr */ + call _C_LABEL(kpreempt_disable) + /* install lwp0 pmap */ movl _C_LABEL(kernel_pmap_ptr),%eax pushl %eax @@ -85,5 +87,7 @@ ENTRY(bioscall) call _C_LABEL(cpu_load_pmap) addl $4,%esp + call _C_LABEL(kpreempt_enable) + leave ret |
