p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

um: extend fpstate to _xstate to support YMM registers 

Extends fpstate to _xstate, in order to hold AVX/YMM registers.

To avoid oversized stack frame, the following functions have been
refactored by using malloc.
 - sig_handler_common
 - timer_real_alarm_handler

Signed-off-by: Eli Cooper <elicooper@gmx.com>
This commit is contained in:
Eli Cooper 2016-03-20 00:58:40 +08:00 committed by Richard Weinberger
parent 6de5a8a500
commit b6024b21fe
3 changed files with 32 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
arch/um/os-Linux/signal.c
View File

@ -29,23 +29,29 @@ void (*sig_info[NSIG])(int, struct siginfo *, struct uml_pt_regs *) = {
static void sig_handler_common(int sig, struct siginfo *si, mcontext_t *mc) static void sig_handler_common(int sig, struct siginfo *si, mcontext_t *mc)
{ {
struct uml_pt_regs r; struct uml_pt_regs *r;
int save_errno = errno; int save_errno = errno;
r.is_user = 0; r = malloc(sizeof(struct uml_pt_regs));
if (!r)
panic("out of memory");
r->is_user = 0;
if (sig == SIGSEGV) { if (sig == SIGSEGV) {
/* For segfaults, we want the data from the sigcontext. */ /* For segfaults, we want the data from the sigcontext. */
get_regs_from_mc(&r, mc); get_regs_from_mc(r, mc);
GET_FAULTINFO_FROM_MC(r.faultinfo, mc); GET_FAULTINFO_FROM_MC(r->faultinfo, mc);
} }
/* enable signals if sig isn't IRQ signal */ /* enable signals if sig isn't IRQ signal */
if ((sig != SIGIO) && (sig != SIGWINCH) && (sig != SIGALRM)) if ((sig != SIGIO) && (sig != SIGWINCH) && (sig != SIGALRM))
unblock_signals(); unblock_signals();
(*sig_info[sig])(sig, si, &r); (*sig_info[sig])(sig, si, r);
errno = save_errno; errno = save_errno;
free(r);
} }
/* /*
@ -83,11 +89,17 @@ void sig_handler(int sig, struct siginfo *si, mcontext_t *mc)
static void timer_real_alarm_handler(mcontext_t *mc) static void timer_real_alarm_handler(mcontext_t *mc)
{ {
struct uml_pt_regs regs; struct uml_pt_regs *regs;
regs = malloc(sizeof(struct uml_pt_regs));
if (!regs)
panic("out of memory");
if (mc != NULL) if (mc != NULL)
get_regs_from_mc(&regs, mc); get_regs_from_mc(regs, mc);
timer_handler(SIGALRM, NULL, &regs); timer_handler(SIGALRM, NULL, regs);
free(regs);
} }
void timer_alarm_handler(int sig, struct siginfo *unused_si, mcontext_t *mc) void timer_alarm_handler(int sig, struct siginfo *unused_si, mcontext_t *mc)

23
arch/x86/um/signal.c
View File

@ -226,7 +226,7 @@ static int copy_sc_from_user(struct pt_regs *regs,
#endif #endif
{ {
err = copy_from_user(regs->regs.fp, (void *)sc.fpstate, err = copy_from_user(regs->regs.fp, (void *)sc.fpstate,
sizeof(struct user_i387_struct)); sizeof(struct _xstate));
if (err) if (err)
return 1; return 1;
} }
@ -234,7 +234,7 @@ static int copy_sc_from_user(struct pt_regs *regs,
} }
static int copy_sc_to_user(struct sigcontext __user *to, static int copy_sc_to_user(struct sigcontext __user *to,
struct _fpstate __user *to_fp, struct pt_regs *regs, struct _xstate __user *to_fp, struct pt_regs *regs,
unsigned long mask) unsigned long mask)
{ {
struct sigcontext sc; struct sigcontext sc;
@ -300,23 +300,22 @@ static int copy_sc_to_user(struct sigcontext __user *to,
return 1; return 1;
} }
err = convert_fxsr_to_user(to_fp, &fpx); err = convert_fxsr_to_user(&to_fp->fpstate, &fpx);
if (err) if (err)
return 1; return 1;
err |= __put_user(fpx.swd, &to_fp->status); err |= __put_user(fpx.swd, &to_fp->fpstate.status);
err |= __put_user(X86_FXSR_MAGIC, &to_fp->magic); err |= __put_user(X86_FXSR_MAGIC, &to_fp->fpstate.magic);
if (err) if (err)
return 1; return 1;
if (copy_to_user(&to_fp->_fxsr_env[0], &fpx, if (copy_to_user(&to_fp->fpstate._fxsr_env[0], &fpx,
sizeof(struct user_fxsr_struct))) sizeof(struct user_fxsr_struct)))
return 1; return 1;
} else } else
#endif #endif
{ {
if (copy_to_user(to_fp, regs->regs.fp, if (copy_to_user(to_fp, regs->regs.fp, sizeof(struct _xstate)))
sizeof(struct user_i387_struct)))
return 1; return 1;
} }
@ -325,7 +324,7 @@ static int copy_sc_to_user(struct sigcontext __user *to,
#ifdef CONFIG_X86_32 #ifdef CONFIG_X86_32
static int copy_ucontext_to_user(struct ucontext __user *uc, static int copy_ucontext_to_user(struct ucontext __user *uc,
struct _fpstate __user *fp, sigset_t *set, struct _xstate __user *fp, sigset_t *set,
unsigned long sp) unsigned long sp)
{ {
int err = 0; int err = 0;
@ -341,7 +340,7 @@ struct sigframe
char __user *pretcode; char __user *pretcode;
int sig; int sig;
struct sigcontext sc; struct sigcontext sc;
struct _fpstate fpstate; struct _xstate fpstate;
unsigned long extramask[_NSIG_WORDS-1]; unsigned long extramask[_NSIG_WORDS-1];
char retcode[8]; char retcode[8];
}; };
@ -354,7 +353,7 @@ struct rt_sigframe
void __user *puc; void __user *puc;
struct siginfo info; struct siginfo info;
struct ucontext uc; struct ucontext uc;
struct _fpstate fpstate; struct _xstate fpstate;
char retcode[8]; char retcode[8];
}; };
@ -483,7 +482,7 @@ struct rt_sigframe
char __user *pretcode; char __user *pretcode;
struct ucontext uc; struct ucontext uc;
struct siginfo info; struct siginfo info;
struct _fpstate fpstate; struct _xstate fpstate;
}; };
int setup_signal_stack_si(unsigned long stack_top, struct ksignal *ksig, int setup_signal_stack_si(unsigned long stack_top, struct ksignal *ksig,

2
arch/x86/um/user-offsets.c
View File

@ -50,7 +50,7 @@ void foo(void)
DEFINE(HOST_GS, GS); DEFINE(HOST_GS, GS);
DEFINE(HOST_ORIG_AX, ORIG_EAX); DEFINE(HOST_ORIG_AX, ORIG_EAX);
#else #else
DEFINE(HOST_FP_SIZE, sizeof(struct _fpstate) / sizeof(unsigned long)); DEFINE(HOST_FP_SIZE, sizeof(struct _xstate) / sizeof(unsigned long));
DEFINE_LONGS(HOST_BX, RBX); DEFINE_LONGS(HOST_BX, RBX);
DEFINE_LONGS(HOST_CX, RCX); DEFINE_LONGS(HOST_CX, RCX);
DEFINE_LONGS(HOST_DI, RDI); DEFINE_LONGS(HOST_DI, RDI);