svn commit: r333461 - head/sys/amd64/amd64
Konstantin Belousov
kib at FreeBSD.org
Thu May 10 15:01:45 UTC 2018
Author: kib
Date: Thu May 10 15:01:43 2018
New Revision: 333461
URL: https://svnweb.freebsd.org/changeset/base/333461
Log:
Make fpusave() and fpurestore() on amd64 ifuncs.
From now on, linking amd64 kernel requires either lld or newer ld.bfd.
Reviewed by: jhb (as part of the large patch)
Discussed with: emaste
Sponsored by: The FreeBSD Foundation
Differential revision: https://reviews.freebsd.org/D13838
Modified:
head/sys/amd64/amd64/fpu.c
Modified: head/sys/amd64/amd64/fpu.c
==============================================================================
--- head/sys/amd64/amd64/fpu.c Thu May 10 13:52:52 2018 (r333460)
+++ head/sys/amd64/amd64/fpu.c Thu May 10 15:01:43 2018 (r333461)
@@ -61,6 +61,7 @@ __FBSDID("$FreeBSD$");
#include <machine/specialreg.h>
#include <machine/segments.h>
#include <machine/ucontext.h>
+#include <x86/ifunc.h>
/*
* Floating point support.
@@ -151,26 +152,60 @@ struct xsave_area_elm_descr {
u_int size;
} *xsave_area_desc;
-void
-fpusave(void *addr)
+static void
+fpusave_xsave(void *addr)
{
- if (use_xsave)
- xsave((char *)addr, xsave_mask);
- else
- fxsave((char *)addr);
+ xsave((char *)addr, xsave_mask);
}
-void
-fpurestore(void *addr)
+static void
+fpurestore_xrstor(void *addr)
{
+ xrstor((char *)addr, xsave_mask);
+}
+
+static void
+fpusave_fxsave(void *addr)
+{
+
+ fxsave((char *)addr);
+}
+
+static void
+fpurestore_fxrstor(void *addr)
+{
+
+ fxrstor((char *)addr);
+}
+
+static void
+init_xsave(void)
+{
+
if (use_xsave)
- xrstor((char *)addr, xsave_mask);
- else
- fxrstor((char *)addr);
+ return;
+ if ((cpu_feature2 & CPUID2_XSAVE) == 0)
+ return;
+ use_xsave = 1;
+ TUNABLE_INT_FETCH("hw.use_xsave", &use_xsave);
}
+DEFINE_IFUNC(, void, fpusave, (void *), static)
+{
+
+ init_xsave();
+ return (use_xsave ? fpusave_xsave : fpusave_fxsave);
+}
+
+DEFINE_IFUNC(, void, fpurestore, (void *), static)
+{
+
+ init_xsave();
+ return (use_xsave ? fpurestore_xrstor : fpurestore_fxrstor);
+}
+
void
fpususpend(void *addr)
{
@@ -207,13 +242,8 @@ fpuinit_bsp1(void)
uint64_t xsave_mask_user;
bool old_wp;
- if ((cpu_feature2 & CPUID2_XSAVE) != 0) {
- use_xsave = 1;
- TUNABLE_INT_FETCH("hw.use_xsave", &use_xsave);
- }
if (!use_xsave)
return;
-
cpuid_count(0xd, 0x0, cp);
xsave_mask = XFEATURE_ENABLED_X87 | XFEATURE_ENABLED_SSE;
if ((cp[0] & xsave_mask) != xsave_mask)
More information about the svn-src-all
mailing list