Module Name: src
Committed By: riastradh
Date: Sun Jun 14 16:12:05 UTC 2020
Modified Files:
src/sys/arch/x86/include: cpufunc.h fpu.h
src/sys/arch/x86/x86: fpu.c
Log Message:
Use static constant rather than stack memset buffer for zero fpregs.
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/x86/include/cpufunc.h
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/x86/include/fpu.h
cvs rdiff -u -r1.64 -r1.65 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/include/cpufunc.h
diff -u src/sys/arch/x86/include/cpufunc.h:1.39 src/sys/arch/x86/include/cpufunc.h:1.40
--- src/sys/arch/x86/include/cpufunc.h:1.39 Sat May 2 11:37:17 2020
+++ src/sys/arch/x86/include/cpufunc.h Sun Jun 14 16:12:05 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: cpufunc.h,v 1.39 2020/05/02 11:37:17 maxv Exp $ */
+/* $NetBSD: cpufunc.h,v 1.40 2020/06/14 16:12:05 riastradh Exp $ */
/*
* Copyright (c) 1998, 2007, 2019 The NetBSD Foundation, Inc.
@@ -381,7 +381,7 @@ fnsave(void *addr)
}
static inline void
-frstor(void *addr)
+frstor(const void *addr)
{
const uint8_t *area = addr;
@@ -407,7 +407,7 @@ fxsave(void *addr)
}
static inline void
-fxrstor(void *addr)
+fxrstor(const void *addr)
{
const uint8_t *area = addr;
@@ -452,7 +452,7 @@ xsaveopt(void *addr, uint64_t mask)
}
static inline void
-xrstor(void *addr, uint64_t mask)
+xrstor(const void *addr, uint64_t mask)
{
const uint8_t *area = addr;
uint32_t low, high;
Index: src/sys/arch/x86/include/fpu.h
diff -u src/sys/arch/x86/include/fpu.h:1.20 src/sys/arch/x86/include/fpu.h:1.21
--- src/sys/arch/x86/include/fpu.h:1.20 Wed Nov 27 06:24:33 2019
+++ src/sys/arch/x86/include/fpu.h Sun Jun 14 16:12:05 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu.h,v 1.20 2019/11/27 06:24:33 maxv Exp $ */
+/* $NetBSD: fpu.h,v 1.21 2020/06/14 16:12:05 riastradh Exp $ */
#ifndef _X86_FPU_H_
#define _X86_FPU_H_
@@ -15,7 +15,7 @@ void fpuinit(struct cpu_info *);
void fpuinit_mxcsr_mask(void);
void fpu_area_save(void *, uint64_t);
-void fpu_area_restore(void *, uint64_t);
+void fpu_area_restore(const void *, uint64_t);
void fpu_save(void);
Index: src/sys/arch/x86/x86/fpu.c
diff -u src/sys/arch/x86/x86/fpu.c:1.64 src/sys/arch/x86/x86/fpu.c:1.65
--- src/sys/arch/x86/x86/fpu.c:1.64 Sat Jun 13 19:01:11 2020
+++ src/sys/arch/x86/x86/fpu.c Sun Jun 14 16:12:05 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu.c,v 1.64 2020/06/13 19:01:11 riastradh Exp $ */
+/* $NetBSD: fpu.c,v 1.65 2020/06/14 16:12:05 riastradh Exp $ */
/*
* Copyright (c) 2008, 2019 The NetBSD Foundation, Inc. All
@@ -96,7 +96,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fpu.c,v 1.64 2020/06/13 19:01:11 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu.c,v 1.65 2020/06/14 16:12:05 riastradh Exp $");
#include "opt_multiprocessor.h"
@@ -267,7 +267,7 @@ fpu_area_save(void *area, uint64_t xsave
}
void
-fpu_area_restore(void *area, uint64_t xsave_features)
+fpu_area_restore(const void *area, uint64_t xsave_features)
{
clts();
@@ -392,7 +392,7 @@ fpu_kern_enter(void)
void
fpu_kern_leave(void)
{
- union savefpu zero_fpu __aligned(64);
+ static const union savefpu zero_fpu __aligned(64);
struct cpu_info *ci = curcpu();
int s;
@@ -404,7 +404,6 @@ fpu_kern_leave(void)
* through Spectre-class attacks to userland, even if there are
* no bugs in fpu state management.
*/
- memset(&zero_fpu, 0, sizeof(zero_fpu));
fpu_area_restore(&zero_fpu, x86_xsave_features);
/*
