a7y18lte-ubports/android_kernel_samsung_universal7885
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[XTENSA] Remove non-rt signal handling

Browse Source 
The non-rt signal handling was never really used, so we don't break
anything. This patch also cleans up the signal stack-frame to make
it independent from the processor configuration. It also improves
the method used for controlling single-stepping. We now save and
restore the 'icountlevel' register that controls single stepping
and set or clear the saved state to enable or disable it.

Signed-off-by: Chris Zankel <chris@zankel.net>
This commit is contained in:
Chris Zankel 2007-05-31 17:49:32 -07:00
parent adba09f015
commit 29c4dfd92e
8 changed files with 361 additions and 535 deletions

1
arch/xtensa/kernel/asm-offsets.c
View File

@ -39,6 +39,7 @@ int main(void)
DEFINE(PT_LEND, offsetof (struct pt_regs, lend)); DEFINE(PT_LEND, offsetof (struct pt_regs, lend));
DEFINE(PT_LCOUNT, offsetof (struct pt_regs, lcount)); DEFINE(PT_LCOUNT, offsetof (struct pt_regs, lcount));
DEFINE(PT_SAR, offsetof (struct pt_regs, sar)); DEFINE(PT_SAR, offsetof (struct pt_regs, sar));
DEFINE(PT_ICOUNTLEVEL, offsetof (struct pt_regs, icountlevel));
DEFINE(PT_SYSCALL, offsetof (struct pt_regs, syscall)); DEFINE(PT_SYSCALL, offsetof (struct pt_regs, syscall));
DEFINE(PT_AREG, offsetof (struct pt_regs, areg[0])); DEFINE(PT_AREG, offsetof (struct pt_regs, areg[0]));
DEFINE(PT_AREG0, offsetof (struct pt_regs, areg[0])); DEFINE(PT_AREG0, offsetof (struct pt_regs, areg[0]));

36
arch/xtensa/kernel/entry.S
View File

@ -125,8 +125,9 @@ _user_exception:
movi a2, 0 movi a2, 0
rsr a3, SAR rsr a3, SAR
wsr a2, ICOUNTLEVEL xsr a2, ICOUNTLEVEL
s32i a3, a1, PT_SAR s32i a3, a1, PT_SAR
s32i a2, a1, PT_ICOUNTLEVEL
/* Rotate ws so that the current windowbase is at bit0. */ /* Rotate ws so that the current windowbase is at bit0. */
/* Assume ws = xxwww1yyyy. Rotate ws right, so that a2 = yyyyxxwww1 */ /* Assume ws = xxwww1yyyy. Rotate ws right, so that a2 = yyyyxxwww1 */
@ -276,8 +277,9 @@ _kernel_exception:
movi a2, 0 movi a2, 0
rsr a3, SAR rsr a3, SAR
wsr a2, ICOUNTLEVEL xsr a2, ICOUNTLEVEL
s32i a3, a1, PT_SAR s32i a3, a1, PT_SAR
s32i a2, a1, PT_ICOUNTLEVEL
/* Rotate ws so that the current windowbase is at bit0. */ /* Rotate ws so that the current windowbase is at bit0. */
/* Assume ws = xxwww1yyyy. Rotate ws right, so that a2 = yyyyxxwww1 */ /* Assume ws = xxwww1yyyy. Rotate ws right, so that a2 = yyyyxxwww1 */
@ -330,14 +332,16 @@ _kernel_exception:
common_exception: common_exception:
/* Save EXCVADDR, DEBUGCAUSE, and PC, and clear LCOUNT */ /* Save some registers, disable loops and clear the syscall flag. */
rsr a2, DEBUGCAUSE rsr a2, DEBUGCAUSE
rsr a3, EPC_1 rsr a3, EPC_1
s32i a2, a1, PT_DEBUGCAUSE s32i a2, a1, PT_DEBUGCAUSE
s32i a3, a1, PT_PC s32i a3, a1, PT_PC
movi a2, -1
rsr a3, EXCVADDR rsr a3, EXCVADDR
s32i a2, a1, PT_SYSCALL
movi a2, 0 movi a2, 0
s32i a3, a1, PT_EXCVADDR s32i a3, a1, PT_EXCVADDR
xsr a2, LCOUNT xsr a2, LCOUNT
@ -450,27 +454,8 @@ common_exception_return:
/* Restore the state of the task and return from the exception. */ /* Restore the state of the task and return from the exception. */
/* If we are returning from a user exception, and the process
* to run next has PT_SINGLESTEP set, we want to setup
* ICOUNT and ICOUNTLEVEL to step one instruction.
* PT_SINGLESTEP is set by sys_ptrace (ptrace.c)
*/
4: /* a2 holds GET_CURRENT(a2,a1) */ 4: /* a2 holds GET_CURRENT(a2,a1) */
l32i a3, a2, TI_TASK
l32i a3, a3, TASK_PTRACE
bbci.l a3, PT_SINGLESTEP_BIT, 1f # jump if single-step flag is not set
movi a3, -2 # PT_SINGLESTEP flag is set,
movi a4, 1 # icountlevel of 1 means it won't
wsr a3, ICOUNT # start counting until after rfe
wsr a4, ICOUNTLEVEL # so setup icount & icountlevel.
isync
1:
#if XCHAL_EXTRA_SA_SIZE #if XCHAL_EXTRA_SA_SIZE
/* For user exceptions, restore the extra state from the user's TCB. */ /* For user exceptions, restore the extra state from the user's TCB. */
@ -665,6 +650,13 @@ common_exception_exit:
wsr a3, LEND wsr a3, LEND
wsr a2, LCOUNT wsr a2, LCOUNT
/* We control single stepping through the ICOUNTLEVEL register. */
l32i a2, a1, PT_ICOUNTLEVEL
movi a3, -2
wsr a2, ICOUNTLEVEL
wsr a3, ICOUNT
/* Check if it was double exception. */ /* Check if it was double exception. */
l32i a0, a1, PT_DEPC l32i a0, a1, PT_DEPC

817
arch/xtensa/kernel/signal.c
View File

@ -1,397 +1,239 @@
// TODO coprocessor stuff
/* /*
* linux/arch/xtensa/kernel/signal.c * arch/xtensa/kernel/signal.c
* *
* Copyright (C) 1991, 1992 Linus Torvalds * Default platform functions.
* 1997-11-28 Modified for POSIX.1b signals by Richard Henderson
*
* Joe Taylor <joe@tensilica.com>
* Chris Zankel <chris@zankel.net>
* *
* This file is subject to the terms and conditions of the GNU General Public
* License. See the file "COPYING" in the main directory of this archive
* for more details.
* *
* Copyright (C) 2005, 2006 Tensilica Inc.
* Copyright (C) 1991, 1992 Linus Torvalds
* 1997-11-28 Modified for POSIX.1b signals by Richard Henderson
* *
* Chris Zankel <chris@zankel.net>
* Joe Taylor <joe@tensilica.com>
*/ */
#include <asm/variant/core.h>
#include <asm/coprocessor.h>
#include <linux/sched.h>
#include <linux/mm.h>
#include <linux/smp.h>
#include <linux/kernel.h>
#include <linux/signal.h> #include <linux/signal.h>
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/wait.h>
#include <linux/ptrace.h> #include <linux/ptrace.h>
#include <linux/unistd.h>
#include <linux/stddef.h>
#include <linux/personality.h> #include <linux/personality.h>
#include <linux/freezer.h>
#include <asm/ucontext.h> #include <asm/ucontext.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/pgtable.h>
#include <asm/cacheflush.h> #include <asm/cacheflush.h>
#include <asm/coprocessor.h>
#include <asm/unistd.h>
#define DEBUG_SIG 0 #define DEBUG_SIG 0
#define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP))) #define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP)))
asmlinkage long sys_wait4(pid_t pid,unsigned int * stat_addr, int options,
struct rusage * ru);
asmlinkage int do_signal(struct pt_regs *regs, sigset_t *oldset); asmlinkage int do_signal(struct pt_regs *regs, sigset_t *oldset);
extern struct task_struct *coproc_owners[]; extern struct task_struct *coproc_owners[];
extern void release_all_cp (struct task_struct *);
/*
* Atomically swap in the new signal mask, and wait for a signal.
*/
int xtensa_sigsuspend(struct pt_regs *regs)
{
old_sigset_t mask = (old_sigset_t) regs->areg[3];
sigset_t saveset;
mask &= _BLOCKABLE;
spin_lock_irq(&current->sighand->siglock);
saveset = current->blocked;
siginitset(&current->blocked, mask);
recalc_sigpending();
spin_unlock_irq(&current->sighand->siglock);
regs->areg[2] = -EINTR;
while (1) {
current->state = TASK_INTERRUPTIBLE;
schedule();
if (do_signal(regs, &saveset))
return -EINTR;
}
}
asmlinkage int
xtensa_rt_sigsuspend(struct pt_regs *regs)
{
sigset_t *unewset = (sigset_t *) regs->areg[4];
size_t sigsetsize = (size_t) regs->areg[3];
sigset_t saveset, newset;
/* XXX: Don't preclude handling different sized sigset_t's. */
if (sigsetsize != sizeof(sigset_t))
return -EINVAL;
if (copy_from_user(&newset, unewset, sizeof(newset)))
return -EFAULT;
sigdelsetmask(&newset, ~_BLOCKABLE);
spin_lock_irq(&current->sighand->siglock);
saveset = current->blocked;
current->blocked = newset;
recalc_sigpending();
spin_unlock_irq(&current->sighand->siglock);
regs->areg[2] = -EINTR;
while (1) {
current->state = TASK_INTERRUPTIBLE;
schedule();
if (do_signal(regs, &saveset))
return -EINTR;
}
}
asmlinkage int
xtensa_sigaction(int sig, const struct old_sigaction *act,
struct old_sigaction *oact)
{
struct k_sigaction new_ka, old_ka;
int ret;
if (act) {
old_sigset_t mask;
if (!access_ok(VERIFY_READ, act, sizeof(*act)) ||
__get_user(new_ka.sa.sa_handler, &act->sa_handler) ||
__get_user(new_ka.sa.sa_restorer, &act->sa_restorer))
return -EFAULT;
__get_user(new_ka.sa.sa_flags, &act->sa_flags);
__get_user(mask, &act->sa_mask);
siginitset(&new_ka.sa.sa_mask, mask);
}
ret = do_sigaction(sig, act ? &new_ka : NULL, oact ? &old_ka : NULL);
if (!ret && oact) {
if (!access_ok(VERIFY_WRITE, oact, sizeof(*oact)) ||
__put_user(old_ka.sa.sa_handler, &oact->sa_handler) ||
__put_user(old_ka.sa.sa_restorer, &oact->sa_restorer))
return -EFAULT;
__put_user(old_ka.sa.sa_flags, &oact->sa_flags);
__put_user(old_ka.sa.sa_mask.sig[0], &oact->sa_mask);
}
return ret;
}
asmlinkage int
xtensa_sigaltstack(struct pt_regs *regs)
{
const stack_t *uss = (stack_t *) regs->areg[4];
stack_t *uoss = (stack_t *) regs->areg[3];
if (regs->depc > 64)
panic ("Double exception sys_sigreturn\n");
return do_sigaltstack(uss, uoss, regs->areg[1]);
}
/*
* Do a signal return; undo the signal stack.
*/
struct sigframe
{
struct sigcontext sc;
struct _cpstate cpstate;
unsigned long extramask[_NSIG_WORDS-1];
unsigned char retcode[6];
unsigned int reserved[4]; /* Reserved area for chaining */
unsigned int window[4]; /* Window of 4 registers for initial context */
};
struct rt_sigframe struct rt_sigframe
{ {
struct siginfo info; struct siginfo info;
struct ucontext uc; struct ucontext uc;
struct _cpstate cpstate; cp_state_t cpstate;
unsigned char retcode[6]; unsigned char retcode[6];
unsigned int reserved[4]; /* Reserved area for chaining */ unsigned int window[4];
unsigned int window[4]; /* Window of 4 registers for initial context */
}; };
extern void release_all_cp (struct task_struct *); /*
* Flush register windows stored in pt_regs to stack.
* Returns 1 for errors.
// FIXME restore_cpextra *
static inline int * Note that windowbase, windowstart, and wmask are not updated!
restore_cpextra (struct _cpstate *buf)
{
#if 0
/* The signal handler may have used coprocessors in which
* case they are still enabled. We disable them to force a
* reloading of the original task's CP state by the lazy
* context-switching mechanisms of CP exception handling.
* Also, we essentially discard any coprocessor state that the
* signal handler created. */
struct task_struct *tsk = current;
release_all_cp(tsk);
return __copy_from_user(tsk->thread.cpextra, buf, XTENSA_CP_EXTRA_SIZE);
#endif
return 0;
}
/* Note: We don't copy double exception 'tregs', we have to finish double exc. first before we return to signal handler! This dbl.exc.handler might cause another double exception, but I think we are fine as the situation is the same as if we had returned to the signal handerl and got an interrupt immediately...
*/ */
int
static int flush_window_regs_user(struct pt_regs *regs)
restore_sigcontext(struct pt_regs *regs, struct sigcontext *sc)
{ {
struct thread_struct *thread; const unsigned long ws = regs->windowstart;
unsigned int err = 0; const unsigned long wb = regs->windowbase;
unsigned long ps; unsigned long sp = 0;
struct _cpstate *buf; unsigned long wm;
int err = 1;
int base;
#define COPY(x) err |= __get_user(regs->x, &sc->sc_##x) /* Return if no other frames. */
COPY(pc);
COPY(depc);
COPY(wmask);
COPY(lbeg);
COPY(lend);
COPY(lcount);
COPY(sar);
COPY(windowbase);
COPY(windowstart);
#undef COPY
/* For PS, restore only PS.CALLINC. if (regs->wmask == 1)
* Assume that all other bits are either the same as for the signal return 0;
* handler, or the user mode value doesn't matter (e.g. PS.OWB).
*/
err |= __get_user(ps, &sc->sc_ps);
regs->ps = (regs->ps & ~PS_CALLINC_MASK)
| (ps & PS_CALLINC_MASK);
/* Additional corruption checks */ /* Rotate windowmask and skip empty frames. */
if ((regs->windowbase >= (XCHAL_NUM_AREGS/4)) wm = (ws >> wb) | (ws << (XCHAL_NUM_AREGS / 4 - wb));
|| ((regs->windowstart & ~((1<<(XCHAL_NUM_AREGS/4)) - 1)) != 0) ) base = (XCHAL_NUM_AREGS / 4) - (regs->wmask >> 4);
err = 1;
if ((regs->lcount > 0) /* For call8 or call12 frames, we need the previous stack pointer. */
&& ((regs->lbeg > TASK_SIZE) || (regs->lend > TASK_SIZE)) )
err = 1;
/* Restore extended register state. if ((regs->wmask & 2) == 0)
* See struct thread_struct in processor.h. if (__get_user(sp, (int*)(regs->areg[base * 4 + 1] - 12)))
*/ goto errout;
thread = &current->thread;
err |= __copy_from_user (regs->areg, sc->sc_areg, XCHAL_NUM_AREGS*4); /* Spill frames to stack. */
err |= __get_user(buf, &sc->sc_cpstate);
if (buf) {
if (!access_ok(VERIFY_READ, buf, sizeof(*buf)))
goto badframe;
err |= restore_cpextra(buf);
}
regs->syscall = -1; /* disable syscall checks */ while (base < XCHAL_NUM_AREGS / 4) {
return err;
badframe: int m = (wm >> base);
return 1; int inc = 0;
}
static inline void /* Save registers a4..a7 (call8) or a4...a11 (call12) */
flush_my_cpstate(struct task_struct *tsk)
{
unsigned long flags;
local_irq_save(flags);
#if 0 // FIXME if (m & 2) { /* call4 */
for (i = 0; i < XCHAL_CP_NUM; i++) { inc = 1;
if (tsk == coproc_owners[i]) {
xthal_validate_cp(i);
xthal_save_cpregs(tsk->thread.cpregs_ptr[i], i);
/* Invalidate and "disown" the cp to allow } else if (m & 4) { /* call8 */
* callers the chance to reset cp state in the if (copy_to_user((void*)(sp - 32),
* task_struct. */ &regs->areg[(base + 1) * 4], 16))
goto errout;
inc = 2;
xthal_invalidate_cp(i); } else if (m & 8) { /* call12 */
coproc_owners[i] = 0; if (copy_to_user((void*)(sp - 48),
&regs->areg[(base + 1) * 4], 32))
goto errout;
inc = 3;
} }
/* Save current frame a0..a3 under next SP */
sp = regs->areg[((base + inc) * 4 + 1) % XCHAL_NUM_AREGS];
if (copy_to_user((void*)(sp - 16), &regs->areg[base * 4], 16))
goto errout;
/* Get current stack pointer for next loop iteration. */
sp = regs->areg[base * 4 + 1];
base += inc;
} }
#endif
local_irq_restore(flags);
}
/* Return codes:
0: nothing saved
1: stuff to save, successful
-1: stuff to save, error happened
*/
static int
save_cpextra (struct _cpstate *buf)
{
#if XCHAL_CP_NUM == 0
return 0; return 0;
#else
/* FIXME: If a task has never used a coprocessor, there is errout:
* no need to save and restore anything. Tracking this return err;
* information would allow us to optimize this section.
* Perhaps we can use current->used_math or (current->flags &
* PF_USEDFPU) or define a new field in the thread
* structure. */
/* We flush any live, task-owned cp state to the task_struct,
* then copy it all to the sigframe. Then we clear all
* cp/extra state in the task_struct, effectively
* clearing/resetting all cp/extra state for the signal
* handler (cp-exception handling will load these new values
* into the cp/extra registers.) This step is important for
* things like a floating-point cp, where the OS must reset
* the FCR to the default rounding mode. */
int err = 0;
struct task_struct *tsk = current;
flush_my_cpstate(tsk);
/* Note that we just copy everything: 'extra' and 'cp' state together.*/
err |= __copy_to_user(buf, tsk->thread.cp_save, XTENSA_CP_EXTRA_SIZE);
memset(tsk->thread.cp_save, 0, XTENSA_CP_EXTRA_SIZE);
#if (XTENSA_CP_EXTRA_SIZE == 0)
#error Sanity check on memset above, cpextra_size should not be zero.
#endif
return err ? -1 : 1;
#endif
} }
/*
* Note: We don't copy double exception 'regs', we have to finish double exc.
* first before we return to signal handler! This dbl.exc.handler might cause
* another double exception, but I think we are fine as the situation is the
* same as if we had returned to the signal handerl and got an interrupt
* immediately...
*/
static int static int
setup_sigcontext(struct sigcontext *sc, struct _cpstate *cpstate, setup_sigcontext(struct sigcontext __user *sc, cp_state_t *cpstate,
struct pt_regs *regs, unsigned long mask) struct pt_regs *regs, unsigned long mask)
{ {
struct thread_struct *thread;
int err = 0; int err = 0;
//printk("setup_sigcontext\n");
#define COPY(x) err |= __put_user(regs->x, &sc->sc_##x) #define COPY(x) err |= __put_user(regs->x, &sc->sc_##x)
COPY(pc); COPY(pc);
COPY(ps); COPY(ps);
COPY(depc);
COPY(wmask);
COPY(lbeg); COPY(lbeg);
COPY(lend); COPY(lend);
COPY(lcount); COPY(lcount);
COPY(sar); COPY(sar);
COPY(windowbase);
COPY(windowstart);
#undef COPY #undef COPY
/* Save extended register state. err |= flush_window_regs_user(regs);
* See struct thread_struct in processor.h. err |= __copy_to_user (sc->sc_a, regs->areg, 16 * 4);
*/
thread = &current->thread; // err |= __copy_to_user (sc->sc_a, regs->areg, XCHAL_NUM_AREGS * 4)
err |= __copy_to_user (sc->sc_areg, regs->areg, XCHAL_NUM_AREGS * 4);
#if XCHAL_HAVE_CP
# error Coprocessors unsupported
err |= save_cpextra(cpstate); err |= save_cpextra(cpstate);
err |= __put_user(err ? NULL : cpstate, &sc->sc_cpstate); err |= __put_user(err ? NULL : cpstate, &sc->sc_cpstate);
#endif
/* non-iBCS2 extensions.. */ /* non-iBCS2 extensions.. */
err |= __put_user(mask, &sc->oldmask); err |= __put_user(mask, &sc->oldmask);
return err; return err;
} }
asmlinkage int xtensa_sigreturn(struct pt_regs *regs) static int
restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc)
{ {
struct sigframe *frame = (struct sigframe *)regs->areg[1]; unsigned int err = 0;
sigset_t set; unsigned long ps;
if (regs->depc > 64)
panic ("Double exception sys_sigreturn\n");
if (!access_ok(VERIFY_READ, frame, sizeof(*frame))) #define COPY(x) err |= __get_user(regs->x, &sc->sc_##x)
goto badframe; COPY(pc);
COPY(lbeg);
COPY(lend);
COPY(lcount);
COPY(sar);
#undef COPY
if (__get_user(set.sig[0], &frame->sc.oldmask) /* All registers were flushed to stack. Start with a prestine frame. */
|| (_NSIG_WORDS > 1
&& __copy_from_user(&set.sig[1], &frame->extramask,
sizeof(frame->extramask))))
goto badframe;
sigdelsetmask(&set, ~_BLOCKABLE); regs->wmask = 1;
regs->windowbase = 0;
regs->windowstart = 1;
spin_lock_irq(&current->sighand->siglock); /* For PS, restore only PS.CALLINC.
current->blocked = set; * Assume that all other bits are either the same as for the signal
recalc_sigpending(); * handler, or the user mode value doesn't matter (e.g. PS.OWB).
spin_unlock_irq(&current->sighand->siglock); */
err |= __get_user(ps, &sc->sc_ps);
regs->ps = (regs->ps & ~PS_CALLINC_MASK) | (ps & PS_CALLINC_MASK);
if (restore_sigcontext(regs, &frame->sc)) /* Additional corruption checks */
goto badframe;
return regs->areg[2];
badframe: if ((regs->lcount > 0)
force_sig(SIGSEGV, current); && ((regs->lbeg > TASK_SIZE) || (regs->lend > TASK_SIZE)) )
return 0; err = 1;
err |= __copy_from_user(regs->areg, sc->sc_a, 16 * 4);
#if XCHAL_HAVE_CP
# error Coprocessors unsupported
/* The signal handler may have used coprocessors in which
* case they are still enabled. We disable them to force a
* reloading of the original task's CP state by the lazy
* context-switching mechanisms of CP exception handling.
* Also, we essentially discard any coprocessor state that the
* signal handler created. */
if (!err) {
struct task_struct *tsk = current;
release_all_cp(tsk);
err |= __copy_from_user(tsk->thread.cpextra, sc->sc_cpstate,
XTENSA_CP_EXTRA_SIZE);
}
#endif
regs->syscall = -1; /* disable syscall checks */
return err;
} }
asmlinkage int xtensa_rt_sigreturn(struct pt_regs *regs)
/*
* Do a signal return; undo the signal stack.
*/
asmlinkage long xtensa_rt_sigreturn(long a0, long a1, long a2, long a3,
long a4, long a5, struct pt_regs *regs)
{ {
struct rt_sigframe *frame = (struct rt_sigframe *)regs->areg[1]; struct rt_sigframe __user *frame;
sigset_t set; sigset_t set;
stack_t st;
int ret; int ret;
if (regs->depc > 64) if (regs->depc > 64)
{ panic("rt_sigreturn in double exception!\n");
printk("!!!!!!! DEPC !!!!!!!\n");
return 0; frame = (struct rt_sigframe __user *) regs->areg[1];
}
if (!access_ok(VERIFY_READ, frame, sizeof(*frame))) if (!access_ok(VERIFY_READ, frame, sizeof(*frame)))
goto badframe; goto badframe;
@ -407,13 +249,11 @@ asmlinkage int xtensa_rt_sigreturn(struct pt_regs *regs)
if (restore_sigcontext(regs, &frame->uc.uc_mcontext)) if (restore_sigcontext(regs, &frame->uc.uc_mcontext))
goto badframe; goto badframe;
ret = regs->areg[2]; ret = regs->areg[2];
if (__copy_from_user(&st, &frame->uc.uc_stack, sizeof(st))) if (do_sigaltstack(&frame->uc.uc_stack, NULL, regs->areg[1]) == -EFAULT)
goto badframe; goto badframe;
/* It is more difficult to avoid calling this function than to
call it and ignore errors. */
do_sigaltstack(&st, NULL, regs->areg[1]);
return ret; return ret;
@ -422,77 +262,50 @@ badframe:
return 0; return 0;
} }
/* /*
* Set up a signal frame. * Set up a signal frame.
*/ */
/*
* Determine which stack to use..
*/
static inline void *
get_sigframe(struct k_sigaction *ka, unsigned long sp, size_t frame_size)
{
if ((ka->sa.sa_flags & SA_ONSTACK) != 0 && ! sas_ss_flags(sp))
sp = current->sas_ss_sp + current->sas_ss_size;
return (void *)((sp - frame_size) & -16ul);
}
#define USE_SIGRETURN 0
#define USE_RT_SIGRETURN 1
static int static int
gen_return_code(unsigned char *codemem, unsigned int use_rt_sigreturn) gen_return_code(unsigned char *codemem)
{ {
unsigned int retcall;
int err = 0; int err = 0;
#if 0 /*
/* Ignoring SA_RESTORER for now; it's supposed to be obsolete, * The 12-bit immediate is really split up within the 24-bit MOVI
* and the xtensa glibc doesn't use it. * instruction. As long as the above system call numbers fit within
* 8-bits, the following code works fine. See the Xtensa ISA for
* details.
*/ */
if (ka->sa.sa_flags & SA_RESTORER) {
regs->pr = (unsigned long) ka->sa.sa_restorer;
} else
#endif /* 0 */
{
#if (__NR_sigreturn > 255) || (__NR_rt_sigreturn > 255) #if __NR_rt_sigreturn > 255
# error Generating the MOVI instruction below breaks!
/* The 12-bit immediate is really split up within the 24-bit MOVI
* instruction. As long as the above system call numbers fit within
* 8-bits, the following code works fine. See the Xtensa ISA for
* details.
*/
#error Generating the MOVI instruction below breaks!
#endif #endif
retcall = use_rt_sigreturn ? __NR_rt_sigreturn : __NR_sigreturn;
#ifdef __XTENSA_EB__ /* Big Endian version */ #ifdef __XTENSA_EB__ /* Big Endian version */
/* Generate instruction: MOVI a2, retcall */ /* Generate instruction: MOVI a2, __NR_rt_sigreturn */
err |= __put_user(0x22, &codemem[0]); err |= __put_user(0x22, &codemem[0]);
err |= __put_user(0x0a, &codemem[1]); err |= __put_user(0x0a, &codemem[1]);
err |= __put_user(retcall, &codemem[2]); err |= __put_user(__NR_rt_sigreturn, &codemem[2]);
/* Generate instruction: SYSCALL */ /* Generate instruction: SYSCALL */
err |= __put_user(0x00, &codemem[3]); err |= __put_user(0x00, &codemem[3]);
err |= __put_user(0x05, &codemem[4]); err |= __put_user(0x05, &codemem[4]);
err |= __put_user(0x00, &codemem[5]); err |= __put_user(0x00, &codemem[5]);
#elif defined __XTENSA_EL__ /* Little Endian version */ #elif defined __XTENSA_EL__ /* Little Endian version */
/* Generate instruction: MOVI a2, retcall */ /* Generate instruction: MOVI a2, __NR_rt_sigreturn */
err |= __put_user(0x22, &codemem[0]); err |= __put_user(0x22, &codemem[0]);
err |= __put_user(0xa0, &codemem[1]); err |= __put_user(0xa0, &codemem[1]);
err |= __put_user(retcall, &codemem[2]); err |= __put_user(__NR_rt_sigreturn, &codemem[2]);
/* Generate instruction: SYSCALL */ /* Generate instruction: SYSCALL */
err |= __put_user(0x00, &codemem[3]); err |= __put_user(0x00, &codemem[3]);
err |= __put_user(0x50, &codemem[4]); err |= __put_user(0x50, &codemem[4]);
err |= __put_user(0x00, &codemem[5]); err |= __put_user(0x00, &codemem[5]);
#else #else
#error Must use compiler for Xtensa processors. # error Must use compiler for Xtensa processors.
#endif #endif
}
/* Flush generated code out of the data cache */ /* Flush generated code out of the data cache */
@ -504,97 +317,29 @@ gen_return_code(unsigned char *codemem, unsigned int use_rt_sigreturn)
return err; return err;
} }
static void
set_thread_state(struct pt_regs *regs, void *stack, unsigned char *retaddr,
void *handler, unsigned long arg1, void *arg2, void *arg3)
{
/* Set up registers for signal handler */
start_thread(regs, (unsigned long) handler, (unsigned long) stack);
/* Set up a stack frame for a call4 static void setup_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
* Note: PS.CALLINC is set to one by start_thread
*/
regs->areg[4] = (((unsigned long) retaddr) & 0x3fffffff) | 0x40000000;
regs->areg[6] = arg1;
regs->areg[7] = (unsigned long) arg2;
regs->areg[8] = (unsigned long) arg3;
}
static void setup_frame(int sig, struct k_sigaction *ka,
sigset_t *set, struct pt_regs *regs) sigset_t *set, struct pt_regs *regs)
{
struct sigframe *frame;
int err = 0;
int signal;
frame = get_sigframe(ka, regs->areg[1], sizeof(*frame));
if (regs->depc > 64)
{
printk("!!!!!!! DEPC !!!!!!!\n");
return;
}
if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
goto give_sigsegv;
signal = current_thread_info()->exec_domain
&& current_thread_info()->exec_domain->signal_invmap
&& sig < 32
? current_thread_info()->exec_domain->signal_invmap[sig]
: sig;
err |= setup_sigcontext(&frame->sc, &frame->cpstate, regs, set->sig[0]);
if (_NSIG_WORDS > 1) {
err |= __copy_to_user(frame->extramask, &set->sig[1],
sizeof(frame->extramask));
}
/* Create sys_sigreturn syscall in stack frame */
err |= gen_return_code(frame->retcode, USE_SIGRETURN);
if (err)
goto give_sigsegv;
/* Create signal handler execution context.
* Return context not modified until this point.
*/
set_thread_state(regs, frame, frame->retcode,
ka->sa.sa_handler, signal, &frame->sc, NULL);
/* Set access mode to USER_DS. Nomenclature is outdated, but
* functionality is used in uaccess.h
*/
set_fs(USER_DS);
#if DEBUG_SIG
printk("SIG deliver (%s:%d): signal=%d sp=%p pc=%08x\n",
current->comm, current->pid, signal, frame, regs->pc);
#endif
return;
give_sigsegv:
if (sig == SIGSEGV)
ka->sa.sa_handler = SIG_DFL;
force_sig(SIGSEGV, current);
}
static void setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
sigset_t *set, struct pt_regs *regs)
{ {
struct rt_sigframe *frame; struct rt_sigframe *frame;
int err = 0; int err = 0;
int signal; int signal;
unsigned long sp, ra;
sp = regs->areg[1];
if ((ka->sa.sa_flags & SA_ONSTACK) != 0 && ! on_sig_stack(sp)) {
sp = current->sas_ss_sp + current->sas_ss_size;
}
frame = (void *)((sp - sizeof(*frame)) & -16ul);
frame = get_sigframe(ka, regs->areg[1], sizeof(*frame));
if (regs->depc > 64) if (regs->depc > 64)
panic ("Double exception sys_sigreturn\n"); panic ("Double exception sys_sigreturn\n");
if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame))) if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame))) {
goto give_sigsegv; goto give_sigsegv;
}
signal = current_thread_info()->exec_domain signal = current_thread_info()->exec_domain
&& current_thread_info()->exec_domain->signal_invmap && current_thread_info()->exec_domain->signal_invmap
@ -602,9 +347,12 @@ static void setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
? current_thread_info()->exec_domain->signal_invmap[sig] ? current_thread_info()->exec_domain->signal_invmap[sig]
: sig; : sig;
err |= copy_siginfo_to_user(&frame->info, info); if (ka->sa.sa_flags & SA_SIGINFO) {
err |= copy_siginfo_to_user(&frame->info, info);
}
/* Create the user context. */
/* Create the ucontext. */
err |= __put_user(0, &frame->uc.uc_flags); err |= __put_user(0, &frame->uc.uc_flags);
err |= __put_user(0, &frame->uc.uc_link); err |= __put_user(0, &frame->uc.uc_link);
err |= __put_user((void *)current->sas_ss_sp, err |= __put_user((void *)current->sas_ss_sp,
@ -617,16 +365,31 @@ static void setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
err |= __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set)); err |= __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set));
/* Create sys_rt_sigreturn syscall in stack frame */ /* Create sys_rt_sigreturn syscall in stack frame */
err |= gen_return_code(frame->retcode, USE_RT_SIGRETURN);
if (err) err |= gen_return_code(frame->retcode);
if (err) {
goto give_sigsegv; goto give_sigsegv;
}
/* Create signal handler execution context. /*
* Create signal handler execution context.
* Return context not modified until this point. * Return context not modified until this point.
*/ */
set_thread_state(regs, frame, frame->retcode,
ka->sa.sa_handler, signal, &frame->info, &frame->uc); /* Set up registers for signal handler */
start_thread(regs, (unsigned long) ka->sa.sa_handler,
(unsigned long) frame);
/* Set up a stack frame for a call4
* Note: PS.CALLINC is set to one by start_thread
*/
ra = (unsigned long) frame->retcode;
regs->areg[4] = (((unsigned long) ra) & 0x3fffffff) | 0x40000000;
regs->areg[6] = (unsigned long) signal;
regs->areg[7] = (unsigned long) &frame->info;
regs->areg[8] = (unsigned long) &frame->uc;
/* Set access mode to USER_DS. Nomenclature is outdated, but /* Set access mode to USER_DS. Nomenclature is outdated, but
* functionality is used in uaccess.h * functionality is used in uaccess.h
@ -646,6 +409,48 @@ give_sigsegv:
force_sig(SIGSEGV, current); force_sig(SIGSEGV, current);
} }
/*
* Atomically swap in the new signal mask, and wait for a signal.
*/
asmlinkage long xtensa_rt_sigsuspend(sigset_t __user *unewset,
size_t sigsetsize,
long a2, long a3, long a4, long a5,
struct pt_regs *regs)
{
sigset_t saveset, newset;
/* XXX: Don't preclude handling different sized sigset_t's. */
if (sigsetsize != sizeof(sigset_t))
return -EINVAL;
if (copy_from_user(&newset, unewset, sizeof(newset)))
return -EFAULT;
sigdelsetmask(&newset, ~_BLOCKABLE);
spin_lock_irq(&current->sighand->siglock);
saveset = current->blocked;
current->blocked = newset;
recalc_sigpending();
spin_unlock_irq(&current->sighand->siglock);
regs->areg[2] = -EINTR;
while (1) {
current->state = TASK_INTERRUPTIBLE;
schedule();
if (do_signal(regs, &saveset))
return -EINTR;
}
}
asmlinkage long xtensa_sigaltstack(const stack_t __user *uss,
stack_t __user *uoss,
long a2, long a3, long a4, long a5,
struct pt_regs *regs)
{
return do_sigaltstack(uss, uoss, regs->areg[1]);
}
/* /*
@ -663,51 +468,89 @@ int do_signal(struct pt_regs *regs, sigset_t *oldset)
int signr; int signr;
struct k_sigaction ka; struct k_sigaction ka;
if (!user_mode(regs))
return 0;
if (try_to_freeze())
goto no_signal;
if (!oldset) if (!oldset)
oldset = &current->blocked; oldset = &current->blocked;
task_pt_regs(current)->icountlevel = 0;
signr = get_signal_to_deliver(&info, &ka, regs, NULL); signr = get_signal_to_deliver(&info, &ka, regs, NULL);
/* Are we from a system call? */ if (signr > 0) {
if (regs->syscall >= 0) {
/* If so, check system call restarting.. */
switch (regs->areg[2]) {
case ERESTARTNOHAND:
case ERESTART_RESTARTBLOCK:
regs->areg[2] = -EINTR;
break;
case ERESTARTSYS: /* Are we from a system call? */
if (!(ka.sa.sa_flags & SA_RESTART)) {
if ((signed)regs->syscall >= 0) {
/* If so, check system call restarting.. */
switch (regs->areg[2]) {
case -ERESTARTNOHAND:
case -ERESTART_RESTARTBLOCK:
regs->areg[2] = -EINTR; regs->areg[2] = -EINTR;
break; break;
}
/* fallthrough */ case -ERESTARTSYS:
case ERESTARTNOINTR: if (!(ka.sa.sa_flags & SA_RESTART)) {
regs->areg[2] = regs->syscall; regs->areg[2] = -EINTR;
regs->pc -= 3; break;
}
/* fallthrough */
case -ERESTARTNOINTR:
regs->areg[2] = regs->syscall;
regs->pc -= 3;
break;
default:
/* nothing to do */
if (regs->areg[2] != 0)
break;
}
} }
/* Whee! Actually deliver the signal. */
/* Set up the stack frame */
setup_frame(signr, &ka, &info, oldset, regs);
if (ka.sa.sa_flags & SA_ONESHOT)
ka.sa.sa_handler = SIG_DFL;
spin_lock_irq(&current->sighand->siglock);
sigorsets(&current->blocked, &current->blocked, &ka.sa.sa_mask);
if (!(ka.sa.sa_flags & SA_NODEFER))
sigaddset(&current->blocked, signr);
recalc_sigpending();
spin_unlock_irq(&current->sighand->siglock);
if (current->ptrace & PT_SINGLESTEP)
task_pt_regs(current)->icountlevel = 1;
return 1;
} }
if (signr == 0) no_signal:
return 0; /* no signals delivered */ /* Did we come from a system call? */
if ((signed) regs->syscall >= 0) {
/* Whee! Actually deliver the signal. */ /* Restart the system call - no handlers present */
switch (regs->areg[2]) {
/* Set up the stack frame */ case -ERESTARTNOHAND:
if (ka.sa.sa_flags & SA_SIGINFO) case -ERESTARTSYS:
setup_rt_frame(signr, &ka, &info, oldset, regs); case -ERESTARTNOINTR:
else regs->areg[2] = regs->syscall;
setup_frame(signr, &ka, oldset, regs); regs->pc -= 3;
break;
if (ka.sa.sa_flags & SA_ONESHOT) case -ERESTART_RESTARTBLOCK:
ka.sa.sa_handler = SIG_DFL; regs->areg[2] = __NR_restart_syscall;
regs->pc -= 3;
spin_lock_irq(&current->sighand->siglock); break;
sigorsets(&current->blocked, &current->blocked, &ka.sa.sa_mask); }
if (!(ka.sa.sa_flags & SA_NODEFER)) }
sigaddset(&current->blocked, signr); if (current->ptrace & PT_SINGLESTEP)
recalc_sigpending(); task_pt_regs(current)->icountlevel = 1;
spin_unlock_irq(&current->sighand->siglock); return 0;
return 1;
} }

8
include/asm-xtensa/coprocessor.h
View File

@ -64,6 +64,7 @@ typedef struct {
# define COPROCESSOR_INFO_SIZE 8 # define COPROCESSOR_INFO_SIZE 8
# endif # endif
#endif #endif
#endif /* XCHAL_HAVE_CP */
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
@ -74,8 +75,11 @@ extern void save_coprocessor_registers(void*, int);
# else # else
# define release_coprocessors(task) # define release_coprocessors(task)
# endif # endif
#endif
#endif typedef unsigned char cp_state_t[XTENSA_CP_EXTRA_SIZE]
__attribute__ ((aligned (XTENSA_CP_EXTRA_ALIGN)));
#endif /* !__ASSEMBLY__ */
#endif /* _XTENSA_COPROCESSOR_H */ #endif /* _XTENSA_COPROCESSOR_H */

3
include/asm-xtensa/elf.h
View File

@ -13,7 +13,6 @@
#ifndef _XTENSA_ELF_H #ifndef _XTENSA_ELF_H
#define _XTENSA_ELF_H #define _XTENSA_ELF_H
#include <asm/variant/core.h>
#include <asm/ptrace.h> #include <asm/ptrace.h>
/* Xtensa processor ELF architecture-magic number */ /* Xtensa processor ELF architecture-magic number */
@ -49,7 +48,7 @@ typedef struct {
elf_greg_t lcount; elf_greg_t lcount;
elf_greg_t sar; elf_greg_t sar;
elf_greg_t syscall; elf_greg_t syscall;
elf_greg_t ar[XCHAL_NUM_AREGS]; elf_greg_t ar[64];
} xtensa_gregset_t; } xtensa_gregset_t;
#define ELF_NGREG (sizeof(xtensa_gregset_t) / sizeof(elf_greg_t)) #define ELF_NGREG (sizeof(xtensa_gregset_t) / sizeof(elf_greg_t))

3
include/asm-xtensa/ptrace.h
View File

@ -99,7 +99,8 @@ struct pt_regs {
unsigned long windowbase; /* 48 */ unsigned long windowbase; /* 48 */
unsigned long windowstart; /* 52 */ unsigned long windowstart; /* 52 */
unsigned long syscall; /* 56 */ unsigned long syscall; /* 56 */
int reserved[2]; /* 64 */ unsigned long icountlevel; /* 60 */
int reserved[1]; /* 64 */
/* Make sure the areg field is 16 bytes aligned. */ /* Make sure the areg field is 16 bytes aligned. */
int align[0] __attribute__ ((aligned(16))); int align[0] __attribute__ ((aligned(16)));

24
include/asm-xtensa/sigcontext.h
View File

@ -5,21 +5,12 @@
* License. See the file "COPYING" in the main directory of this archive * License. See the file "COPYING" in the main directory of this archive
* for more details. * for more details.
* *
* Copyright (C) 2001 - 2003 Tensilica Inc. * Copyright (C) 2001 - 2007 Tensilica Inc.
*/ */
#ifndef _XTENSA_SIGCONTEXT_H #ifndef _XTENSA_SIGCONTEXT_H
#define _XTENSA_SIGCONTEXT_H #define _XTENSA_SIGCONTEXT_H
#define _ASMLANGUAGE
#include <asm/processor.h>
#include <asm/coprocessor.h>
struct _cpstate {
unsigned char _cpstate[XTENSA_CP_EXTRA_SIZE];
} __attribute__ ((aligned (XTENSA_CP_EXTRA_ALIGN)));
struct sigcontext { struct sigcontext {
unsigned long oldmask; unsigned long oldmask;
@ -27,18 +18,13 @@ struct sigcontext {
/* CPU registers */ /* CPU registers */
unsigned long sc_pc; unsigned long sc_pc;
unsigned long sc_ps; unsigned long sc_ps;
unsigned long sc_wmask;
unsigned long sc_windowbase;
unsigned long sc_windowstart;
unsigned long sc_lbeg; unsigned long sc_lbeg;
unsigned long sc_lend; unsigned long sc_lend;
unsigned long sc_lcount; unsigned long sc_lcount;
unsigned long sc_sar; unsigned long sc_sar;
unsigned long sc_depc; unsigned long sc_acclo;
unsigned long sc_dareg0; unsigned long sc_acchi;
unsigned long sc_treg[4]; unsigned long sc_a[16];
unsigned long sc_areg[XCHAL_NUM_AREGS];
struct _cpstate *sc_cpstate;
}; };
#endif /* __ASM_XTENSA_SIGCONTEXT_H */ #endif /* _XTENSA_SIGCONTEXT_H */

4
include/asm-xtensa/unistd.h
View File

@ -485,8 +485,8 @@ __SYSCALL(217, sys_sched_get_priority_min, 1)
__SYSCALL(218, sys_sched_rr_get_interval, 2) __SYSCALL(218, sys_sched_rr_get_interval, 2)
#define __NR_sched_yield 219 #define __NR_sched_yield 219
__SYSCALL(219, sys_sched_yield, 0) __SYSCALL(219, sys_sched_yield, 0)
#define __NR_sigreturn 222 #define __NR_available222 222
__SYSCALL(222, xtensa_sigreturn, 0) __SYSCALL(222, sys_ni_syscall, 0)
/* Signal Handling */ /* Signal Handling */