redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

x86: x86 i387 user_regset

Browse source 
This revamps the i387 code to be shared across 32-bit, 64-bit,
and 32-on-64.  It does so by consolidating the code in one place
based on the user_regset accessor interfaces.  This switches
32-bit to using the i387_64.h header and 64-bit to using the
i387.c that was previously i387_32.c, but that's what took the
least cleanup in each file.  Here i387.h is stubbed to always
include i387_64.h rather than renaming the file, to keep this
diff smaller and easier to read.

Signed-off-by: Roland McGrath <roland@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Roland McGrath 2008-01-30 13:31:50 +01:00 committed by Ingo Molnar
parent b7b71725fb
commit 4421011120
8 changed files with 281 additions and 270 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/x86/ia32/Makefile
View file

@ -3,7 +3,7 @@
# #
obj-$(CONFIG_IA32_EMULATION) := ia32entry.o sys_ia32.o ia32_signal.o \ obj-$(CONFIG_IA32_EMULATION) := ia32entry.o sys_ia32.o ia32_signal.o \
ia32_binfmt.o fpu32.o ia32_binfmt.o
sysv-$(CONFIG_SYSVIPC) := ipc32.o sysv-$(CONFIG_SYSVIPC) := ipc32.o
obj-$(CONFIG_IA32_EMULATION) += $(sysv-y) obj-$(CONFIG_IA32_EMULATION) += $(sysv-y)

5
arch/x86/ia32/ia32_signal.c
View file

@ -29,7 +29,6 @@
#include <asm/ia32_unistd.h> #include <asm/ia32_unistd.h>
#include <asm/user32.h> #include <asm/user32.h>
#include <asm/sigcontext32.h> #include <asm/sigcontext32.h>
#include <asm/fpu32.h>
#include <asm/proto.h> #include <asm/proto.h>
#include <asm/vdso.h> #include <asm/vdso.h>
@ -258,7 +257,7 @@ static int ia32_restore_sigcontext(struct pt_regs *regs,
if (buf) { if (buf) {
if (!access_ok(VERIFY_READ, buf, sizeof(*buf))) if (!access_ok(VERIFY_READ, buf, sizeof(*buf)))
goto badframe; goto badframe;
err |= restore_i387_ia32(current, buf, 0); err |= restore_i387_ia32(buf);
} else { } else {
struct task_struct *me = current; struct task_struct *me = current;
@ -377,7 +376,7 @@ static int ia32_setup_sigcontext(struct sigcontext_ia32 __user *sc,
err |= __put_user((u32)regs->flags, &sc->flags); err |= __put_user((u32)regs->flags, &sc->flags);
err |= __put_user((u32)regs->sp, &sc->sp_at_signal); err |= __put_user((u32)regs->sp, &sc->sp_at_signal);
tmp = save_i387_ia32(current, fpstate, regs, 0); tmp = save_i387_ia32(fpstate);
if (tmp < 0) if (tmp < 0)
err = -EFAULT; err = -EFAULT;
else { else {

3
arch/x86/kernel/Makefile_64
View file

@ -7,7 +7,7 @@ CPPFLAGS_vmlinux.lds += -Ux86_64
obj-y := process_64.o signal_64.o entry_64.o traps_64.o irq_64.o \ obj-y := process_64.o signal_64.o entry_64.o traps_64.o irq_64.o \
time_64.o ioport_64.o ldt.o setup_64.o i8259_64.o sys_x86_64.o \ time_64.o ioport_64.o ldt.o setup_64.o i8259_64.o sys_x86_64.o \
x8664_ksyms_64.o i387_64.o syscall_64.o vsyscall_64.o \ x8664_ksyms_64.o syscall_64.o vsyscall_64.o \
setup64.o bootflag.o e820_64.o reboot_64.o quirks.o i8237.o \ setup64.o bootflag.o e820_64.o reboot_64.o quirks.o i8237.o \
pci-dma_64.o pci-nommu_64.o alternative.o hpet.o tsc_64.o bugs_64.o \ pci-dma_64.o pci-nommu_64.o alternative.o hpet.o tsc_64.o bugs_64.o \
i8253.o io_delay.o rtc.o i8253.o io_delay.o rtc.o
@ -16,6 +16,7 @@ obj-y += ptrace.o
obj-y += ds.o obj-y += ds.o
obj-y += step.o obj-y += step.o
obj-y += i387.o
obj-$(CONFIG_IA32_EMULATION) += tls.o obj-$(CONFIG_IA32_EMULATION) += tls.o
obj-$(CONFIG_STACKTRACE) += stacktrace.o obj-$(CONFIG_STACKTRACE) += stacktrace.o
obj-y += cpu/ obj-y += cpu/

513
arch/x86/kernel/i387.c
View file

@ -8,6 +8,7 @@
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/regset.h>
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/i387.h> #include <asm/i387.h>
#include <asm/math_emu.h> #include <asm/math_emu.h>
@ -16,13 +17,29 @@
#include <asm/ptrace.h> #include <asm/ptrace.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#ifdef CONFIG_X86_64
#include <asm/sigcontext32.h>
#include <asm/user32.h>
#else
#define save_i387_ia32 save_i387
#define restore_i387_ia32 restore_i387
#define _fpstate_ia32 _fpstate
#define user_i387_ia32_struct user_i387_struct
#define user32_fxsr_struct user_fxsr_struct
#endif
#ifdef CONFIG_MATH_EMULATION #ifdef CONFIG_MATH_EMULATION
#define HAVE_HWFP (boot_cpu_data.hard_math) #define HAVE_HWFP (boot_cpu_data.hard_math)
#else #else
#define HAVE_HWFP 1 #define HAVE_HWFP 1
#endif #endif
static unsigned long mxcsr_feature_mask __read_mostly = 0xffffffff; unsigned int mxcsr_feature_mask __read_mostly = 0xffffffffu;
void mxcsr_feature_mask_init(void) void mxcsr_feature_mask_init(void)
{ {
@ -40,6 +57,30 @@ void mxcsr_feature_mask_init(void)
stts(); stts();
} }
#ifdef CONFIG_X86_64
/*
* Called at bootup to set up the initial FPU state that is later cloned
* into all processes.
*/
void __cpuinit fpu_init(void)
{
unsigned long oldcr0 = read_cr0();
extern void __bad_fxsave_alignment(void);
if (offsetof(struct task_struct, thread.i387.fxsave) & 15)
__bad_fxsave_alignment();
set_in_cr4(X86_CR4_OSFXSR);
set_in_cr4(X86_CR4_OSXMMEXCPT);
write_cr0(oldcr0 & ~((1UL<<3)|(1UL<<2))); /* clear TS and EM */
mxcsr_feature_mask_init();
/* clean state in init */
current_thread_info()->status = 0;
clear_used_math();
}
#endif /* CONFIG_X86_64 */
/* /*
* The _current_ task is using the FPU for the first time * The _current_ task is using the FPU for the first time
* so initialize it and set the mxcsr to its default * so initialize it and set the mxcsr to its default
@ -48,12 +89,18 @@ void mxcsr_feature_mask_init(void)
*/ */
void init_fpu(struct task_struct *tsk) void init_fpu(struct task_struct *tsk)
{ {
if (tsk_used_math(tsk)) {
if (tsk == current)
unlazy_fpu(tsk);
return;
}
if (cpu_has_fxsr) { if (cpu_has_fxsr) {
memset(&tsk->thread.i387.fxsave, 0, memset(&tsk->thread.i387.fxsave, 0,
sizeof(struct i387_fxsave_struct)); sizeof(struct i387_fxsave_struct));
tsk->thread.i387.fxsave.cwd = 0x37f; tsk->thread.i387.fxsave.cwd = 0x37f;
if (cpu_has_xmm) if (cpu_has_xmm)
tsk->thread.i387.fxsave.mxcsr = 0x1f80; tsk->thread.i387.fxsave.mxcsr = MXCSR_DEFAULT;
} else { } else {
memset(&tsk->thread.i387.fsave, 0, memset(&tsk->thread.i387.fsave, 0,
sizeof(struct i387_fsave_struct)); sizeof(struct i387_fsave_struct));
@ -62,27 +109,59 @@ void init_fpu(struct task_struct *tsk)
tsk->thread.i387.fsave.twd = 0xffffffffu; tsk->thread.i387.fsave.twd = 0xffffffffu;
tsk->thread.i387.fsave.fos = 0xffff0000u; tsk->thread.i387.fsave.fos = 0xffff0000u;
} }
/* only the device not available exception /*
* or ptrace can call init_fpu */ * Only the device not available exception or ptrace can call init_fpu.
*/
set_stopped_child_used_math(tsk); set_stopped_child_used_math(tsk);
} }
/* int fpregs_active(struct task_struct *target, const struct user_regset *regset)
* FPU lazy state save handling.
*/
void kernel_fpu_begin(void)
{ {
struct thread_info *thread = current_thread_info(); return tsk_used_math(target) ? regset->n : 0;
preempt_disable();
if (thread->status & TS_USEDFPU) {
__save_init_fpu(thread->task);
return;
}
clts();
} }
EXPORT_SYMBOL_GPL(kernel_fpu_begin);
int xfpregs_active(struct task_struct *target, const struct user_regset *regset)
{
return (cpu_has_fxsr && tsk_used_math(target)) ? regset->n : 0;
}
int xfpregs_get(struct task_struct *target, const struct user_regset *regset,
unsigned int pos, unsigned int count,
void *kbuf, void __user *ubuf)
{
if (!cpu_has_fxsr)
return -ENODEV;
unlazy_fpu(target);
return user_regset_copyout(&pos, &count, &kbuf, &ubuf,
&target->thread.i387.fxsave, 0, -1);
}
int xfpregs_set(struct task_struct *target, const struct user_regset *regset,
unsigned int pos, unsigned int count,
const void *kbuf, const void __user *ubuf)
{
int ret;
if (!cpu_has_fxsr)
return -ENODEV;
unlazy_fpu(target);
set_stopped_child_used_math(target);
ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf,
&target->thread.i387.fxsave, 0, -1);
/*
* mxcsr reserved bits must be masked to zero for security reasons.
*/
target->thread.i387.fxsave.mxcsr &= mxcsr_feature_mask;
return ret;
}
#if defined CONFIG_X86_32 || defined CONFIG_IA32_EMULATION
/* /*
* FPU tag word conversions. * FPU tag word conversions.
@ -94,210 +173,187 @@ static inline unsigned short twd_i387_to_fxsr(unsigned short twd)
/* Transform each pair of bits into 01 (valid) or 00 (empty) */ /* Transform each pair of bits into 01 (valid) or 00 (empty) */
tmp = ~twd; tmp = ~twd;
tmp = (tmp | (tmp >> 1)) & 0x5555; /* 0V0V0V0V0V0V0V0V */ tmp = (tmp | (tmp>>1)) & 0x5555; /* 0V0V0V0V0V0V0V0V */
/* and move the valid bits to the lower byte. */ /* and move the valid bits to the lower byte. */
tmp = (tmp | (tmp >> 1)) & 0x3333; /* 00VV00VV00VV00VV */ tmp = (tmp | (tmp >> 1)) & 0x3333; /* 00VV00VV00VV00VV */
tmp = (tmp | (tmp >> 2)) & 0x0f0f; /* 0000VVVV0000VVVV */ tmp = (tmp | (tmp >> 2)) & 0x0f0f; /* 0000VVVV0000VVVV */
tmp = (tmp | (tmp >> 4)) & 0x00ff; /* 00000000VVVVVVVV */ tmp = (tmp | (tmp >> 4)) & 0x00ff; /* 00000000VVVVVVVV */
return tmp; return tmp;
} }
static inline unsigned long twd_fxsr_to_i387(struct i387_fxsave_struct *fxsave) #define FPREG_ADDR(f, n) ((void *)&(f)->st_space + (n) * 16);
#define FP_EXP_TAG_VALID 0
#define FP_EXP_TAG_ZERO 1
#define FP_EXP_TAG_SPECIAL 2
#define FP_EXP_TAG_EMPTY 3
static inline u32 twd_fxsr_to_i387(struct i387_fxsave_struct *fxsave)
{ {
struct _fpxreg *st = NULL; struct _fpxreg *st;
unsigned long tos = (fxsave->swd >> 11) & 7; u32 tos = (fxsave->swd >> 11) & 7;
unsigned long twd = (unsigned long) fxsave->twd; u32 twd = (unsigned long) fxsave->twd;
unsigned long tag; u32 tag;
unsigned long ret = 0xffff0000u; u32 ret = 0xffff0000u;
int i; int i;
#define FPREG_ADDR(f, n) ((void *)&(f)->st_space + (n) * 16); for (i = 0; i < 8; i++, twd >>= 1) {
for (i = 0; i < 8; i++) {
if (twd & 0x1) { if (twd & 0x1) {
st = FPREG_ADDR(fxsave, (i - tos) & 7); st = FPREG_ADDR(fxsave, (i - tos) & 7);
switch (st->exponent & 0x7fff) { switch (st->exponent & 0x7fff) {
case 0x7fff: case 0x7fff:
tag = 2; /* Special */ tag = FP_EXP_TAG_SPECIAL;
break; break;
case 0x0000: case 0x0000:
if (!st->significand[0] && if (!st->significand[0] &&
!st->significand[1] && !st->significand[1] &&
!st->significand[2] && !st->significand[2] &&
!st->significand[3]) { !st->significand[3])
tag = 1; /* Zero */ tag = FP_EXP_TAG_ZERO;
} else { else
tag = 2; /* Special */ tag = FP_EXP_TAG_SPECIAL;
}
break; break;
default: default:
if (st->significand[3] & 0x8000) { if (st->significand[3] & 0x8000)
tag = 0; /* Valid */ tag = FP_EXP_TAG_VALID;
} else { else
tag = 2; /* Special */ tag = FP_EXP_TAG_SPECIAL;
}
break; break;
} }
} else { } else {
tag = 3; /* Empty */ tag = FP_EXP_TAG_EMPTY;
} }
ret |= (tag << (2 * i)); ret |= tag << (2 * i);
twd = twd >> 1;
} }
return ret; return ret;
} }
/*
* FPU state interaction.
*/
unsigned short get_fpu_cwd(struct task_struct *tsk)
{
if (cpu_has_fxsr) {
return tsk->thread.i387.fxsave.cwd;
} else {
return (unsigned short)tsk->thread.i387.fsave.cwd;
}
}
unsigned short get_fpu_swd(struct task_struct *tsk)
{
if (cpu_has_fxsr) {
return tsk->thread.i387.fxsave.swd;
} else {
return (unsigned short)tsk->thread.i387.fsave.swd;
}
}
#if 0
unsigned short get_fpu_twd(struct task_struct *tsk)
{
if (cpu_has_fxsr) {
return tsk->thread.i387.fxsave.twd;
} else {
return (unsigned short)tsk->thread.i387.fsave.twd;
}
}
#endif /* 0 */
unsigned short get_fpu_mxcsr(struct task_struct *tsk)
{
if (cpu_has_xmm) {
return tsk->thread.i387.fxsave.mxcsr;
} else {
return 0x1f80;
}
}
#if 0
void set_fpu_cwd(struct task_struct *tsk, unsigned short cwd)
{
if (cpu_has_fxsr) {
tsk->thread.i387.fxsave.cwd = cwd;
} else {
tsk->thread.i387.fsave.cwd = ((long)cwd | 0xffff0000u);
}
}
void set_fpu_swd(struct task_struct *tsk, unsigned short swd)
{
if (cpu_has_fxsr) {
tsk->thread.i387.fxsave.swd = swd;
} else {
tsk->thread.i387.fsave.swd = ((long)swd | 0xffff0000u);
}
}
void set_fpu_twd(struct task_struct *tsk, unsigned short twd)
{
if (cpu_has_fxsr) {
tsk->thread.i387.fxsave.twd = twd_i387_to_fxsr(twd);
} else {
tsk->thread.i387.fsave.twd = ((long)twd | 0xffff0000u);
}
}
#endif /* 0 */
/* /*
* FXSR floating point environment conversions. * FXSR floating point environment conversions.
*/ */
static int convert_fxsr_to_user(struct _fpstate __user *buf, static void convert_from_fxsr(struct user_i387_ia32_struct *env,
struct i387_fxsave_struct *fxsave) struct task_struct *tsk)
{ {
unsigned long env[7]; struct i387_fxsave_struct *fxsave = &tsk->thread.i387.fxsave;
struct _fpreg __user *to; struct _fpreg *to = (struct _fpreg *) &env->st_space[0];
struct _fpxreg *from; struct _fpxreg *from = (struct _fpxreg *) &fxsave->st_space[0];
int i; int i;
env[0] = (unsigned long)fxsave->cwd | 0xffff0000ul; env->cwd = fxsave->cwd | 0xffff0000u;
env[1] = (unsigned long)fxsave->swd | 0xffff0000ul; env->swd = fxsave->swd | 0xffff0000u;
env[2] = twd_fxsr_to_i387(fxsave); env->twd = twd_fxsr_to_i387(fxsave);
env[3] = fxsave->fip;
env[4] = fxsave->fcs | ((unsigned long)fxsave->fop << 16);
env[5] = fxsave->foo;
env[6] = fxsave->fos;
if (__copy_to_user(buf, env, 7 * sizeof(unsigned long))) #ifdef CONFIG_X86_64
return 1; env->fip = fxsave->rip;
env->foo = fxsave->rdp;
to = &buf->_st[0]; if (tsk == current) {
from = (struct _fpxreg *) &fxsave->st_space[0]; /*
for (i = 0; i < 8; i++, to++, from++) { * should be actually ds/cs at fpu exception time, but
unsigned long __user *t = (unsigned long __user *)to; * that information is not available in 64bit mode.
unsigned long *f = (unsigned long *)from; */
asm("mov %%ds,%0" : "=r" (env->fos));
if (__put_user(*f, t) || asm("mov %%cs,%0" : "=r" (env->fcs));
__put_user(*(f + 1), t + 1) || } else {
__put_user(from->exponent, &to->exponent)) struct pt_regs *regs = task_pt_regs(tsk);
return 1; env->fos = 0xffff0000 | tsk->thread.ds;
env->fcs = regs->cs;
} }
return 0; #else
env->fip = fxsave->fip;
env->fcs = fxsave->fcs;
env->foo = fxsave->foo;
env->fos = fxsave->fos;
#endif
for (i = 0; i < 8; ++i)
memcpy(&to[i], &from[i], sizeof(to[0]));
} }
static int convert_fxsr_from_user(struct i387_fxsave_struct *fxsave, static void convert_to_fxsr(struct task_struct *tsk,
struct _fpstate __user *buf) const struct user_i387_ia32_struct *env)
{ {
unsigned long env[7]; struct i387_fxsave_struct *fxsave = &tsk->thread.i387.fxsave;
struct _fpxreg *to; struct _fpreg *from = (struct _fpreg *) &env->st_space[0];
struct _fpreg __user *from; struct _fpxreg *to = (struct _fpxreg *) &fxsave->st_space[0];
int i; int i;
if (__copy_from_user(env, buf, 7 * sizeof(long))) fxsave->cwd = env->cwd;
return 1; fxsave->swd = env->swd;
fxsave->twd = twd_i387_to_fxsr(env->twd);
fxsave->fop = (u16) ((u32) env->fcs >> 16);
#ifdef CONFIG_X86_64
fxsave->rip = env->fip;
fxsave->rdp = env->foo;
/* cs and ds ignored */
#else
fxsave->fip = env->fip;
fxsave->fcs = (env->fcs & 0xffff);
fxsave->foo = env->foo;
fxsave->fos = env->fos;
#endif
fxsave->cwd = (unsigned short)(env[0] & 0xffff); for (i = 0; i < 8; ++i)
fxsave->swd = (unsigned short)(env[1] & 0xffff); memcpy(&to[i], &from[i], sizeof(from[0]));
fxsave->twd = twd_i387_to_fxsr((unsigned short)(env[2] & 0xffff)); }
fxsave->fip = env[3];
fxsave->fop = (unsigned short)((env[4] & 0xffff0000ul) >> 16);
fxsave->fcs = (env[4] & 0xffff);
fxsave->foo = env[5];
fxsave->fos = env[6];
to = (struct _fpxreg *) &fxsave->st_space[0]; int fpregs_get(struct task_struct *target, const struct user_regset *regset,
from = &buf->_st[0]; unsigned int pos, unsigned int count,
for (i = 0; i < 8; i++, to++, from++) { void *kbuf, void __user *ubuf)
unsigned long *t = (unsigned long *)to; {
unsigned long __user *f = (unsigned long __user *)from; struct user_i387_ia32_struct env;
if (__get_user(*t, f) || if (!HAVE_HWFP)
__get_user(*(t + 1), f + 1) || return fpregs_soft_get(target, regset, pos, count, kbuf, ubuf);
__get_user(to->exponent, &from->exponent))
return 1; unlazy_fpu(target);
if (!cpu_has_fxsr)
return user_regset_copyout(&pos, &count, &kbuf, &ubuf,
&target->thread.i387.fsave, 0, -1);
if (kbuf && pos == 0 && count == sizeof(env)) {
convert_from_fxsr(kbuf, target);
return 0;
} }
return 0;
convert_from_fxsr(&env, target);
return user_regset_copyout(&pos, &count, &kbuf, &ubuf, &env, 0, -1);
}
int fpregs_set(struct task_struct *target, const struct user_regset *regset,
unsigned int pos, unsigned int count,
const void *kbuf, const void __user *ubuf)
{
struct user_i387_ia32_struct env;
int ret;
if (!HAVE_HWFP)
return fpregs_soft_set(target, regset, pos, count, kbuf, ubuf);
unlazy_fpu(target);
set_stopped_child_used_math(target);
if (!cpu_has_fxsr)
return user_regset_copyin(&pos, &count, &kbuf, &ubuf,
&target->thread.i387.fsave, 0, -1);
if (pos > 0 || count < sizeof(env))
convert_from_fxsr(&env, target);
ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf, &env, 0, -1);
if (!ret)
convert_to_fxsr(target, &env);
return ret;
} }
/* /*
* Signal frame handlers. * Signal frame handlers.
*/ */
static inline int save_i387_fsave(struct _fpstate __user *buf) static inline int save_i387_fsave(struct _fpstate_ia32 __user *buf)
{ {
struct task_struct *tsk = current; struct task_struct *tsk = current;
@ -309,14 +365,16 @@ static inline int save_i387_fsave(struct _fpstate __user *buf)
return 1; return 1;
} }
static int save_i387_fxsave(struct _fpstate __user *buf) static int save_i387_fxsave(struct _fpstate_ia32 __user *buf)
{ {
struct task_struct *tsk = current; struct task_struct *tsk = current;
struct user_i387_ia32_struct env;
int err = 0; int err = 0;
unlazy_fpu(tsk); unlazy_fpu(tsk);
if (convert_fxsr_to_user(buf, &tsk->thread.i387.fxsave)) convert_from_fxsr(&env, tsk);
if (__copy_to_user(buf, &env, sizeof(env)))
return -1; return -1;
err |= __put_user(tsk->thread.i387.fxsave.swd, &buf->status); err |= __put_user(tsk->thread.i387.fxsave.swd, &buf->status);
@ -330,7 +388,7 @@ static int save_i387_fxsave(struct _fpstate __user *buf)
return 1; return 1;
} }
int save_i387(struct _fpstate __user *buf) int save_i387_ia32(struct _fpstate_ia32 __user *buf)
{ {
if (!used_math()) if (!used_math())
return 0; return 0;
@ -347,11 +405,13 @@ int save_i387(struct _fpstate __user *buf)
return save_i387_fsave(buf); return save_i387_fsave(buf);
} }
} else { } else {
return save_i387_soft(&current->thread.i387.soft, buf); return fpregs_soft_get(current, NULL,
0, sizeof(struct user_i387_ia32_struct),
NULL, buf) ? -1 : 1;
} }
} }
static inline int restore_i387_fsave(struct _fpstate __user *buf) static inline int restore_i387_fsave(struct _fpstate_ia32 __user *buf)
{ {
struct task_struct *tsk = current; struct task_struct *tsk = current;
clear_fpu(tsk); clear_fpu(tsk);
@ -359,19 +419,23 @@ static inline int restore_i387_fsave(struct _fpstate __user *buf)
sizeof(struct i387_fsave_struct)); sizeof(struct i387_fsave_struct));
} }
static int restore_i387_fxsave(struct _fpstate __user *buf) static int restore_i387_fxsave(struct _fpstate_ia32 __user *buf)
{ {
int err; int err;
struct task_struct *tsk = current; struct task_struct *tsk = current;
struct user_i387_ia32_struct env;
clear_fpu(tsk); clear_fpu(tsk);
err = __copy_from_user(&tsk->thread.i387.fxsave, &buf->_fxsr_env[0], err = __copy_from_user(&tsk->thread.i387.fxsave, &buf->_fxsr_env[0],
sizeof(struct i387_fxsave_struct)); sizeof(struct i387_fxsave_struct));
/* mxcsr reserved bits must be masked to zero for security reasons */ /* mxcsr reserved bits must be masked to zero for security reasons */
tsk->thread.i387.fxsave.mxcsr &= mxcsr_feature_mask; tsk->thread.i387.fxsave.mxcsr &= mxcsr_feature_mask;
return err ? 1 : convert_fxsr_from_user(&tsk->thread.i387.fxsave, buf); if (err || __copy_from_user(&env, buf, sizeof(env)))
return 1;
convert_to_fxsr(tsk, &env);
return 0;
} }
int restore_i387(struct _fpstate __user *buf) int restore_i387_ia32(struct _fpstate_ia32 __user *buf)
{ {
int err; int err;
@ -382,101 +446,52 @@ int restore_i387(struct _fpstate __user *buf)
err = restore_i387_fsave(buf); err = restore_i387_fsave(buf);
} }
} else { } else {
err = restore_i387_soft(&current->thread.i387.soft, buf); err = fpregs_soft_set(current, NULL,
0, sizeof(struct user_i387_ia32_struct),
NULL, buf) != 0;
} }
set_used_math(); set_used_math();
return err; return err;
} }
/* #endif /* CONFIG_X86_32 || CONFIG_IA32_EMULATION */
* ptrace request handlers.
*/
static inline int get_fpregs_fsave(struct user_i387_struct __user *buf, #ifdef CONFIG_X86_64
struct task_struct *tsk)
{
return __copy_to_user(buf, &tsk->thread.i387.fsave,
sizeof(struct user_i387_struct));
}
static inline int get_fpregs_fxsave(struct user_i387_struct __user *buf,
struct task_struct *tsk)
{
return convert_fxsr_to_user((struct _fpstate __user *)buf,
&tsk->thread.i387.fxsave);
}
int get_fpregs(struct user_i387_struct __user *buf, struct task_struct *tsk) int get_fpregs(struct user_i387_struct __user *buf, struct task_struct *tsk)
{ {
if (HAVE_HWFP) { return xfpregs_get(tsk, NULL, 0, sizeof(*buf), NULL, buf);
if (cpu_has_fxsr) {
return get_fpregs_fxsave(buf, tsk);
} else {
return get_fpregs_fsave(buf, tsk);
}
} else {
return save_i387_soft(&tsk->thread.i387.soft,
(struct _fpstate __user *)buf);
}
}
static inline int set_fpregs_fsave(struct task_struct *tsk,
struct user_i387_struct __user *buf)
{
return __copy_from_user(&tsk->thread.i387.fsave, buf,
sizeof(struct user_i387_struct));
}
static inline int set_fpregs_fxsave(struct task_struct *tsk,
struct user_i387_struct __user *buf)
{
return convert_fxsr_from_user(&tsk->thread.i387.fxsave,
(struct _fpstate __user *)buf);
} }
int set_fpregs(struct task_struct *tsk, struct user_i387_struct __user *buf) int set_fpregs(struct task_struct *tsk, struct user_i387_struct __user *buf)
{ {
if (HAVE_HWFP) { return xfpregs_set(tsk, NULL, 0, sizeof(*buf), NULL, buf);
if (cpu_has_fxsr) { }
return set_fpregs_fxsave(tsk, buf);
} else { #else
return set_fpregs_fsave(tsk, buf);
} int get_fpregs(struct user_i387_struct __user *buf, struct task_struct *tsk)
} else { {
return restore_i387_soft(&tsk->thread.i387.soft, return fpregs_get(tsk, NULL, 0, sizeof(*buf), NULL, buf);
(struct _fpstate __user *)buf); }
}
int set_fpregs(struct task_struct *tsk, struct user_i387_struct __user *buf)
{
return fpregs_set(tsk, NULL, 0, sizeof(*buf), NULL, buf);
} }
int get_fpxregs(struct user_fxsr_struct __user *buf, struct task_struct *tsk) int get_fpxregs(struct user_fxsr_struct __user *buf, struct task_struct *tsk)
{ {
if (cpu_has_fxsr) { return xfpregs_get(tsk, NULL, 0, sizeof(*buf), NULL, buf);
if (__copy_to_user(buf, &tsk->thread.i387.fxsave,
sizeof(struct user_fxsr_struct)))
return -EFAULT;
return 0;
} else {
return -EIO;
}
} }
int set_fpxregs(struct task_struct *tsk, struct user_fxsr_struct __user *buf) int set_fpxregs(struct task_struct *tsk, struct user_fxsr_struct __user *buf)
{ {
int ret = 0; return xfpregs_get(tsk, NULL, 0, sizeof(*buf), NULL, buf);
if (cpu_has_fxsr) {
if (__copy_from_user(&tsk->thread.i387.fxsave, buf,
sizeof(struct user_fxsr_struct)))
ret = -EFAULT;
/* mxcsr reserved bits must be masked to zero
* for security reasons */
tsk->thread.i387.fxsave.mxcsr &= mxcsr_feature_mask;
} else {
ret = -EIO;
}
return ret;
} }
#endif
/* /*
* FPU state for core dumps. * FPU state for core dumps.
*/ */
@ -538,7 +553,7 @@ int dump_task_fpu(struct task_struct *tsk, struct user_i387_struct *fpu)
} }
int dump_task_extended_fpu(struct task_struct *tsk, int dump_task_extended_fpu(struct task_struct *tsk,
struct user_fxsr_struct *fpu) struct user32_fxsr_struct *fpu)
{ {
int fpvalid = tsk_used_math(tsk) && cpu_has_fxsr; int fpvalid = tsk_used_math(tsk) && cpu_has_fxsr;

1
arch/x86/kernel/ptrace.c
View file

@ -886,7 +886,6 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
#include <linux/compat.h> #include <linux/compat.h>
#include <linux/syscalls.h> #include <linux/syscalls.h>
#include <asm/ia32.h> #include <asm/ia32.h>
#include <asm/fpu32.h>
#include <asm/user32.h> #include <asm/user32.h>
#define R32(l,q) \ #define R32(l,q) \

10
include/asm-x86/fpu32.h
View file

@ -1,10 +0,0 @@
#ifndef _FPU32_H
#define _FPU32_H 1
struct _fpstate_ia32;
int restore_i387_ia32(struct task_struct *tsk, struct _fpstate_ia32 __user *buf, int fsave);
int save_i387_ia32(struct task_struct *tsk, struct _fpstate_ia32 __user *buf,
struct pt_regs *regs, int fsave);
#endif

6
include/asm-x86/i387.h
View file

@ -1,5 +1 @@
#ifdef CONFIG_X86_32 #include "i387_64.h"
# include "i387_32.h"
#else
# include "i387_64.h"
#endif

11
include/asm-x86/i387_64.h
View file

@ -12,6 +12,7 @@
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/kernel_stat.h> #include <linux/kernel_stat.h>
#include <linux/regset.h>
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/sigcontext.h> #include <asm/sigcontext.h>
#include <asm/user.h> #include <asm/user.h>
@ -23,6 +24,16 @@ extern void mxcsr_feature_mask_init(void);
extern void init_fpu(struct task_struct *child); extern void init_fpu(struct task_struct *child);
extern asmlinkage void math_state_restore(void); extern asmlinkage void math_state_restore(void);
extern user_regset_active_fn fpregs_active, xfpregs_active;
extern user_regset_get_fn fpregs_get, xfpregs_get, fpregs_soft_get;
extern user_regset_set_fn fpregs_set, xfpregs_set, fpregs_soft_set;
#ifdef CONFIG_IA32_EMULATION
struct _fpstate_ia32;
extern int save_i387_ia32(struct _fpstate_ia32 __user *buf);
extern int restore_i387_ia32(struct _fpstate_ia32 __user *buf);
#endif
#ifdef CONFIG_X86_64 #ifdef CONFIG_X86_64
/* Ignore delayed exceptions from user space */ /* Ignore delayed exceptions from user space */