* [PATCH 10/29] ia64: Use get_signal() signal_setup_done()
@ 2013-10-08 11:33 Richard Weinberger
2013-10-08 11:33 ` [PATCH 11/29] m32r: " Richard Weinberger
` (4 more replies)
0 siblings, 5 replies; 9+ messages in thread
From: Richard Weinberger @ 2013-10-08 11:33 UTC (permalink / raw)
To: linux-kernel
Cc: linux-arch, viro, vgupta, catalin.marinas, will.deacon,
hskinnemoen, egtvedt, vapier, msalter, a-jacquiot, starvik,
jesper.nilsson, dhowells, rkuo, tony.luck, fenghua.yu, takata,
geert, james.hogan, monstr, yasutake.koichi, ralf, jonas, jejb,
deller, benh, paulus, schwidefsky, heiko.carstens, liqin.linux,
lennox.wu, lethal, cmetcalf, gxt, linux-xtensa, akpm, oleg, tj,
Richard Weinberger
Use the more generic functions get_signal() signal_setup_done()
for signal delivery.
This inverts also the return codes of force_sigsegv_info()
and setup_frame() to follow the kernel convention.
Signed-off-by: Richard Weinberger <richard@nod.at>
---
arch/ia64/kernel/signal.c | 42 +++++++++++++++++++-----------------------
1 file changed, 19 insertions(+), 23 deletions(-)
diff --git a/arch/ia64/kernel/signal.c b/arch/ia64/kernel/signal.c
index 3637e03..b995dbf 100644
--- a/arch/ia64/kernel/signal.c
+++ b/arch/ia64/kernel/signal.c
@@ -309,12 +309,11 @@ force_sigsegv_info (int sig, void __user *addr)
si.si_uid = from_kuid_munged(current_user_ns(), current_uid());
si.si_addr = addr;
force_sig_info(SIGSEGV, &si, current);
- return 0;
+ return 1;
}
static long
-setup_frame (int sig, struct k_sigaction *ka, siginfo_t *info, sigset_t *set,
- struct sigscratch *scr)
+setup_frame(struct ksignal *ksig, sigset_t *set, struct sigscratch *scr)
{
extern char __kernel_sigtramp[];
unsigned long tramp_addr, new_rbs = 0, new_sp;
@@ -323,7 +322,7 @@ setup_frame (int sig, struct k_sigaction *ka, siginfo_t *info, sigset_t *set,
new_sp = scr->pt.r12;
tramp_addr = (unsigned long) __kernel_sigtramp;
- if (ka->sa.sa_flags & SA_ONSTACK) {
+ if (ksig->ka.sa.sa_flags & SA_ONSTACK) {
int onstack = sas_ss_flags(new_sp);
if (onstack == 0) {
@@ -347,7 +346,7 @@ setup_frame (int sig, struct k_sigaction *ka, siginfo_t *info, sigset_t *set,
*/
check_sp = (new_sp - sizeof(*frame)) & -STACK_ALIGN;
if (!likely(on_sig_stack(check_sp)))
- return force_sigsegv_info(sig, (void __user *)
+ return force_sigsegv_info(ksig->sig, (void __user *)
check_sp);
}
}
@@ -356,14 +355,14 @@ setup_frame (int sig, struct k_sigaction *ka, siginfo_t *info, sigset_t *set,
if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
return force_sigsegv_info(sig, frame);
- err = __put_user(sig, &frame->arg0);
+ err = __put_user(ksig->sig, &frame->arg0);
err |= __put_user(&frame->info, &frame->arg1);
err |= __put_user(&frame->sc, &frame->arg2);
err |= __put_user(new_rbs, &frame->sc.sc_rbs_base);
err |= __put_user(0, &frame->sc.sc_loadrs); /* initialize to zero */
- err |= __put_user(ka->sa.sa_handler, &frame->handler);
+ err |= __put_user(ksig->ka.sa.sa_handler, &frame->handler);
- err |= copy_siginfo_to_user(&frame->info, info);
+ err |= copy_siginfo_to_user(&frame->info, &ksig->info);
err |= __save_altstack(&frame->sc.sc_stack, scr->pt.r12);
err |= setup_sigcontext(&frame->sc, set, scr);
@@ -394,22 +393,20 @@ setup_frame (int sig, struct k_sigaction *ka, siginfo_t *info, sigset_t *set,
#if DEBUG_SIG
printk("SIG deliver (%s:%d): sig=%d sp=%lx ip=%lx handler=%p\n",
- current->comm, current->pid, sig, scr->pt.r12, frame->sc.sc_ip, frame->handler);
+ current->comm, current->pid, ksig->sig, scr->pt.r12, frame->sc.sc_ip, frame->handler);
#endif
- return 1;
+ return 0;
}
static long
-handle_signal (unsigned long sig, struct k_sigaction *ka, siginfo_t *info,
- struct sigscratch *scr)
+handle_signal (struct ksignal *ksig, struct sigscratch *scr)
{
- if (!setup_frame(sig, ka, info, sigmask_to_save(), scr))
- return 0;
+ int ret = setup_frame(ksig, sigmask_to_save(), scr);
- signal_delivered(sig, info, ka, &scr->pt,
- test_thread_flag(TIF_SINGLESTEP));
+ if (!ret)
+ signal_setup_done(ret, ksig, test_thread_flag(TIF_SINGLESTEP));
- return 1;
+ return ret;
}
/*
@@ -419,17 +416,16 @@ handle_signal (unsigned long sig, struct k_sigaction *ka, siginfo_t *info,
void
ia64_do_signal (struct sigscratch *scr, long in_syscall)
{
- struct k_sigaction ka;
- siginfo_t info;
long restart = in_syscall;
long errno = scr->pt.r8;
+ struct ksignal ksig;
/*
* This only loops in the rare cases of handle_signal() failing, in which case we
* need to push through a forced SIGSEGV.
*/
while (1) {
- int signr = get_signal_to_deliver(&info, &ka, &scr->pt, NULL);
+ get_signal(&ksig);
/*
* get_signal_to_deliver() may have run a debugger (via notify_parent())
@@ -446,7 +442,7 @@ ia64_do_signal (struct sigscratch *scr, long in_syscall)
*/
restart = 0;
- if (signr <= 0)
+ if (ksig.sig <= 0)
break;
if (unlikely(restart)) {
@@ -458,7 +454,7 @@ ia64_do_signal (struct sigscratch *scr, long in_syscall)
break;
case ERESTARTSYS:
- if ((ka.sa.sa_flags & SA_RESTART) == 0) {
+ if ((ksig.ka.sa.sa_flags & SA_RESTART) == 0) {
scr->pt.r8 = EINTR;
/* note: scr->pt.r10 is already -1 */
break;
@@ -473,7 +469,7 @@ ia64_do_signal (struct sigscratch *scr, long in_syscall)
* Whee! Actually deliver the signal. If the delivery failed, we need to
* continue to iterate in this loop so we can deliver the SIGSEGV...
*/
- if (handle_signal(signr, &ka, &info, scr))
+ if (handle_signal(&ksig, scr))
return;
}
--
1.8.1.4
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 11/29] m32r: Use get_signal() signal_setup_done()
2013-10-08 11:33 [PATCH 10/29] ia64: Use get_signal() signal_setup_done() Richard Weinberger
@ 2013-10-08 11:33 ` Richard Weinberger
2013-10-08 11:33 ` [PATCH 12/29] m68k: " Richard Weinberger
` (3 subsequent siblings)
4 siblings, 0 replies; 9+ messages in thread
From: Richard Weinberger @ 2013-10-08 11:33 UTC (permalink / raw)
To: linux-kernel
Cc: linux-arch, viro, vgupta, catalin.marinas, will.deacon,
hskinnemoen, egtvedt, vapier, msalter, a-jacquiot, starvik,
jesper.nilsson, dhowells, rkuo, tony.luck, fenghua.yu, takata,
geert, james.hogan, monstr, yasutake.koichi, ralf, jonas, jejb,
deller, benh, paulus, schwidefsky, heiko.carstens, liqin.linux,
lennox.wu, lethal, cmetcalf, gxt, linux-xtensa, akpm, oleg, tj,
Richard Weinberger
Use the more generic functions get_signal() signal_setup_done()
for signal delivery.
Signed-off-by: Richard Weinberger <richard@nod.at>
---
arch/m32r/kernel/signal.c | 47 ++++++++++++++++++++---------------------------
1 file changed, 20 insertions(+), 27 deletions(-)
diff --git a/arch/m32r/kernel/signal.c b/arch/m32r/kernel/signal.c
index d503568..cce3fd3 100644
--- a/arch/m32r/kernel/signal.c
+++ b/arch/m32r/kernel/signal.c
@@ -173,17 +173,17 @@ get_sigframe(struct k_sigaction *ka, unsigned long sp, size_t frame_size)
return (void __user *)((sp - frame_size) & -8ul);
}
-static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
- sigset_t *set, struct pt_regs *regs)
+static int setup_rt_frame(struct ksignal *ksig, sigset_t *set,
+ struct pt_regs *regs)
{
struct rt_sigframe __user *frame;
int err = 0;
- int signal;
+ int signal, sig = ksig->sig;
- frame = get_sigframe(ka, regs->spu, sizeof(*frame));
+ frame = get_sigframe(&ksig->ka, regs->spu, sizeof(*frame));
if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
- goto give_sigsegv;
+ return -EFAULT;
signal = current_thread_info()->exec_domain
&& current_thread_info()->exec_domain->signal_invmap
@@ -193,13 +193,13 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
err |= __put_user(signal, &frame->sig);
if (err)
- goto give_sigsegv;
+ return -EFAULT;
err |= __put_user(&frame->info, &frame->pinfo);
err |= __put_user(&frame->uc, &frame->puc);
- err |= copy_siginfo_to_user(&frame->info, info);
+ err |= copy_siginfo_to_user(&frame->info, &ksig->info);
if (err)
- goto give_sigsegv;
+ return -EFAULT;
/* Create the ucontext. */
err |= __put_user(0, &frame->uc.uc_flags);
@@ -208,17 +208,17 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
err |= setup_sigcontext(&frame->uc.uc_mcontext, regs, set->sig[0]);
err |= __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set));
if (err)
- goto give_sigsegv;
+ return -EFAULT;
/* Set up to return from userspace. */
- regs->lr = (unsigned long)ka->sa.sa_restorer;
+ regs->lr = (unsigned long)ksig->ka.sa.sa_restorer;
/* Set up registers for signal handler */
regs->spu = (unsigned long)frame;
regs->r0 = signal; /* Arg for signal handler */
regs->r1 = (unsigned long)&frame->info;
regs->r2 = (unsigned long)&frame->uc;
- regs->bpc = (unsigned long)ka->sa.sa_handler;
+ regs->bpc = (unsigned long)ksig->ka.sa.sa_handler;
set_fs(USER_DS);
@@ -228,10 +228,6 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
#endif
return 0;
-
-give_sigsegv:
- force_sigsegv(sig, current);
- return -EFAULT;
}
static int prev_insn(struct pt_regs *regs)
@@ -252,9 +248,10 @@ static int prev_insn(struct pt_regs *regs)
*/
static void
-handle_signal(unsigned long sig, struct k_sigaction *ka, siginfo_t *info,
- struct pt_regs *regs)
+handle_signal(struct ksignal *ksig, struct pt_regs *regs)
{
+ int ret;
+
/* Are we from a system call? */
if (regs->syscall_nr >= 0) {
/* If so, check system call restarting.. */
@@ -265,7 +262,7 @@ handle_signal(unsigned long sig, struct k_sigaction *ka, siginfo_t *info,
break;
case -ERESTARTSYS:
- if (!(ka->sa.sa_flags & SA_RESTART)) {
+ if (!(ksig->ka.sa.sa_flags & SA_RESTART)) {
regs->r0 = -EINTR;
break;
}
@@ -278,10 +275,9 @@ handle_signal(unsigned long sig, struct k_sigaction *ka, siginfo_t *info,
}
/* Set up the stack frame */
- if (setup_rt_frame(sig, ka, info, sigmask_to_save(), regs))
- return;
+ ret = setup_rt_frame(ksig, sigmask_to_save(), regs);
- signal_delivered(sig, info, ka, regs, 0);
+ signal_setup_done(ret, ksig, 0);
}
/*
@@ -291,9 +287,7 @@ handle_signal(unsigned long sig, struct k_sigaction *ka, siginfo_t *info,
*/
static void do_signal(struct pt_regs *regs)
{
- siginfo_t info;
- int signr;
- struct k_sigaction ka;
+ struct ksignal ksig;
/*
* We want the common case to go fast, which
@@ -304,8 +298,7 @@ static void do_signal(struct pt_regs *regs)
if (!user_mode(regs))
return;
- signr = get_signal_to_deliver(&info, &ka, regs, NULL);
- if (signr > 0) {
+ if (get_signal(&ksig)) {
/* Re-enable any watchpoints before delivering the
* signal to user space. The processor register will
* have been cleared if the watchpoint triggered
@@ -313,7 +306,7 @@ static void do_signal(struct pt_regs *regs)
*/
/* Whee! Actually deliver the signal. */
- handle_signal(signr, &ka, &info, regs);
+ handle_signal(&ksig, regs);
return;
}
--
1.8.1.4
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 12/29] m68k: Use get_signal() signal_setup_done()
2013-10-08 11:33 [PATCH 10/29] ia64: Use get_signal() signal_setup_done() Richard Weinberger
2013-10-08 11:33 ` [PATCH 11/29] m32r: " Richard Weinberger
@ 2013-10-08 11:33 ` Richard Weinberger
2013-10-08 11:33 ` [PATCH 13/29] metag: " Richard Weinberger
` (2 subsequent siblings)
4 siblings, 0 replies; 9+ messages in thread
From: Richard Weinberger @ 2013-10-08 11:33 UTC (permalink / raw)
To: linux-kernel
Cc: linux-arch, viro, vgupta, catalin.marinas, will.deacon,
hskinnemoen, egtvedt, vapier, msalter, a-jacquiot, starvik,
jesper.nilsson, dhowells, rkuo, tony.luck, fenghua.yu, takata,
geert, james.hogan, monstr, yasutake.koichi, ralf, jonas, jejb,
deller, benh, paulus, schwidefsky, heiko.carstens, liqin.linux,
lennox.wu, lethal, cmetcalf, gxt, linux-xtensa, akpm, oleg, tj,
Richard Weinberger
Use the more generic functions get_signal() signal_setup_done()
for signal delivery.
Signed-off-by: Richard Weinberger <richard@nod.at>
---
arch/m68k/kernel/signal.c | 63 ++++++++++++++++++-----------------------------
1 file changed, 24 insertions(+), 39 deletions(-)
diff --git a/arch/m68k/kernel/signal.c b/arch/m68k/kernel/signal.c
index 57fd286..c8e6fa8 100644
--- a/arch/m68k/kernel/signal.c
+++ b/arch/m68k/kernel/signal.c
@@ -850,23 +850,23 @@ get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, size_t frame_size)
return (void __user *)((usp - frame_size) & -8UL);
}
-static int setup_frame (int sig, struct k_sigaction *ka,
- sigset_t *set, struct pt_regs *regs)
+static int setup_frame(struct ksignal *ksig, sigset_t *set,
+ struct pt_regs *regs)
{
struct sigframe __user *frame;
int fsize = frame_extra_sizes(regs->format);
struct sigcontext context;
- int err = 0;
+ int err = 0, sig = ksig->sig;
if (fsize < 0) {
#ifdef DEBUG
printk ("setup_frame: Unknown frame format %#x\n",
regs->format);
#endif
- goto give_sigsegv;
+ return -EFAULT;
}
- frame = get_sigframe(ka, regs, sizeof(*frame) + fsize);
+ frame = get_sigframe(&ksig->ka, regs, sizeof(*frame) + fsize);
if (fsize)
err |= copy_to_user (frame + 1, regs + 1, fsize);
@@ -899,7 +899,7 @@ static int setup_frame (int sig, struct k_sigaction *ka,
#endif
if (err)
- goto give_sigsegv;
+ return -EFAULT;
push_cache ((unsigned long) &frame->retcode);
@@ -908,7 +908,7 @@ static int setup_frame (int sig, struct k_sigaction *ka,
* to destroy is successfully copied to sigframe.
*/
wrusp ((unsigned long) frame);
- regs->pc = (unsigned long) ka->sa.sa_handler;
+ regs->pc = (unsigned long) ksig->ka.sa.sa_handler;
adjustformat(regs);
/*
@@ -934,28 +934,24 @@ static int setup_frame (int sig, struct k_sigaction *ka,
tregs->sr = regs->sr;
}
return 0;
-
-give_sigsegv:
- force_sigsegv(sig, current);
- return err;
}
-static int setup_rt_frame (int sig, struct k_sigaction *ka, siginfo_t *info,
- sigset_t *set, struct pt_regs *regs)
+static int setup_rt_frame(struct ksignal *ksig, sigset_t *set,
+ struct pt_regs *regs)
{
struct rt_sigframe __user *frame;
int fsize = frame_extra_sizes(regs->format);
- int err = 0;
+ int err = 0, sig = ksig->sig;
if (fsize < 0) {
#ifdef DEBUG
printk ("setup_frame: Unknown frame format %#x\n",
regs->format);
#endif
- goto give_sigsegv;
+ return -EFAULT;
}
- frame = get_sigframe(ka, regs, sizeof(*frame));
+ frame = get_sigframe(&ksig->ka, regs, sizeof(*frame));
if (fsize)
err |= copy_to_user (&frame->uc.uc_extra, regs + 1, fsize);
@@ -968,7 +964,7 @@ static int setup_rt_frame (int sig, struct k_sigaction *ka, siginfo_t *info,
&frame->sig);
err |= __put_user(&frame->info, &frame->pinfo);
err |= __put_user(&frame->uc, &frame->puc);
- err |= copy_siginfo_to_user(&frame->info, info);
+ err |= copy_siginfo_to_user(&frame->info, &ksig->info);
/* Create the ucontext. */
err |= __put_user(0, &frame->uc.uc_flags);
@@ -996,7 +992,7 @@ static int setup_rt_frame (int sig, struct k_sigaction *ka, siginfo_t *info,
#endif /* CONFIG_MMU */
if (err)
- goto give_sigsegv;
+ return -EFAULT;
push_cache ((unsigned long) &frame->retcode);
@@ -1005,7 +1001,7 @@ static int setup_rt_frame (int sig, struct k_sigaction *ka, siginfo_t *info,
* to destroy is successfully copied to sigframe.
*/
wrusp ((unsigned long) frame);
- regs->pc = (unsigned long) ka->sa.sa_handler;
+ regs->pc = (unsigned long) ksig->ka.sa.sa_handler;
adjustformat(regs);
/*
@@ -1031,10 +1027,6 @@ static int setup_rt_frame (int sig, struct k_sigaction *ka, siginfo_t *info,
tregs->sr = regs->sr;
}
return 0;
-
-give_sigsegv:
- force_sigsegv(sig, current);
- return err;
}
static inline void
@@ -1074,26 +1066,22 @@ handle_restart(struct pt_regs *regs, struct k_sigaction *ka, int has_handler)
* OK, we're invoking a handler
*/
static void
-handle_signal(int sig, struct k_sigaction *ka, siginfo_t *info,
- struct pt_regs *regs)
+handle_signal(struct ksignal *ksig, struct pt_regs *regs)
{
sigset_t *oldset = sigmask_to_save();
int err;
/* are we from a system call? */
if (regs->orig_d0 >= 0)
/* If so, check system call restarting.. */
- handle_restart(regs, ka, 1);
+ handle_restart(regs, &ksig->ka, 1);
/* set up the stack frame */
- if (ka->sa.sa_flags & SA_SIGINFO)
- err = setup_rt_frame(sig, ka, info, oldset, regs);
+ if (ksig->ka.sa.sa_flags & SA_SIGINFO)
+ err = setup_rt_frame(ksig, oldset, regs);
else
- err = setup_frame(sig, ka, oldset, regs);
-
- if (err)
- return;
+ err = setup_frame(ksig, oldset, regs);
- signal_delivered(sig, info, ka, regs, 0);
+ signal_setup_done(err, ksig, 0);
if (test_thread_flag(TIF_DELAYED_TRACE)) {
regs->sr &= ~0x8000;
@@ -1108,16 +1096,13 @@ handle_signal(int sig, struct k_sigaction *ka, siginfo_t *info,
*/
static void do_signal(struct pt_regs *regs)
{
- siginfo_t info;
- struct k_sigaction ka;
- int signr;
+ struct ksignal ksig;
current->thread.esp0 = (unsigned long) regs;
- signr = get_signal_to_deliver(&info, &ka, regs, NULL);
- if (signr > 0) {
+ if (get_signal(&ksig)) {
/* Whee! Actually deliver the signal. */
- handle_signal(signr, &ka, &info, regs);
+ handle_signal(&ksig, regs);
return;
}
--
1.8.1.4
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 13/29] metag: Use get_signal() signal_setup_done()
2013-10-08 11:33 [PATCH 10/29] ia64: Use get_signal() signal_setup_done() Richard Weinberger
2013-10-08 11:33 ` [PATCH 11/29] m32r: " Richard Weinberger
2013-10-08 11:33 ` [PATCH 12/29] m68k: " Richard Weinberger
@ 2013-10-08 11:33 ` Richard Weinberger
2013-10-09 11:09 ` James Hogan
2013-10-08 11:33 ` [PATCH 14/29] microblaze: " Richard Weinberger
2013-10-08 16:49 ` [PATCH 10/29] ia64: " Richard Weinberger
4 siblings, 1 reply; 9+ messages in thread
From: Richard Weinberger @ 2013-10-08 11:33 UTC (permalink / raw)
To: linux-kernel
Cc: linux-arch, viro, vgupta, catalin.marinas, will.deacon,
hskinnemoen, egtvedt, vapier, msalter, a-jacquiot, starvik,
jesper.nilsson, dhowells, rkuo, tony.luck, fenghua.yu, takata,
geert, james.hogan, monstr, yasutake.koichi, ralf, jonas, jejb,
deller, benh, paulus, schwidefsky, heiko.carstens, liqin.linux,
lennox.wu, lethal, cmetcalf, gxt, linux-xtensa, akpm, oleg, tj,
Richard Weinberger
Use the more generic functions get_signal() signal_setup_done()
for signal delivery.
Signed-off-by: Richard Weinberger <richard@nod.at>
---
arch/metag/kernel/signal.c | 55 ++++++++++++++++++++--------------------------
1 file changed, 24 insertions(+), 31 deletions(-)
diff --git a/arch/metag/kernel/signal.c b/arch/metag/kernel/signal.c
index 3be61cf..9fa27c2 100644
--- a/arch/metag/kernel/signal.c
+++ b/arch/metag/kernel/signal.c
@@ -152,18 +152,18 @@ static void __user *get_sigframe(struct k_sigaction *ka, unsigned long sp,
return (void __user *)sp;
}
-static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
- sigset_t *set, struct pt_regs *regs)
+static int setup_rt_frame(struct ksignal *ksig, sigset_t *set,
+ struct pt_regs *regs)
{
struct rt_sigframe __user *frame;
- int err = -EFAULT;
+ int err;
unsigned long code;
- frame = get_sigframe(ka, regs->REG_SP, sizeof(*frame));
+ frame = get_sigframe(&ksig->ka, regs->REG_SP, sizeof(*frame));
if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
- goto out;
+ return -EFAULT;
- err = copy_siginfo_to_user(&frame->info, info);
+ err = copy_siginfo_to_user(&frame->info, &ksig->info);
/* Create the ucontext. */
err |= __put_user(0, &frame->uc.uc_flags);
@@ -174,7 +174,7 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
err |= __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set));
if (err)
- goto out;
+ return -EFAULT;
/* Set up to return from userspace. */
@@ -187,15 +187,15 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
err |= __put_user(code, (unsigned long __user *)(&frame->retcode[1]));
if (err)
- goto out;
+ return -EFAULT;
/* Set up registers for signal handler */
regs->REG_RTP = (unsigned long) frame->retcode;
regs->REG_SP = (unsigned long) frame + sizeof(*frame);
- regs->REG_ARG1 = sig;
+ regs->REG_ARG1 = ksig->sig;
regs->REG_ARG2 = (unsigned long) &frame->info;
regs->REG_ARG3 = (unsigned long) &frame->uc;
- regs->REG_PC = (unsigned long) ka->sa.sa_handler;
+ regs->REG_PC = (unsigned long) ksig->ka.sa.sa_handler;
pr_debug("SIG deliver (%s:%d): sp=%p pc=%08x pr=%08x\n",
current->comm, current->pid, frame, regs->REG_PC,
@@ -205,24 +205,19 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
* effective cache flush - directed rather than 'full flush'.
*/
flush_cache_sigtramp(regs->REG_RTP, sizeof(frame->retcode));
-out:
- if (err) {
- force_sigsegv(sig, current);
- return -EFAULT;
- }
+
return 0;
}
-static void handle_signal(unsigned long sig, siginfo_t *info,
- struct k_sigaction *ka, struct pt_regs *regs)
+static void handle_signal(struct ksignal *ksig, struct pt_regs *regs)
{
sigset_t *oldset = sigmask_to_save();
+ int ret;
/* Set up the stack frame */
- if (setup_rt_frame(sig, ka, info, oldset, regs))
- return;
+ ret = setup_rt_frame(ksig, oldset, regs);
- signal_delivered(sig, info, ka, regs, test_thread_flag(TIF_SINGLESTEP));
+ signal_setup_done(ret, ksig, test_thread_flag(TIF_SINGLESTEP));
}
/*
@@ -235,10 +230,8 @@ static void handle_signal(unsigned long sig, siginfo_t *info,
static int do_signal(struct pt_regs *regs, int syscall)
{
unsigned int retval = 0, continue_addr = 0, restart_addr = 0;
- struct k_sigaction ka;
- siginfo_t info;
- int signr;
int restart = 0;
+ struct ksignal ksig;
/*
* By the end of rt_sigreturn the context describes the point that the
@@ -272,30 +265,30 @@ static int do_signal(struct pt_regs *regs, int syscall)
}
/*
- * Get the signal to deliver. When running under ptrace, at this point
- * the debugger may change all our registers ...
- */
- signr = get_signal_to_deliver(&info, &ka, regs, NULL);
- /*
* Depending on the signal settings we may need to revert the decision
* to restart the system call. But skip this if a debugger has chosen to
* restart at a different PC.
*/
if (regs->REG_PC != restart_addr)
restart = 0;
- if (signr > 0) {
+
+ /*
+ * Get the signal to deliver. When running under ptrace, at this point
+ * the debugger may change all our registers ...
+ */
+ if (get_signal(&ksig)) {
if (unlikely(restart)) {
if (retval == -ERESTARTNOHAND
|| retval == -ERESTART_RESTARTBLOCK
|| (retval == -ERESTARTSYS
- && !(ka.sa.sa_flags & SA_RESTART))) {
+ && !(ksig.ka.sa.sa_flags & SA_RESTART))) {
regs->REG_RETVAL = -EINTR;
regs->REG_PC = continue_addr;
}
}
/* Whee! Actually deliver the signal. */
- handle_signal(signr, &info, &ka, regs);
+ handle_signal(&ksig, regs);
return 0;
}
--
1.8.1.4
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 14/29] microblaze: Use get_signal() signal_setup_done()
2013-10-08 11:33 [PATCH 10/29] ia64: Use get_signal() signal_setup_done() Richard Weinberger
` (2 preceding siblings ...)
2013-10-08 11:33 ` [PATCH 13/29] metag: " Richard Weinberger
@ 2013-10-08 11:33 ` Richard Weinberger
2013-10-08 16:49 ` [PATCH 10/29] ia64: " Richard Weinberger
4 siblings, 0 replies; 9+ messages in thread
From: Richard Weinberger @ 2013-10-08 11:33 UTC (permalink / raw)
To: linux-kernel
Cc: linux-arch, viro, vgupta, catalin.marinas, will.deacon,
hskinnemoen, egtvedt, vapier, msalter, a-jacquiot, starvik,
jesper.nilsson, dhowells, rkuo, tony.luck, fenghua.yu, takata,
geert, james.hogan, monstr, yasutake.koichi, ralf, jonas, jejb,
deller, benh, paulus, schwidefsky, heiko.carstens, liqin.linux,
lennox.wu, lethal, cmetcalf, gxt, linux-xtensa, akpm, oleg, tj,
Richard Weinberger
Use the more generic functions get_signal() signal_setup_done()
for signal delivery.
Signed-off-by: Richard Weinberger <richard@nod.at>
---
arch/microblaze/kernel/signal.c | 48 +++++++++++++++--------------------------
1 file changed, 17 insertions(+), 31 deletions(-)
diff --git a/arch/microblaze/kernel/signal.c b/arch/microblaze/kernel/signal.c
index d26d7e7..a34da52 100644
--- a/arch/microblaze/kernel/signal.c
+++ b/arch/microblaze/kernel/signal.c
@@ -156,11 +156,11 @@ get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, size_t frame_size)
return (void __user *)((sp - frame_size) & -8UL);
}
-static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
- sigset_t *set, struct pt_regs *regs)
+static int setup_rt_frame(struct ksignal *ksig, sigset_t *set,
+ struct pt_regs *regs)
{
struct rt_sigframe __user *frame;
- int err = 0;
+ int err = 0, sig = ksig->sig;
int signal;
unsigned long address = 0;
#ifdef CONFIG_MMU
@@ -168,10 +168,10 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
pte_t *ptep;
#endif
- frame = get_sigframe(ka, regs, sizeof(*frame));
+ frame = get_sigframe(&ksig->ka, regs, sizeof(*frame));
if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
- goto give_sigsegv;
+ return -EFAULT;
signal = current_thread_info()->exec_domain
&& current_thread_info()->exec_domain->signal_invmap
@@ -179,8 +179,8 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
? current_thread_info()->exec_domain->signal_invmap[sig]
: sig;
- if (info)
- err |= copy_siginfo_to_user(&frame->info, info);
+ if (ksig->ka.sa.sa_flags & SA_SIGINFO)
+ err |= copy_siginfo_to_user(&frame->info, &ksig->info);
/* Create the ucontext. */
err |= __put_user(0, &frame->uc.uc_flags);
@@ -227,7 +227,7 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
flush_dcache_range(address, address + 8);
#endif
if (err)
- goto give_sigsegv;
+ return -EFAULT;
/* Set up registers for signal handler */
regs->r1 = (unsigned long) frame;
@@ -237,7 +237,7 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
regs->r6 = (unsigned long) &frame->info; /* arg 1: siginfo */
regs->r7 = (unsigned long) &frame->uc; /* arg2: ucontext */
/* Offset to handle microblaze rtid r14, 0 */
- regs->pc = (unsigned long)ka->sa.sa_handler;
+ regs->pc = (unsigned long)ksig->ka.sa.sa_handler;
set_fs(USER_DS);
@@ -247,10 +247,6 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
#endif
return 0;
-
-give_sigsegv:
- force_sigsegv(sig, current);
- return -EFAULT;
}
/* Handle restarting system calls */
@@ -283,23 +279,15 @@ do_restart:
*/
static void
-handle_signal(unsigned long sig, struct k_sigaction *ka,
- siginfo_t *info, struct pt_regs *regs)
+handle_signal(struct ksignal *ksig, struct pt_regs *regs)
{
sigset_t *oldset = sigmask_to_save();
int ret;
/* Set up the stack frame */
- if (ka->sa.sa_flags & SA_SIGINFO)
- ret = setup_rt_frame(sig, ka, info, oldset, regs);
- else
- ret = setup_rt_frame(sig, ka, NULL, oldset, regs);
+ ret = setup_rt_frame(ksig, oldset, regs);
- if (ret)
- return;
-
- signal_delivered(sig, info, ka, regs,
- test_thread_flag(TIF_SINGLESTEP));
+ signal_setup_done(ret, ksig, test_thread_flag(TIF_SINGLESTEP));
}
/*
@@ -313,21 +301,19 @@ handle_signal(unsigned long sig, struct k_sigaction *ka,
*/
static void do_signal(struct pt_regs *regs, int in_syscall)
{
- siginfo_t info;
- int signr;
- struct k_sigaction ka;
+ struct ksignal ksig;
+
#ifdef DEBUG_SIG
pr_info("do signal: %p %d\n", regs, in_syscall);
pr_info("do signal2: %lx %lx %ld [%lx]\n", regs->pc, regs->r1,
regs->r12, current_thread_info()->flags);
#endif
- signr = get_signal_to_deliver(&info, &ka, regs, NULL);
- if (signr > 0) {
+ if (get_signal(&ksig)) {
/* Whee! Actually deliver the signal. */
if (in_syscall)
- handle_restart(regs, &ka, 1);
- handle_signal(signr, &ka, &info, regs);
+ handle_restart(regs, &ksig.ka, 1);
+ handle_signal(&ksig, regs);
return;
}
--
1.8.1.4
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH 10/29] ia64: Use get_signal() signal_setup_done()
2013-10-08 11:33 [PATCH 10/29] ia64: Use get_signal() signal_setup_done() Richard Weinberger
` (3 preceding siblings ...)
2013-10-08 11:33 ` [PATCH 14/29] microblaze: " Richard Weinberger
@ 2013-10-08 16:49 ` Richard Weinberger
4 siblings, 0 replies; 9+ messages in thread
From: Richard Weinberger @ 2013-10-08 16:49 UTC (permalink / raw)
To: Richard Weinberger
Cc: linux-kernel, linux-arch, viro, vgupta, catalin.marinas,
will.deacon, hskinnemoen, egtvedt, vapier, msalter, a-jacquiot,
starvik, jesper.nilsson, dhowells, rkuo, tony.luck, fenghua.yu,
takata, geert, james.hogan, monstr, yasutake.koichi, ralf, jonas,
jejb, deller, benh, paulus, schwidefsky, heiko.carstens,
liqin.linux, lennox.wu, lethal, cmetcalf, gxt, linux-xtensa,
akpm, oleg, tj
Am 08.10.2013 13:33, schrieb Richard Weinberger:
> Use the more generic functions get_signal() signal_setup_done()
> for signal delivery.
> This inverts also the return codes of force_sigsegv_info()
> and setup_frame() to follow the kernel convention.
>
> Signed-off-by: Richard Weinberger <richard@nod.at>
This one does not build, the patch is corrupted.
An updated version will be in v2.
Reported-by: kbuild test robot <fengguang.wu@intel.com>
Thanks,
//richard
> ---
> arch/ia64/kernel/signal.c | 42 +++++++++++++++++++-----------------------
> 1 file changed, 19 insertions(+), 23 deletions(-)
>
> diff --git a/arch/ia64/kernel/signal.c b/arch/ia64/kernel/signal.c
> index 3637e03..b995dbf 100644
> --- a/arch/ia64/kernel/signal.c
> +++ b/arch/ia64/kernel/signal.c
> @@ -309,12 +309,11 @@ force_sigsegv_info (int sig, void __user *addr)
> si.si_uid = from_kuid_munged(current_user_ns(), current_uid());
> si.si_addr = addr;
> force_sig_info(SIGSEGV, &si, current);
> - return 0;
> + return 1;
> }
>
> static long
> -setup_frame (int sig, struct k_sigaction *ka, siginfo_t *info, sigset_t *set,
> - struct sigscratch *scr)
> +setup_frame(struct ksignal *ksig, sigset_t *set, struct sigscratch *scr)
> {
> extern char __kernel_sigtramp[];
> unsigned long tramp_addr, new_rbs = 0, new_sp;
> @@ -323,7 +322,7 @@ setup_frame (int sig, struct k_sigaction *ka, siginfo_t *info, sigset_t *set,
>
> new_sp = scr->pt.r12;
> tramp_addr = (unsigned long) __kernel_sigtramp;
> - if (ka->sa.sa_flags & SA_ONSTACK) {
> + if (ksig->ka.sa.sa_flags & SA_ONSTACK) {
> int onstack = sas_ss_flags(new_sp);
>
> if (onstack == 0) {
> @@ -347,7 +346,7 @@ setup_frame (int sig, struct k_sigaction *ka, siginfo_t *info, sigset_t *set,
> */
> check_sp = (new_sp - sizeof(*frame)) & -STACK_ALIGN;
> if (!likely(on_sig_stack(check_sp)))
> - return force_sigsegv_info(sig, (void __user *)
> + return force_sigsegv_info(ksig->sig, (void __user *)
> check_sp);
> }
> }
> @@ -356,14 +355,14 @@ setup_frame (int sig, struct k_sigaction *ka, siginfo_t *info, sigset_t *set,
> if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
> return force_sigsegv_info(sig, frame);
>
> - err = __put_user(sig, &frame->arg0);
> + err = __put_user(ksig->sig, &frame->arg0);
> err |= __put_user(&frame->info, &frame->arg1);
> err |= __put_user(&frame->sc, &frame->arg2);
> err |= __put_user(new_rbs, &frame->sc.sc_rbs_base);
> err |= __put_user(0, &frame->sc.sc_loadrs); /* initialize to zero */
> - err |= __put_user(ka->sa.sa_handler, &frame->handler);
> + err |= __put_user(ksig->ka.sa.sa_handler, &frame->handler);
>
> - err |= copy_siginfo_to_user(&frame->info, info);
> + err |= copy_siginfo_to_user(&frame->info, &ksig->info);
>
> err |= __save_altstack(&frame->sc.sc_stack, scr->pt.r12);
> err |= setup_sigcontext(&frame->sc, set, scr);
> @@ -394,22 +393,20 @@ setup_frame (int sig, struct k_sigaction *ka, siginfo_t *info, sigset_t *set,
>
> #if DEBUG_SIG
> printk("SIG deliver (%s:%d): sig=%d sp=%lx ip=%lx handler=%p\n",
> - current->comm, current->pid, sig, scr->pt.r12, frame->sc.sc_ip, frame->handler);
> + current->comm, current->pid, ksig->sig, scr->pt.r12, frame->sc.sc_ip, frame->handler);
> #endif
> - return 1;
> + return 0;
> }
>
> static long
> -handle_signal (unsigned long sig, struct k_sigaction *ka, siginfo_t *info,
> - struct sigscratch *scr)
> +handle_signal (struct ksignal *ksig, struct sigscratch *scr)
> {
> - if (!setup_frame(sig, ka, info, sigmask_to_save(), scr))
> - return 0;
> + int ret = setup_frame(ksig, sigmask_to_save(), scr);
>
> - signal_delivered(sig, info, ka, &scr->pt,
> - test_thread_flag(TIF_SINGLESTEP));
> + if (!ret)
> + signal_setup_done(ret, ksig, test_thread_flag(TIF_SINGLESTEP));
>
> - return 1;
> + return ret;
> }
>
> /*
> @@ -419,17 +416,16 @@ handle_signal (unsigned long sig, struct k_sigaction *ka, siginfo_t *info,
> void
> ia64_do_signal (struct sigscratch *scr, long in_syscall)
> {
> - struct k_sigaction ka;
> - siginfo_t info;
> long restart = in_syscall;
> long errno = scr->pt.r8;
> + struct ksignal ksig;
>
> /*
> * This only loops in the rare cases of handle_signal() failing, in which case we
> * need to push through a forced SIGSEGV.
> */
> while (1) {
> - int signr = get_signal_to_deliver(&info, &ka, &scr->pt, NULL);
> + get_signal(&ksig);
>
> /*
> * get_signal_to_deliver() may have run a debugger (via notify_parent())
> @@ -446,7 +442,7 @@ ia64_do_signal (struct sigscratch *scr, long in_syscall)
> */
> restart = 0;
>
> - if (signr <= 0)
> + if (ksig.sig <= 0)
> break;
>
> if (unlikely(restart)) {
> @@ -458,7 +454,7 @@ ia64_do_signal (struct sigscratch *scr, long in_syscall)
> break;
>
> case ERESTARTSYS:
> - if ((ka.sa.sa_flags & SA_RESTART) == 0) {
> + if ((ksig.ka.sa.sa_flags & SA_RESTART) == 0) {
> scr->pt.r8 = EINTR;
> /* note: scr->pt.r10 is already -1 */
> break;
> @@ -473,7 +469,7 @@ ia64_do_signal (struct sigscratch *scr, long in_syscall)
> * Whee! Actually deliver the signal. If the delivery failed, we need to
> * continue to iterate in this loop so we can deliver the SIGSEGV...
> */
> - if (handle_signal(signr, &ka, &info, scr))
> + if (handle_signal(&ksig, scr))
> return;
> }
>
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 13/29] metag: Use get_signal() signal_setup_done()
2013-10-08 11:33 ` [PATCH 13/29] metag: " Richard Weinberger
2013-10-09 11:09 ` James Hogan
@ 2013-10-09 11:09 ` James Hogan
0 siblings, 0 replies; 9+ messages in thread
From: James Hogan @ 2013-10-09 11:09 UTC (permalink / raw)
To: Richard Weinberger
Cc: linux-kernel, linux-arch, viro, vgupta, catalin.marinas,
will.deacon, hskinnemoen, egtvedt, vapier, msalter, a-jacquiot,
starvik, jesper.nilsson, dhowells, rkuo, tony.luck, fenghua.yu,
takata, geert, monstr, yasutake.koichi, ralf, jonas, jejb,
deller, benh, paulus, schwidefsky, heiko.carstens, liqin.linux,
lennox.wu, lethal, cmetcalf, gxt, linux-xtensa, akpm, oleg, tj,
linux-metag
[-- Attachment #1: Type: text/plain, Size: 7727 bytes --]
Hi Richard,
(cc'd linux-metag)
On 08/10/13 12:33, Richard Weinberger wrote:
> Use the more generic functions get_signal() signal_setup_done()
> for signal delivery.
>
> Signed-off-by: Richard Weinberger <richard@nod.at>
> ---
> arch/metag/kernel/signal.c | 55 ++++++++++++++++++++--------------------------
> 1 file changed, 24 insertions(+), 31 deletions(-)
>
> diff --git a/arch/metag/kernel/signal.c b/arch/metag/kernel/signal.c
> index 3be61cf..9fa27c2 100644
> --- a/arch/metag/kernel/signal.c
> +++ b/arch/metag/kernel/signal.c
> @@ -152,18 +152,18 @@ static void __user *get_sigframe(struct k_sigaction *ka, unsigned long sp,
> return (void __user *)sp;
> }
>
> -static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
> - sigset_t *set, struct pt_regs *regs)
> +static int setup_rt_frame(struct ksignal *ksig, sigset_t *set,
> + struct pt_regs *regs)
> {
> struct rt_sigframe __user *frame;
> - int err = -EFAULT;
> + int err;
> unsigned long code;
>
> - frame = get_sigframe(ka, regs->REG_SP, sizeof(*frame));
> + frame = get_sigframe(&ksig->ka, regs->REG_SP, sizeof(*frame));
> if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
> - goto out;
> + return -EFAULT;
>
> - err = copy_siginfo_to_user(&frame->info, info);
> + err = copy_siginfo_to_user(&frame->info, &ksig->info);
>
> /* Create the ucontext. */
> err |= __put_user(0, &frame->uc.uc_flags);
> @@ -174,7 +174,7 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
> err |= __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set));
>
> if (err)
> - goto out;
> + return -EFAULT;
>
> /* Set up to return from userspace. */
>
> @@ -187,15 +187,15 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
> err |= __put_user(code, (unsigned long __user *)(&frame->retcode[1]));
>
> if (err)
> - goto out;
> + return -EFAULT;
>
> /* Set up registers for signal handler */
> regs->REG_RTP = (unsigned long) frame->retcode;
> regs->REG_SP = (unsigned long) frame + sizeof(*frame);
> - regs->REG_ARG1 = sig;
> + regs->REG_ARG1 = ksig->sig;
> regs->REG_ARG2 = (unsigned long) &frame->info;
> regs->REG_ARG3 = (unsigned long) &frame->uc;
> - regs->REG_PC = (unsigned long) ka->sa.sa_handler;
> + regs->REG_PC = (unsigned long) ksig->ka.sa.sa_handler;
>
> pr_debug("SIG deliver (%s:%d): sp=%p pc=%08x pr=%08x\n",
> current->comm, current->pid, frame, regs->REG_PC,
> @@ -205,24 +205,19 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
> * effective cache flush - directed rather than 'full flush'.
> */
> flush_cache_sigtramp(regs->REG_RTP, sizeof(frame->retcode));
> -out:
> - if (err) {
> - force_sigsegv(sig, current);
> - return -EFAULT;
> - }
> +
> return 0;
> }
>
> -static void handle_signal(unsigned long sig, siginfo_t *info,
> - struct k_sigaction *ka, struct pt_regs *regs)
> +static void handle_signal(struct ksignal *ksig, struct pt_regs *regs)
> {
> sigset_t *oldset = sigmask_to_save();
> + int ret;
>
> /* Set up the stack frame */
> - if (setup_rt_frame(sig, ka, info, oldset, regs))
> - return;
> + ret = setup_rt_frame(ksig, oldset, regs);
>
> - signal_delivered(sig, info, ka, regs, test_thread_flag(TIF_SINGLESTEP));
> + signal_setup_done(ret, ksig, test_thread_flag(TIF_SINGLESTEP));
> }
>
> /*
> @@ -235,10 +230,8 @@ static void handle_signal(unsigned long sig, siginfo_t *info,
> static int do_signal(struct pt_regs *regs, int syscall)
> {
> unsigned int retval = 0, continue_addr = 0, restart_addr = 0;
> - struct k_sigaction ka;
> - siginfo_t info;
> - int signr;
> int restart = 0;
> + struct ksignal ksig;
>
> /*
> * By the end of rt_sigreturn the context describes the point that the
> @@ -272,30 +265,30 @@ static int do_signal(struct pt_regs *regs, int syscall)
> }
>
> /*
> - * Get the signal to deliver. When running under ptrace, at this point
> - * the debugger may change all our registers ...
> - */
> - signr = get_signal_to_deliver(&info, &ka, regs, NULL);
> - /*
> * Depending on the signal settings we may need to revert the decision
> * to restart the system call. But skip this if a debugger has chosen to
> * restart at a different PC.
> */
> if (regs->REG_PC != restart_addr)
> restart = 0;
You've reordered the point where a ptrace debugger can change the registers
(get_signal_to_deliver) and the check of whether the PC has been changed by
the debugger (REG_PC != restart_addr).
I suggest this is changed to do something like 7e243643 (arm: switch to struct
ksignal * passing) does, moving the above REG_PC != restart_addr check into
the restart conditions below.
> - if (signr > 0) {
> +
> + /*
> + * Get the signal to deliver. When running under ptrace, at this point
> + * the debugger may change all our registers ...
> + */
> + if (get_signal(&ksig)) {
> if (unlikely(restart)) {
> if (retval == -ERESTARTNOHAND
> || retval == -ERESTART_RESTARTBLOCK
> || (retval == -ERESTARTSYS
> - && !(ka.sa.sa_flags & SA_RESTART))) {
> + && !(ksig.ka.sa.sa_flags & SA_RESTART))) {
> regs->REG_RETVAL = -EINTR;
> regs->REG_PC = continue_addr;
> }
> }
>
> /* Whee! Actually deliver the signal. */
> - handle_signal(signr, &info, &ka, regs);
> + handle_signal(&ksig, regs);
> return 0;
> }
>
>
How does the fixup patch below look?
The rest looks good, so other than that problem:
Acked-by: James Hogan <james.hogan@imgtec.com>
Thanks
James
diff --git a/arch/metag/kernel/signal.c b/arch/metag/kernel/signal.c
index 9fa27c2..6f64ea2 100644
--- a/arch/metag/kernel/signal.c
+++ b/arch/metag/kernel/signal.c
@@ -265,19 +265,16 @@ static int do_signal(struct pt_regs *regs, int syscall)
}
/*
+ * Get the signal to deliver. When running under ptrace, at this point
+ * the debugger may change all our registers ...
+ *
* Depending on the signal settings we may need to revert the decision
* to restart the system call. But skip this if a debugger has chosen to
* restart at a different PC.
*/
- if (regs->REG_PC != restart_addr)
- restart = 0;
-
- /*
- * Get the signal to deliver. When running under ptrace, at this point
- * the debugger may change all our registers ...
- */
if (get_signal(&ksig)) {
- if (unlikely(restart)) {
+ /* Handler */
+ if (unlikely(restart) && regs->REG_PC == restart_addr) {
if (retval == -ERESTARTNOHAND
|| retval == -ERESTART_RESTARTBLOCK
|| (retval == -ERESTARTSYS
@@ -289,19 +286,24 @@ static int do_signal(struct pt_regs *regs, int syscall)
/* Whee! Actually deliver the signal. */
handle_signal(&ksig, regs);
- return 0;
- }
-
- /* Handlerless -ERESTART_RESTARTBLOCK re-enters via restart_syscall */
- if (unlikely(restart < 0))
- regs->REG_SYSCALL = __NR_restart_syscall;
-
- /*
- * If there's no signal to deliver, we just put the saved sigmask back.
- */
- restore_saved_sigmask();
+ } else {
+ /*
+ * If there's no signal to deliver, we just put the saved
+ * sigmask back.
+ */
+ restore_saved_sigmask();
- return restart;
+ /*
+ * Handlerless -ERESTART_RESTARTBLOCK re-enters via
+ * restart_syscall
+ */
+ if (unlikely(restart) && regs->REG_PC == restart_addr) {
+ if (restart < 0)
+ regs->REG_SYSCALL = __NR_restart_syscall;
+ return restart;
+ }
+ }
+ return 0;
}
int do_work_pending(struct pt_regs *regs, unsigned int thread_flags,
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH 13/29] metag: Use get_signal() signal_setup_done()
@ 2013-10-09 11:09 ` James Hogan
0 siblings, 0 replies; 9+ messages in thread
From: James Hogan @ 2013-10-09 11:09 UTC (permalink / raw)
To: Richard Weinberger
Cc: linux-kernel, linux-arch, viro, vgupta, catalin.marinas,
will.deacon, hskinnemoen, egtvedt, vapier, msalter, a-jacquiot,
starvik, jesper.nilsson, dhowells, rkuo, tony.luck, fenghua.yu,
takata, geert, monstr, yasutake.koichi, ralf, jonas, jejb,
deller, benh, paulus, schwidefsky, heiko.carstens, liqin.linux,
lennox.wu, lethal, cmetcalf, gxt, linux-xtensa, akpm
[-- Attachment #1: Type: text/plain, Size: 7727 bytes --]
Hi Richard,
(cc'd linux-metag)
On 08/10/13 12:33, Richard Weinberger wrote:
> Use the more generic functions get_signal() signal_setup_done()
> for signal delivery.
>
> Signed-off-by: Richard Weinberger <richard@nod.at>
> ---
> arch/metag/kernel/signal.c | 55 ++++++++++++++++++++--------------------------
> 1 file changed, 24 insertions(+), 31 deletions(-)
>
> diff --git a/arch/metag/kernel/signal.c b/arch/metag/kernel/signal.c
> index 3be61cf..9fa27c2 100644
> --- a/arch/metag/kernel/signal.c
> +++ b/arch/metag/kernel/signal.c
> @@ -152,18 +152,18 @@ static void __user *get_sigframe(struct k_sigaction *ka, unsigned long sp,
> return (void __user *)sp;
> }
>
> -static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
> - sigset_t *set, struct pt_regs *regs)
> +static int setup_rt_frame(struct ksignal *ksig, sigset_t *set,
> + struct pt_regs *regs)
> {
> struct rt_sigframe __user *frame;
> - int err = -EFAULT;
> + int err;
> unsigned long code;
>
> - frame = get_sigframe(ka, regs->REG_SP, sizeof(*frame));
> + frame = get_sigframe(&ksig->ka, regs->REG_SP, sizeof(*frame));
> if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
> - goto out;
> + return -EFAULT;
>
> - err = copy_siginfo_to_user(&frame->info, info);
> + err = copy_siginfo_to_user(&frame->info, &ksig->info);
>
> /* Create the ucontext. */
> err |= __put_user(0, &frame->uc.uc_flags);
> @@ -174,7 +174,7 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
> err |= __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set));
>
> if (err)
> - goto out;
> + return -EFAULT;
>
> /* Set up to return from userspace. */
>
> @@ -187,15 +187,15 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
> err |= __put_user(code, (unsigned long __user *)(&frame->retcode[1]));
>
> if (err)
> - goto out;
> + return -EFAULT;
>
> /* Set up registers for signal handler */
> regs->REG_RTP = (unsigned long) frame->retcode;
> regs->REG_SP = (unsigned long) frame + sizeof(*frame);
> - regs->REG_ARG1 = sig;
> + regs->REG_ARG1 = ksig->sig;
> regs->REG_ARG2 = (unsigned long) &frame->info;
> regs->REG_ARG3 = (unsigned long) &frame->uc;
> - regs->REG_PC = (unsigned long) ka->sa.sa_handler;
> + regs->REG_PC = (unsigned long) ksig->ka.sa.sa_handler;
>
> pr_debug("SIG deliver (%s:%d): sp=%p pc=%08x pr=%08x\n",
> current->comm, current->pid, frame, regs->REG_PC,
> @@ -205,24 +205,19 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
> * effective cache flush - directed rather than 'full flush'.
> */
> flush_cache_sigtramp(regs->REG_RTP, sizeof(frame->retcode));
> -out:
> - if (err) {
> - force_sigsegv(sig, current);
> - return -EFAULT;
> - }
> +
> return 0;
> }
>
> -static void handle_signal(unsigned long sig, siginfo_t *info,
> - struct k_sigaction *ka, struct pt_regs *regs)
> +static void handle_signal(struct ksignal *ksig, struct pt_regs *regs)
> {
> sigset_t *oldset = sigmask_to_save();
> + int ret;
>
> /* Set up the stack frame */
> - if (setup_rt_frame(sig, ka, info, oldset, regs))
> - return;
> + ret = setup_rt_frame(ksig, oldset, regs);
>
> - signal_delivered(sig, info, ka, regs, test_thread_flag(TIF_SINGLESTEP));
> + signal_setup_done(ret, ksig, test_thread_flag(TIF_SINGLESTEP));
> }
>
> /*
> @@ -235,10 +230,8 @@ static void handle_signal(unsigned long sig, siginfo_t *info,
> static int do_signal(struct pt_regs *regs, int syscall)
> {
> unsigned int retval = 0, continue_addr = 0, restart_addr = 0;
> - struct k_sigaction ka;
> - siginfo_t info;
> - int signr;
> int restart = 0;
> + struct ksignal ksig;
>
> /*
> * By the end of rt_sigreturn the context describes the point that the
> @@ -272,30 +265,30 @@ static int do_signal(struct pt_regs *regs, int syscall)
> }
>
> /*
> - * Get the signal to deliver. When running under ptrace, at this point
> - * the debugger may change all our registers ...
> - */
> - signr = get_signal_to_deliver(&info, &ka, regs, NULL);
> - /*
> * Depending on the signal settings we may need to revert the decision
> * to restart the system call. But skip this if a debugger has chosen to
> * restart at a different PC.
> */
> if (regs->REG_PC != restart_addr)
> restart = 0;
You've reordered the point where a ptrace debugger can change the registers
(get_signal_to_deliver) and the check of whether the PC has been changed by
the debugger (REG_PC != restart_addr).
I suggest this is changed to do something like 7e243643 (arm: switch to struct
ksignal * passing) does, moving the above REG_PC != restart_addr check into
the restart conditions below.
> - if (signr > 0) {
> +
> + /*
> + * Get the signal to deliver. When running under ptrace, at this point
> + * the debugger may change all our registers ...
> + */
> + if (get_signal(&ksig)) {
> if (unlikely(restart)) {
> if (retval == -ERESTARTNOHAND
> || retval == -ERESTART_RESTARTBLOCK
> || (retval == -ERESTARTSYS
> - && !(ka.sa.sa_flags & SA_RESTART))) {
> + && !(ksig.ka.sa.sa_flags & SA_RESTART))) {
> regs->REG_RETVAL = -EINTR;
> regs->REG_PC = continue_addr;
> }
> }
>
> /* Whee! Actually deliver the signal. */
> - handle_signal(signr, &info, &ka, regs);
> + handle_signal(&ksig, regs);
> return 0;
> }
>
>
How does the fixup patch below look?
The rest looks good, so other than that problem:
Acked-by: James Hogan <james.hogan@imgtec.com>
Thanks
James
diff --git a/arch/metag/kernel/signal.c b/arch/metag/kernel/signal.c
index 9fa27c2..6f64ea2 100644
--- a/arch/metag/kernel/signal.c
+++ b/arch/metag/kernel/signal.c
@@ -265,19 +265,16 @@ static int do_signal(struct pt_regs *regs, int syscall)
}
/*
+ * Get the signal to deliver. When running under ptrace, at this point
+ * the debugger may change all our registers ...
+ *
* Depending on the signal settings we may need to revert the decision
* to restart the system call. But skip this if a debugger has chosen to
* restart at a different PC.
*/
- if (regs->REG_PC != restart_addr)
- restart = 0;
-
- /*
- * Get the signal to deliver. When running under ptrace, at this point
- * the debugger may change all our registers ...
- */
if (get_signal(&ksig)) {
- if (unlikely(restart)) {
+ /* Handler */
+ if (unlikely(restart) && regs->REG_PC == restart_addr) {
if (retval == -ERESTARTNOHAND
|| retval == -ERESTART_RESTARTBLOCK
|| (retval == -ERESTARTSYS
@@ -289,19 +286,24 @@ static int do_signal(struct pt_regs *regs, int syscall)
/* Whee! Actually deliver the signal. */
handle_signal(&ksig, regs);
- return 0;
- }
-
- /* Handlerless -ERESTART_RESTARTBLOCK re-enters via restart_syscall */
- if (unlikely(restart < 0))
- regs->REG_SYSCALL = __NR_restart_syscall;
-
- /*
- * If there's no signal to deliver, we just put the saved sigmask back.
- */
- restore_saved_sigmask();
+ } else {
+ /*
+ * If there's no signal to deliver, we just put the saved
+ * sigmask back.
+ */
+ restore_saved_sigmask();
- return restart;
+ /*
+ * Handlerless -ERESTART_RESTARTBLOCK re-enters via
+ * restart_syscall
+ */
+ if (unlikely(restart) && regs->REG_PC == restart_addr) {
+ if (restart < 0)
+ regs->REG_SYSCALL = __NR_restart_syscall;
+ return restart;
+ }
+ }
+ return 0;
}
int do_work_pending(struct pt_regs *regs, unsigned int thread_flags,
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH 13/29] metag: Use get_signal() signal_setup_done()
@ 2013-10-09 11:09 ` James Hogan
0 siblings, 0 replies; 9+ messages in thread
From: James Hogan @ 2013-10-09 11:09 UTC (permalink / raw)
To: Richard Weinberger
Cc: linux-kernel, linux-arch, viro, vgupta, catalin.marinas,
will.deacon, hskinnemoen, egtvedt, vapier, msalter, a-jacquiot,
starvik, jesper.nilsson, dhowells, rkuo, tony.luck, fenghua.yu,
takata, geert, monstr, yasutake.koichi, ralf, jonas, jejb,
deller, benh, paulus, schwidefsky, heiko.carstens, liqin.linux,
lennox.wu, lethal, cmetcalf, gxt, linux-xtensa, akpm, oleg, tj,
linux-metag
[-- Attachment #1: Type: text/plain, Size: 7727 bytes --]
Hi Richard,
(cc'd linux-metag)
On 08/10/13 12:33, Richard Weinberger wrote:
> Use the more generic functions get_signal() signal_setup_done()
> for signal delivery.
>
> Signed-off-by: Richard Weinberger <richard@nod.at>
> ---
> arch/metag/kernel/signal.c | 55 ++++++++++++++++++++--------------------------
> 1 file changed, 24 insertions(+), 31 deletions(-)
>
> diff --git a/arch/metag/kernel/signal.c b/arch/metag/kernel/signal.c
> index 3be61cf..9fa27c2 100644
> --- a/arch/metag/kernel/signal.c
> +++ b/arch/metag/kernel/signal.c
> @@ -152,18 +152,18 @@ static void __user *get_sigframe(struct k_sigaction *ka, unsigned long sp,
> return (void __user *)sp;
> }
>
> -static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
> - sigset_t *set, struct pt_regs *regs)
> +static int setup_rt_frame(struct ksignal *ksig, sigset_t *set,
> + struct pt_regs *regs)
> {
> struct rt_sigframe __user *frame;
> - int err = -EFAULT;
> + int err;
> unsigned long code;
>
> - frame = get_sigframe(ka, regs->REG_SP, sizeof(*frame));
> + frame = get_sigframe(&ksig->ka, regs->REG_SP, sizeof(*frame));
> if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
> - goto out;
> + return -EFAULT;
>
> - err = copy_siginfo_to_user(&frame->info, info);
> + err = copy_siginfo_to_user(&frame->info, &ksig->info);
>
> /* Create the ucontext. */
> err |= __put_user(0, &frame->uc.uc_flags);
> @@ -174,7 +174,7 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
> err |= __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set));
>
> if (err)
> - goto out;
> + return -EFAULT;
>
> /* Set up to return from userspace. */
>
> @@ -187,15 +187,15 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
> err |= __put_user(code, (unsigned long __user *)(&frame->retcode[1]));
>
> if (err)
> - goto out;
> + return -EFAULT;
>
> /* Set up registers for signal handler */
> regs->REG_RTP = (unsigned long) frame->retcode;
> regs->REG_SP = (unsigned long) frame + sizeof(*frame);
> - regs->REG_ARG1 = sig;
> + regs->REG_ARG1 = ksig->sig;
> regs->REG_ARG2 = (unsigned long) &frame->info;
> regs->REG_ARG3 = (unsigned long) &frame->uc;
> - regs->REG_PC = (unsigned long) ka->sa.sa_handler;
> + regs->REG_PC = (unsigned long) ksig->ka.sa.sa_handler;
>
> pr_debug("SIG deliver (%s:%d): sp=%p pc=%08x pr=%08x\n",
> current->comm, current->pid, frame, regs->REG_PC,
> @@ -205,24 +205,19 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
> * effective cache flush - directed rather than 'full flush'.
> */
> flush_cache_sigtramp(regs->REG_RTP, sizeof(frame->retcode));
> -out:
> - if (err) {
> - force_sigsegv(sig, current);
> - return -EFAULT;
> - }
> +
> return 0;
> }
>
> -static void handle_signal(unsigned long sig, siginfo_t *info,
> - struct k_sigaction *ka, struct pt_regs *regs)
> +static void handle_signal(struct ksignal *ksig, struct pt_regs *regs)
> {
> sigset_t *oldset = sigmask_to_save();
> + int ret;
>
> /* Set up the stack frame */
> - if (setup_rt_frame(sig, ka, info, oldset, regs))
> - return;
> + ret = setup_rt_frame(ksig, oldset, regs);
>
> - signal_delivered(sig, info, ka, regs, test_thread_flag(TIF_SINGLESTEP));
> + signal_setup_done(ret, ksig, test_thread_flag(TIF_SINGLESTEP));
> }
>
> /*
> @@ -235,10 +230,8 @@ static void handle_signal(unsigned long sig, siginfo_t *info,
> static int do_signal(struct pt_regs *regs, int syscall)
> {
> unsigned int retval = 0, continue_addr = 0, restart_addr = 0;
> - struct k_sigaction ka;
> - siginfo_t info;
> - int signr;
> int restart = 0;
> + struct ksignal ksig;
>
> /*
> * By the end of rt_sigreturn the context describes the point that the
> @@ -272,30 +265,30 @@ static int do_signal(struct pt_regs *regs, int syscall)
> }
>
> /*
> - * Get the signal to deliver. When running under ptrace, at this point
> - * the debugger may change all our registers ...
> - */
> - signr = get_signal_to_deliver(&info, &ka, regs, NULL);
> - /*
> * Depending on the signal settings we may need to revert the decision
> * to restart the system call. But skip this if a debugger has chosen to
> * restart at a different PC.
> */
> if (regs->REG_PC != restart_addr)
> restart = 0;
You've reordered the point where a ptrace debugger can change the registers
(get_signal_to_deliver) and the check of whether the PC has been changed by
the debugger (REG_PC != restart_addr).
I suggest this is changed to do something like 7e243643 (arm: switch to struct
ksignal * passing) does, moving the above REG_PC != restart_addr check into
the restart conditions below.
> - if (signr > 0) {
> +
> + /*
> + * Get the signal to deliver. When running under ptrace, at this point
> + * the debugger may change all our registers ...
> + */
> + if (get_signal(&ksig)) {
> if (unlikely(restart)) {
> if (retval == -ERESTARTNOHAND
> || retval == -ERESTART_RESTARTBLOCK
> || (retval == -ERESTARTSYS
> - && !(ka.sa.sa_flags & SA_RESTART))) {
> + && !(ksig.ka.sa.sa_flags & SA_RESTART))) {
> regs->REG_RETVAL = -EINTR;
> regs->REG_PC = continue_addr;
> }
> }
>
> /* Whee! Actually deliver the signal. */
> - handle_signal(signr, &info, &ka, regs);
> + handle_signal(&ksig, regs);
> return 0;
> }
>
>
How does the fixup patch below look?
The rest looks good, so other than that problem:
Acked-by: James Hogan <james.hogan@imgtec.com>
Thanks
James
diff --git a/arch/metag/kernel/signal.c b/arch/metag/kernel/signal.c
index 9fa27c2..6f64ea2 100644
--- a/arch/metag/kernel/signal.c
+++ b/arch/metag/kernel/signal.c
@@ -265,19 +265,16 @@ static int do_signal(struct pt_regs *regs, int syscall)
}
/*
+ * Get the signal to deliver. When running under ptrace, at this point
+ * the debugger may change all our registers ...
+ *
* Depending on the signal settings we may need to revert the decision
* to restart the system call. But skip this if a debugger has chosen to
* restart at a different PC.
*/
- if (regs->REG_PC != restart_addr)
- restart = 0;
-
- /*
- * Get the signal to deliver. When running under ptrace, at this point
- * the debugger may change all our registers ...
- */
if (get_signal(&ksig)) {
- if (unlikely(restart)) {
+ /* Handler */
+ if (unlikely(restart) && regs->REG_PC == restart_addr) {
if (retval == -ERESTARTNOHAND
|| retval == -ERESTART_RESTARTBLOCK
|| (retval == -ERESTARTSYS
@@ -289,19 +286,24 @@ static int do_signal(struct pt_regs *regs, int syscall)
/* Whee! Actually deliver the signal. */
handle_signal(&ksig, regs);
- return 0;
- }
-
- /* Handlerless -ERESTART_RESTARTBLOCK re-enters via restart_syscall */
- if (unlikely(restart < 0))
- regs->REG_SYSCALL = __NR_restart_syscall;
-
- /*
- * If there's no signal to deliver, we just put the saved sigmask back.
- */
- restore_saved_sigmask();
+ } else {
+ /*
+ * If there's no signal to deliver, we just put the saved
+ * sigmask back.
+ */
+ restore_saved_sigmask();
- return restart;
+ /*
+ * Handlerless -ERESTART_RESTARTBLOCK re-enters via
+ * restart_syscall
+ */
+ if (unlikely(restart) && regs->REG_PC == restart_addr) {
+ if (restart < 0)
+ regs->REG_SYSCALL = __NR_restart_syscall;
+ return restart;
+ }
+ }
+ return 0;
}
int do_work_pending(struct pt_regs *regs, unsigned int thread_flags,
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2013-10-09 11:10 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-10-08 11:33 [PATCH 10/29] ia64: Use get_signal() signal_setup_done() Richard Weinberger
2013-10-08 11:33 ` [PATCH 11/29] m32r: " Richard Weinberger
2013-10-08 11:33 ` [PATCH 12/29] m68k: " Richard Weinberger
2013-10-08 11:33 ` [PATCH 13/29] metag: " Richard Weinberger
2013-10-09 11:09 ` James Hogan
2013-10-09 11:09 ` James Hogan
2013-10-09 11:09 ` James Hogan
2013-10-08 11:33 ` [PATCH 14/29] microblaze: " Richard Weinberger
2013-10-08 16:49 ` [PATCH 10/29] ia64: " Richard Weinberger
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.