Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make FPU handling preemption safe.

Browse Source
This commit is contained in:
ad 2008-04-28 18:15:39 +00:00
parent 64bcc9bd8b
commit 67d2c7edc1
2 changed files with 41 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/arch/i386/i386/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.629 2008/04/24 18:39:20 ad Exp $ */
/* $NetBSD: machdep.c,v 1.630 2008/04/28 18:15:39 ad Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2000, 2004, 2006, 2008 The NetBSD Foundation, Inc.
@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.629 2008/04/24 18:39:20 ad Exp $");
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.630 2008/04/28 18:15:39 ad Exp $");
#include "opt_beep.h"
#include "opt_compat_ibcs2.h"
@ -1827,7 +1827,8 @@ init386(paddr_t first_avail)
/* exceptions */
for (x = 0; x < 32; x++) {
idt_vec_reserve(x);
setgate(&idt[x], IDTVEC(exceptions)[x], 0, SDT_SYS386TGT,
setgate(&idt[x], IDTVEC(exceptions)[x], 0,
(x == 7 || x == 16) ? SDT_SYS386IGT : SDT_SYS386TGT,
(x == 3 || x == 4) ? SEL_UPL : SEL_KPL,
GSEL(GCODE_SEL, SEL_KPL));
}

41
sys/arch/i386/isa/npx.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: npx.c,v 1.127 2008/03/04 14:53:38 cube Exp $ */
/* $NetBSD: npx.c,v 1.128 2008/04/28 18:15:39 ad Exp $ */
/*-
* Copyright (c) 1991 The Regents of the University of California.
@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: npx.c,v 1.127 2008/03/04 14:53:38 cube Exp $");
__KERNEL_RCSID(0, "$NetBSD: npx.c,v 1.128 2008/04/28 18:15:39 ad Exp $");
#if 0
#define IPRINTF(x) printf x
@ -357,6 +357,12 @@ npxintr(void *arg, struct intrframe *frame)
sc = npx_softc;
kpreempt_disable();
#ifndef XEN
KASSERT((x86_read_psl() & PSL_I) == 0);
x86_enable_intr();
#endif
uvmexp.traps++;
IPRINTF(("%s: fp intr\n", device_xname(ci->ci_dev)));
@ -371,13 +377,16 @@ npxintr(void *arg, struct intrframe *frame)
* If we're saving, ignore the interrupt. The FPU will generate
* another one when we restore the state later.
*/
if (ci->ci_fpsaving)
if (ci->ci_fpsaving) {
kpreempt_enable();
return (1);
}
if (l == NULL || npx_type == NPX_NONE) {
printf("npxintr: l = %p, curproc = %p, npx_type = %d\n",
l, curproc, npx_type);
printf("npxintr: came from nowhere");
kpreempt_enable();
return 1;
}
@ -475,6 +484,7 @@ npxintr(void *arg, struct intrframe *frame)
psignal(l->l_proc, SIGFPE);
}
kpreempt_enable();
return (1);
}
@ -521,9 +531,16 @@ npxdna_xmm(struct cpu_info *ci)
KDASSERT(i386_use_fxsave == 1);
kpreempt_disable();
#ifndef XEN
KASSERT((x86_read_psl() & PSL_I) == 0);
x86_enable_intr();
#endif
if (ci->ci_fpsaving) {
#ifndef XEN
printf("recursive npx trap; cr0=%x\n", rcr0());
kpreempt_enable();
return (0);
#else
/*
@ -531,6 +548,7 @@ npxdna_xmm(struct cpu_info *ci)
* fpu_save, if we're saving the FPU state not from interrupt
* context (f.i. during fork()). Just return in this case.
*/
kpreempt_enable();
return (1);
#endif /* XEN */
}
@ -594,6 +612,7 @@ npxdna_xmm(struct cpu_info *ci)
fxrstor(&l->l_addr->u_pcb.pcb_savefpu.sv_xmm);
}
kpreempt_enable();
return (1);
}
@ -605,9 +624,16 @@ npxdna_s87(struct cpu_info *ci)
KDASSERT(i386_use_fxsave == 0);
kpreempt_disable();
#ifndef XEN
KASSERT((x86_read_psl() & PSL_I) == 0);
x86_enable_intr();
#endif
if (ci->ci_fpsaving) {
#ifndef XEN
printf("recursive npx trap; cr0=%x\n", rcr0());
kpreempt_enable();
return (0);
#else
/*
@ -615,6 +641,7 @@ npxdna_s87(struct cpu_info *ci)
* fpu_save, if we're saving the FPU state not from interrupt
* context (f.i. during fork()). Just return in this case.
*/
kpreempt_enable();
return (1);
#endif /* XEN */
}
@ -674,6 +701,7 @@ npxdna_s87(struct cpu_info *ci)
frstor(&l->l_addr->u_pcb.pcb_savefpu.sv_87);
}
kpreempt_enable();
return (1);
}
@ -684,6 +712,8 @@ npxsave_cpu(bool save)
struct lwp *l;
int s;
KASSERT(kpreempt_disabled());
l = ci->ci_fpcurlwp;
if (l == NULL)
return;
@ -746,13 +776,15 @@ npxsave_lwp(struct lwp *l, bool save)
{
struct cpu_info *oci;
KDASSERT(l->l_addr != NULL);
KASSERT(l->l_addr != NULL);
kpreempt_disable();
oci = l->l_addr->u_pcb.pcb_fpcpu;
if (oci == NULL) {
#ifdef XEN
HYPERVISOR_fpu_taskswitch();
#endif
kpreempt_enable();
return;
}
@ -797,4 +829,5 @@ npxsave_lwp(struct lwp *l, bool save)
#ifdef XEN
HYPERVISOR_fpu_taskswitch();
#endif
kpreempt_enable();
}