Module Name: src
Committed By: jdolecek
Date: Wed Jun 20 20:43:21 UTC 2018
Modified Files:
src/sys/arch/x86/include: fpu.h
src/sys/arch/x86/x86: cpu.c fpu.c
src/sys/arch/xen/x86: cpu.c
Log Message:
as a stop-gap, make fpuinit_mxcsr_mask() for native independant of
XSAVE as it should be, only xen case checks the flag now; need to
investigate further why exactly the fault happens for the xen
no-xsave case
pointed out by maxv
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/x86/include/fpu.h
cvs rdiff -u -r1.156 -r1.157 src/sys/arch/x86/x86/cpu.c
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/x86/x86/fpu.c
cvs rdiff -u -r1.118 -r1.119 src/sys/arch/xen/x86/cpu.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/include/fpu.h
diff -u src/sys/arch/x86/include/fpu.h:1.10 src/sys/arch/x86/include/fpu.h:1.11
--- src/sys/arch/x86/include/fpu.h:1.10 Tue Jun 19 19:50:19 2018
+++ src/sys/arch/x86/include/fpu.h Wed Jun 20 20:43:20 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu.h,v 1.10 2018/06/19 19:50:19 jdolecek Exp $ */
+/* $NetBSD: fpu.h,v 1.11 2018/06/20 20:43:20 jdolecek Exp $ */
#ifndef _X86_FPU_H_
#define _X86_FPU_H_
@@ -12,7 +12,7 @@ struct lwp;
struct trapframe;
void fpuinit(struct cpu_info *);
-void fpuinit_mxcsr_mask(uint32_t);
+void fpuinit_mxcsr_mask(bool);
void fpusave_lwp(struct lwp *, bool);
void fpusave_cpu(bool);
Index: src/sys/arch/x86/x86/cpu.c
diff -u src/sys/arch/x86/x86/cpu.c:1.156 src/sys/arch/x86/x86/cpu.c:1.157
--- src/sys/arch/x86/x86/cpu.c:1.156 Tue Jun 19 19:50:19 2018
+++ src/sys/arch/x86/x86/cpu.c Wed Jun 20 20:43:21 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.156 2018/06/19 19:50:19 jdolecek Exp $ */
+/* $NetBSD: cpu.c,v 1.157 2018/06/20 20:43:21 jdolecek Exp $ */
/*
* Copyright (c) 2000-2012 NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.156 2018/06/19 19:50:19 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.157 2018/06/20 20:43:21 jdolecek Exp $");
#include "opt_ddb.h"
#include "opt_mpbios.h" /* for MPDEBUG */
@@ -638,7 +638,7 @@ cpu_init(struct cpu_info *ci)
}
if (x86_fpu_save >= FPU_SAVE_FXSAVE) {
- fpuinit_mxcsr_mask(cr4);
+ fpuinit_mxcsr_mask(true);
}
/* If xsave is enabled, enable all fpu features */
Index: src/sys/arch/x86/x86/fpu.c
diff -u src/sys/arch/x86/x86/fpu.c:1.40 src/sys/arch/x86/x86/fpu.c:1.41
--- src/sys/arch/x86/x86/fpu.c:1.40 Tue Jun 19 19:50:19 2018
+++ src/sys/arch/x86/x86/fpu.c Wed Jun 20 20:43:21 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu.c,v 1.40 2018/06/19 19:50:19 jdolecek Exp $ */
+/* $NetBSD: fpu.c,v 1.41 2018/06/20 20:43:21 jdolecek 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.40 2018/06/19 19:50:19 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu.c,v 1.41 2018/06/20 20:43:21 jdolecek Exp $");
#include "opt_multiprocessor.h"
@@ -237,10 +237,10 @@ fpuinit(struct cpu_info *ci)
* Get the value of MXCSR_MASK supported by the CPU.
*/
void
-fpuinit_mxcsr_mask(uint32_t cr4)
+fpuinit_mxcsr_mask(bool has_fxsave)
{
- if ((cr4 & CR4_OSXSAVE) == 0) {
+ if (!has_fxsave) {
x86_fpu_mxcsr_mask = __INITIAL_MXCSR_MASK__;
return;
}
Index: src/sys/arch/xen/x86/cpu.c
diff -u src/sys/arch/xen/x86/cpu.c:1.118 src/sys/arch/xen/x86/cpu.c:1.119
--- src/sys/arch/xen/x86/cpu.c:1.118 Tue Jun 19 19:50:19 2018
+++ src/sys/arch/xen/x86/cpu.c Wed Jun 20 20:43:20 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.118 2018/06/19 19:50:19 jdolecek Exp $ */
+/* $NetBSD: cpu.c,v 1.119 2018/06/20 20:43:20 jdolecek Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.118 2018/06/19 19:50:19 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.119 2018/06/20 20:43:20 jdolecek Exp $");
#include "opt_ddb.h"
#include "opt_multiprocessor.h"
@@ -564,7 +564,8 @@ cpu_init(struct cpu_info *ci)
}
if (x86_fpu_save >= FPU_SAVE_FXSAVE) {
- fpuinit_mxcsr_mask(cr4);
+ /* XXX fxsave() faults on Xen with no-xsave flag, why? */
+ fpuinit_mxcsr_mask((cr4 & CR4_OSXSAVE) != 0);
}
/*
