git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
arch
/
ppc64
/
kernel
/
signal.c
diff --git
a/arch/ppc64/kernel/signal.c
b/arch/ppc64/kernel/signal.c
index
ce06678
..
bea0bbc
100644
(file)
--- a/
arch/ppc64/kernel/signal.c
+++ b/
arch/ppc64/kernel/signal.c
@@
-26,7
+26,7
@@
#include <linux/unistd.h>
#include <linux/stddef.h>
#include <linux/elf.h>
#include <linux/unistd.h>
#include <linux/stddef.h>
#include <linux/elf.h>
-#include <
asm/ppc32
.h>
+#include <
linux/ptrace
.h>
#include <asm/sigcontext.h>
#include <asm/ucontext.h>
#include <asm/uaccess.h>
#include <asm/sigcontext.h>
#include <asm/ucontext.h>
#include <asm/uaccess.h>
@@
-67,7
+67,7
@@
struct rt_sigframe {
struct siginfo info;
/* 64 bit ABI allows for 288 bytes below sp before decrementing it. */
char abigap[288];
struct siginfo info;
/* 64 bit ABI allows for 288 bytes below sp before decrementing it. */
char abigap[288];
-};
+}
__attribute__ ((aligned (16)))
;
/*
/*
@@
-99,7
+99,7
@@
long sys_rt_sigsuspend(sigset_t __user *unewset, size_t sigsetsize, int p3, int
current->state = TASK_INTERRUPTIBLE;
schedule();
if (do_signal(&saveset, regs))
current->state = TASK_INTERRUPTIBLE;
schedule();
if (do_signal(&saveset, regs))
- return
regs->gpr[3]
;
+ return
0
;
}
}
}
}
@@
-127,12
+127,11
@@
static long setup_sigcontext(struct sigcontext __user *sc, struct pt_regs *regs,
* v_regs pointer or not
*/
#ifdef CONFIG_ALTIVEC
* v_regs pointer or not
*/
#ifdef CONFIG_ALTIVEC
- elf_vrreg_t __user *v_regs = (elf_vrreg_t __user *)(((unsigned long)sc->vmx_reserve) & ~0xful);
+ elf_vrreg_t __user *v_regs = (elf_vrreg_t __user *)(((unsigned long)sc->vmx_reserve
+ 15
) & ~0xful);
#endif
long err = 0;
#endif
long err = 0;
- if (regs->msr & MSR_FP)
- giveup_fpu(current);
+ flush_fp_to_thread(current);
/* Make sure signal doesn't get spurrious FP exceptions */
current->thread.fpscr = 0;
/* Make sure signal doesn't get spurrious FP exceptions */
current->thread.fpscr = 0;
@@
-141,9
+140,8
@@
static long setup_sigcontext(struct sigcontext __user *sc, struct pt_regs *regs,
err |= __put_user(v_regs, &sc->v_regs);
/* save altivec registers */
err |= __put_user(v_regs, &sc->v_regs);
/* save altivec registers */
- if (current->thread.used_vr) {
- if (regs->msr & MSR_VEC)
- giveup_altivec(current);
+ if (current->thread.used_vr) {
+ flush_altivec_to_thread(current);
/* Copy 33 vec registers (vr0..31 and vscr) to the stack */
err |= __copy_to_user(v_regs, current->thread.vr, 33 * sizeof(vector128));
/* set MSR_VEC in the MSR value in the frame to indicate that sc->v_reg)
/* Copy 33 vec registers (vr0..31 and vscr) to the stack */
err |= __copy_to_user(v_regs, current->thread.vr, 33 * sizeof(vector128));
/* set MSR_VEC in the MSR value in the frame to indicate that sc->v_reg)
@@
-180,8
+178,11
@@
static long restore_sigcontext(struct pt_regs *regs, sigset_t *set, int sig,
elf_vrreg_t __user *v_regs;
#endif
unsigned long err = 0;
elf_vrreg_t __user *v_regs;
#endif
unsigned long err = 0;
- unsigned long save_r13;
+ unsigned long save_r13
= 0
;
elf_greg_t *gregs = (elf_greg_t *)regs;
elf_greg_t *gregs = (elf_greg_t *)regs;
+#ifdef CONFIG_ALTIVEC
+ unsigned long msr;
+#endif
int i;
/* If this is not a signal return, we preserve the TLS in r13 */
int i;
/* If this is not a signal return, we preserve the TLS in r13 */
@@
-207,13
+208,15
@@
static long restore_sigcontext(struct pt_regs *regs, sigset_t *set, int sig,
#ifdef CONFIG_ALTIVEC
err |= __get_user(v_regs, &sc->v_regs);
#ifdef CONFIG_ALTIVEC
err |= __get_user(v_regs, &sc->v_regs);
+ err |= __get_user(msr, &sc->gp_regs[PT_MSR]);
if (err)
return err;
/* Copy 33 vec registers (vr0..31 and vscr) from the stack */
if (err)
return err;
/* Copy 33 vec registers (vr0..31 and vscr) from the stack */
- if (v_regs != 0 && (regs->msr & MSR_VEC) != 0)
- err |= __copy_from_user(current->thread.vr, v_regs, 33 * sizeof(vector128));
+ if (v_regs != 0 && (msr & MSR_VEC) != 0)
+ err |= __copy_from_user(current->thread.vr, v_regs,
+ 33 * sizeof(vector128));
else if (current->thread.used_vr)
else if (current->thread.used_vr)
- memset(
¤t->thread.vr, 0, 33
);
+ memset(
current->thread.vr, 0, 33 * sizeof(vector128)
);
/* Always get VRSAVE back */
if (v_regs != 0)
err |= __get_user(current->thread.vrsave, (u32 __user *)&v_regs[33]);
/* Always get VRSAVE back */
if (v_regs != 0)
err |= __get_user(current->thread.vrsave, (u32 __user *)&v_regs[33]);
@@
-221,6
+224,14
@@
static long restore_sigcontext(struct pt_regs *regs, sigset_t *set, int sig,
current->thread.vrsave = 0;
#endif /* CONFIG_ALTIVEC */
current->thread.vrsave = 0;
#endif /* CONFIG_ALTIVEC */
+#ifndef CONFIG_SMP
+ preempt_disable();
+ if (last_task_used_math == current)
+ last_task_used_math = NULL;
+ if (last_task_used_altivec == current)
+ last_task_used_altivec = NULL;
+ preempt_enable();
+#endif
/* Force reload of FP/VEC */
regs->msr &= ~(MSR_FP | MSR_FE0 | MSR_FE1 | MSR_VEC);
/* Force reload of FP/VEC */
regs->msr &= ~(MSR_FP | MSR_FE0 | MSR_FE1 | MSR_VEC);
@@
-243,7
+254,7
@@
static inline void __user * get_sigframe(struct k_sigaction *ka, struct pt_regs
newsp = (current->sas_ss_sp + current->sas_ss_size);
}
newsp = (current->sas_ss_sp + current->sas_ss_size);
}
- return (void __user *)((newsp - frame_size) & -
8
ul);
+ return (void __user *)((newsp - frame_size) & -
16
ul);
}
/*
}
/*
@@
-373,10
+384,11
@@
badframe:
printk("badframe in sys_rt_sigreturn, regs=%p uc=%p &uc->uc_mcontext=%p\n",
regs, uc, &uc->uc_mcontext);
#endif
printk("badframe in sys_rt_sigreturn, regs=%p uc=%p &uc->uc_mcontext=%p\n",
regs, uc, &uc->uc_mcontext);
#endif
- do_exit(SIGSEGV);
+ force_sig(SIGSEGV, current);
+ return 0;
}
}
-static
void
setup_rt_frame(int signr, struct k_sigaction *ka, siginfo_t *info,
+static
int
setup_rt_frame(int signr, struct k_sigaction *ka, siginfo_t *info,
sigset_t *set, struct pt_regs *regs)
{
/* Handler is *really* a pointer to the function descriptor for
sigset_t *set, struct pt_regs *regs)
{
/* Handler is *really* a pointer to the function descriptor for
@@
-422,7
+434,7
@@
static void setup_rt_frame(int signr, struct k_sigaction *ka, siginfo_t *info,
/* Allocate a dummy caller frame for the signal handler. */
newsp = (unsigned long)frame - __SIGNAL_FRAMESIZE;
/* Allocate a dummy caller frame for the signal handler. */
newsp = (unsigned long)frame - __SIGNAL_FRAMESIZE;
- err |= put_user(
0
, (unsigned long __user *)newsp);
+ err |= put_user(
regs->gpr[1]
, (unsigned long __user *)newsp);
/* Set up "regs" so we "return" to the signal handler. */
err |= get_user(regs->nip, &funct_desc_ptr->entry);
/* Set up "regs" so we "return" to the signal handler. */
err |= get_user(regs->nip, &funct_desc_ptr->entry);
@@
-441,37
+453,41
@@
static void setup_rt_frame(int signr, struct k_sigaction *ka, siginfo_t *info,
if (err)
goto badframe;
if (err)
goto badframe;
- return;
+ if (test_thread_flag(TIF_SINGLESTEP))
+ ptrace_notify(SIGTRAP);
+
+ return 1;
badframe:
#if DEBUG_SIG
printk("badframe in setup_rt_frame, regs=%p frame=%p newsp=%lx\n",
regs, frame, newsp);
#endif
badframe:
#if DEBUG_SIG
printk("badframe in setup_rt_frame, regs=%p frame=%p newsp=%lx\n",
regs, frame, newsp);
#endif
- do_exit(SIGSEGV);
+ force_sigsegv(signr, current);
+ return 0;
}
/*
* OK, we're invoking a handler
*/
}
/*
* OK, we're invoking a handler
*/
-static
void
handle_signal(unsigned long sig, struct k_sigaction *ka,
-
siginfo_t *info, sigset_t *oldset, struct pt_regs *regs)
+static
int
handle_signal(unsigned long sig, struct k_sigaction *ka,
+ siginfo_t *info, sigset_t *oldset, struct pt_regs *regs)
{
{
- /* Set up Signal Frame */
- setup_rt_frame(sig, ka, info, oldset, regs);
+ int ret;
- if (ka->sa.sa_flags & SA_ONESHOT)
-
ka->sa.sa_handler = SIG_DFL
;
+ /* Set up Signal Frame */
+
ret = setup_rt_frame(sig, ka, info, oldset, regs)
;
- if (!(ka->sa.sa_flags & SA_NODEFER)) {
+ if (
ret &&
!(ka->sa.sa_flags & SA_NODEFER)) {
spin_lock_irq(¤t->sighand->siglock);
spin_lock_irq(¤t->sighand->siglock);
- sigorsets(¤t->blocked,
¤t->blocked,
&ka->sa.sa_mask);
+ sigorsets(¤t->blocked,
¤t->blocked,
&ka->sa.sa_mask);
sigaddset(¤t->blocked,sig);
recalc_sigpending();
spin_unlock_irq(¤t->sighand->siglock);
}
sigaddset(¤t->blocked,sig);
recalc_sigpending();
spin_unlock_irq(¤t->sighand->siglock);
}
- return;
+
+ return ret;
}
static inline void syscall_restart(struct pt_regs *regs, struct k_sigaction *ka)
}
static inline void syscall_restart(struct pt_regs *regs, struct k_sigaction *ka)
@@
-514,6
+530,7
@@
int do_signal(sigset_t *oldset, struct pt_regs *regs)
{
siginfo_t info;
int signr;
{
siginfo_t info;
int signr;
+ struct k_sigaction ka;
/*
* If the current thread is 32 bit - invoke the
/*
* If the current thread is 32 bit - invoke the
@@
-525,18
+542,15
@@
int do_signal(sigset_t *oldset, struct pt_regs *regs)
if (!oldset)
oldset = ¤t->blocked;
if (!oldset)
oldset = ¤t->blocked;
- signr = get_signal_to_deliver(&info, regs, NULL);
+ signr = get_signal_to_deliver(&info,
&ka,
regs, NULL);
if (signr > 0) {
if (signr > 0) {
- struct k_sigaction *ka = ¤t->sighand->action[signr-1];
-
/* Whee! Actually deliver the signal. */
/* Whee! Actually deliver the signal. */
- if (regs->trap == 0x0C00)
- syscall_restart(regs, ka);
- handle_signal(signr, ka, &info, oldset, regs);
- return 1;
+ if (TRAP(regs) == 0x0C00)
+ syscall_restart(regs, &ka);
+ return handle_signal(signr, &ka, &info, oldset, regs);
}
}
- if (
regs->trap
== 0x0C00) { /* System Call! */
+ if (
TRAP(regs)
== 0x0C00) { /* System Call! */
if ((int)regs->result == -ERESTARTNOHAND ||
(int)regs->result == -ERESTARTSYS ||
(int)regs->result == -ERESTARTNOINTR) {
if ((int)regs->result == -ERESTARTNOHAND ||
(int)regs->result == -ERESTARTSYS ||
(int)regs->result == -ERESTARTNOINTR) {