CVS commit: src/sys/arch/x86/x86

[Maxime Villard]

Module Name:    src
Committed By:   maxv
Date:           Mon Jun 18 20:20:27 UTC 2018

Modified Files:
        src/sys/arch/x86/x86: fpu.c

Log Message:
Add more KASSERTs, see if they help PR/53383.


To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/x86/x86/fpu.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/arch/x86/x86/fpu.c
diff -u src/sys/arch/x86/x86/fpu.c:1.37 src/sys/arch/x86/x86/fpu.c:1.38
--- src/sys/arch/x86/x86/fpu.c:1.37	Sun Jun 17 06:03:40 2018
+++ src/sys/arch/x86/x86/fpu.c	Mon Jun 18 20:20:27 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: fpu.c,v 1.37 2018/06/17 06:03:40 maxv Exp $	*/
+/*	$NetBSD: fpu.c,v 1.38 2018/06/18 20:20:27 maxv Exp $	*/
 
 /*
  * Copyright (c) 2008 The NetBSD Foundation, Inc.  All
@@ -96,7 +96,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fpu.c,v 1.37 2018/06/17 06:03:40 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu.c,v 1.38 2018/06/18 20:20:27 maxv Exp $");
 
 #include "opt_multiprocessor.h"
 
@@ -628,6 +628,7 @@ fpu_save_area_clear(struct lwp *l, unsig
 	fpusave_lwp(l, false);
 	fpu_save = process_fpframe(l);
 	pcb = lwp_getpcb(l);
+	KASSERT(pcb->pcb_fpcpu == NULL);
 
 	if (i386_use_fxsave) {
 		memset(&fpu_save->sv_xmm, 0, x86_fpu_save_size);
@@ -654,6 +655,7 @@ fpu_save_area_clear(struct lwp *l, unsig
 	 * CPU.
 	 */
 	if (x86_fpu_eager) {
+		KASSERT(l == curlwp);
 		fpu_eagerswitch(NULL, l);
 	}
 }
@@ -693,6 +695,8 @@ fpu_save_area_fork(struct pcb *pcb2, con
 
 	if (extra > 0)
 		memcpy(pcb2 + 1, pcb1 + 1, extra);
+
+	KASSERT(pcb2->pcb_fpcpu == NULL);
 }
 
 /* -------------------------------------------------------------------------- */