diff options
| author | Robert Mustacchi <rm@joyent.com> | 2018-06-13 17:09:14 +0000 |
|---|---|---|
| committer | Robert Mustacchi <rm@joyent.com> | 2018-06-19 19:34:37 +0000 |
| commit | d0158222a5936ac26b7a03241b7d2df18cc544c8 (patch) | |
| tree | 6fa0050ece90a408b6962a4af14d676026388900 /usr/src/uts/common/exec | |
| parent | c7fbe46df966ea665df63b6e6071808987e839d1 (diff) | |
| download | illumos-joyent-d0158222a5936ac26b7a03241b7d2df18cc544c8.tar.gz | |
9596 Initial xsave xstate_bv should not include all features
9595 rtld should conditionally save AVX-512 state
Reviewed by: John Levon <john.levon@joyent.com>
Reviewed by: Patrick Mooney <patrick.mooney@joyent.com>
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>
Reviewed by: Bryan Cantrill <bryan@joyent.com>
Reviewed by: Toomas Soome <tsoome@me.com>
Approved by: Richard Lowe <richlowe@richlowe.net>
Diffstat (limited to 'usr/src/uts/common/exec')
| -rw-r--r-- | usr/src/uts/common/exec/elf/elf.c | 27 |
1 files changed, 22 insertions, 5 deletions
diff --git a/usr/src/uts/common/exec/elf/elf.c b/usr/src/uts/common/exec/elf/elf.c index 5c8d03ae11..141baa4aeb 100644 --- a/usr/src/uts/common/exec/elf/elf.c +++ b/usr/src/uts/common/exec/elf/elf.c @@ -26,7 +26,7 @@ /* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */ /* All Rights Reserved */ /* - * Copyright 2016 Joyent, Inc. + * Copyright (c) 2018, Joyent, Inc. */ #include <sys/types.h> @@ -70,6 +70,7 @@ #if defined(__x86) #include <sys/comm_page_util.h> +#include <sys/fp.h> #endif /* defined(__x86) */ @@ -289,8 +290,8 @@ elfexec(vnode_t *vp, execa_t *uap, uarg_t *args, intpdata_t *idatap, int brand_action) { caddr_t phdrbase = NULL; - caddr_t bssbase = 0; - caddr_t brkbase = 0; + caddr_t bssbase = 0; + caddr_t brkbase = 0; size_t brksize = 0; ssize_t dlnsize; aux_entry_t *aux; @@ -522,9 +523,12 @@ elfexec(vnode_t *vp, execa_t *uap, uarg_t *args, intpdata_t *idatap, * On supported kernels (x86_64) make room in the auxv for the * AT_SUN_COMMPAGE entry. This will go unpopulated on i86xpv systems * which do not provide such functionality. + * + * Additionally cover the floating point information AT_SUN_FPSIZE and + * AT_SUN_FPTYPE. */ #if defined(__amd64) - args->auxsize += sizeof (aux_entry_t); + args->auxsize += 3 * sizeof (aux_entry_t); #endif /* defined(__amd64) */ if ((brand_action != EBA_NATIVE) && (PROC_IS_BRANDED(p))) { @@ -833,6 +837,8 @@ elfexec(vnode_t *vp, execa_t *uap, uarg_t *args, intpdata_t *idatap, if (hasauxv) { int auxf = AF_SUN_HWCAPVERIFY; + size_t fpsize; + int fptype; /* * Note: AT_SUN_PLATFORM and AT_SUN_EXECNAME were filled in via @@ -910,7 +916,8 @@ elfexec(vnode_t *vp, execa_t *uap, uarg_t *args, intpdata_t *idatap, } /* - * Add the comm page auxv entry, mapping it in if needed. + * Add the comm page auxv entry, mapping it in if needed. Also + * take care of the FPU entries. */ #if defined(__amd64) if (args->commpage != NULL || @@ -923,6 +930,16 @@ elfexec(vnode_t *vp, execa_t *uap, uarg_t *args, intpdata_t *idatap, */ ADDAUX(aux, AT_NULL, 0) } + + fptype = AT_386_FPINFO_NONE; + fpu_auxv_info(&fptype, &fpsize); + if (fptype != AT_386_FPINFO_NONE) { + ADDAUX(aux, AT_SUN_FPTYPE, fptype) + ADDAUX(aux, AT_SUN_FPSIZE, fpsize) + } else { + ADDAUX(aux, AT_NULL, 0) + ADDAUX(aux, AT_NULL, 0) + } #endif /* defined(__amd64) */ ADDAUX(aux, AT_NULL, 0) |