* [PATCH 23/44] unicore32: Use get_signal() signal_setup_done()
@ 2014-03-02 23:59 Richard Weinberger
2014-03-02 23:59 ` [PATCH 24/44] xtensa: " Richard Weinberger
` (11 more replies)
0 siblings, 12 replies; 18+ messages in thread
From: Richard Weinberger @ 2014-03-02 23:59 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, cmetcalf, gxt, linux-xtensa, akpm, oleg, tj, hch,
Richard Weinberger
Use the more generic functions get_signal() signal_setup_done()
for signal delivery.
Signed-off-by: Richard Weinberger <richard@nod.at>
---
arch/unicore32/kernel/signal.c | 48 ++++++++++++++++++------------------------
1 file changed, 20 insertions(+), 28 deletions(-)
diff --git a/arch/unicore32/kernel/signal.c b/arch/unicore32/kernel/signal.c
index 6905f0e..780d773 100644
--- a/arch/unicore32/kernel/signal.c
+++ b/arch/unicore32/kernel/signal.c
@@ -238,10 +238,10 @@ static int setup_return(struct pt_regs *regs, struct k_sigaction *ka,
return 0;
}
-static int setup_frame(int usig, 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 = get_sigframe(ka, regs, sizeof(*frame));
+ struct sigframe __user *frame = get_sigframe(&ksig->ka, regs, sizeof(*frame));
int err = 0;
if (!frame)
@@ -254,29 +254,29 @@ static int setup_frame(int usig, struct k_sigaction *ka,
err |= setup_sigframe(frame, regs, set);
if (err == 0)
- err |= setup_return(regs, ka, frame->retcode, frame, usig);
+ err |= setup_return(regs, &ksig->ka, frame->retcode, frame, usig);
return err;
}
-static int setup_rt_frame(int usig, 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 =
- get_sigframe(ka, regs, sizeof(*frame));
+ get_sigframe(&ksig->ka, regs, sizeof(*frame));
int err = 0;
if (!frame)
return 1;
- err |= copy_siginfo_to_user(&frame->info, info);
+ err |= copy_siginfo_to_user(&frame->info, &ksig->info);
err |= __put_user(0, &frame->sig.uc.uc_flags);
err |= __put_user(NULL, &frame->sig.uc.uc_link);
err |= __save_altstack(&frame->sig.uc.uc_stack, regs->UCreg_sp);
err |= setup_sigframe(&frame->sig, regs, set);
if (err == 0)
- err |= setup_return(regs, ka, frame->sig.retcode, frame, usig);
+ err |= setup_return(regs, &ksig->ka, frame->sig.retcode, frame, usig);
if (err == 0) {
/*
@@ -299,13 +299,13 @@ static inline void setup_syscall_restart(struct pt_regs *regs)
/*
* OK, we're invoking a handler
*/
-static void handle_signal(unsigned long sig, struct k_sigaction *ka,
- siginfo_t *info, struct pt_regs *regs, int syscall)
+static void handle_signal(struct ksignal *ksig, struct pt_regs *regs,
+ int syscall)
{
struct thread_info *thread = current_thread_info();
struct task_struct *tsk = current;
sigset_t *oldset = sigmask_to_save();
- int usig = sig;
+ int usig = ksig->sig;
int ret;
/*
@@ -318,7 +318,7 @@ static void handle_signal(unsigned long sig, struct k_sigaction *ka,
regs->UCreg_00 = -EINTR;
break;
case -ERESTARTSYS:
- if (!(ka->sa.sa_flags & SA_RESTART)) {
+ if (!(ksig->ka.sa.sa_flags & SA_RESTART)) {
regs->UCreg_00 = -EINTR;
break;
}
@@ -338,22 +338,17 @@ static void handle_signal(unsigned long sig, struct k_sigaction *ka,
/*
* Set up the stack frame
*/
- if (ka->sa.sa_flags & SA_SIGINFO)
- ret = setup_rt_frame(usig, ka, info, oldset, regs);
+ if (ksig->ka.sa.sa_flags & SA_SIGINFO)
+ ret = setup_rt_frame(ksig, oldset, regs);
else
- ret = setup_frame(usig, ka, oldset, regs);
+ ret = setup_frame(ksig, oldset, regs);
/*
* Check that the resulting registers are actually sane.
*/
ret |= !valid_user_regs(regs);
- if (ret != 0) {
- force_sigsegv(sig, tsk);
- return;
- }
-
- signal_delivered(sig, info, ka, regs, 0);
+ signal_setup_done(ret, ksig, 0);
}
/*
@@ -367,9 +362,7 @@ static void handle_signal(unsigned long sig, struct k_sigaction *ka,
*/
static void do_signal(struct pt_regs *regs, int syscall)
{
- struct k_sigaction ka;
- siginfo_t info;
- int signr;
+ struct ksignal ksig;
/*
* We want the common case to go fast, which
@@ -380,9 +373,8 @@ static void do_signal(struct pt_regs *regs, int syscall)
if (!user_mode(regs))
return;
- signr = get_signal_to_deliver(&info, &ka, regs, NULL);
- if (signr > 0) {
- handle_signal(signr, &ka, &info, regs, syscall);
+ if (get_signsl(&ksig)) {
+ handle_signal(&ksig, regs, syscall);
return;
}
--
1.8.4.2
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 24/44] xtensa: Use get_signal() signal_setup_done()
2014-03-02 23:59 [PATCH 23/44] unicore32: Use get_signal() signal_setup_done() Richard Weinberger
@ 2014-03-02 23:59 ` Richard Weinberger
2014-03-02 23:59 ` [PATCH 25/44] Rip out get_signal_to_deliver() Richard Weinberger
` (10 subsequent siblings)
11 siblings, 0 replies; 18+ messages in thread
From: Richard Weinberger @ 2014-03-02 23:59 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, cmetcalf, gxt, linux-xtensa, akpm, oleg, tj, hch,
Richard Weinberger
Use the more generic functions get_signal() signal_setup_done()
for signal delivery.
Signed-off-by: Richard Weinberger <richard@nod.at>
---
arch/xtensa/kernel/signal.c | 43 ++++++++++++++++---------------------------
1 file changed, 16 insertions(+), 27 deletions(-)
diff --git a/arch/xtensa/kernel/signal.c b/arch/xtensa/kernel/signal.c
index 98b67d5..4612321 100644
--- a/arch/xtensa/kernel/signal.c
+++ b/arch/xtensa/kernel/signal.c
@@ -331,17 +331,17 @@ gen_return_code(unsigned char *codemem)
}
-static int setup_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
- sigset_t *set, struct pt_regs *regs)
+static int setup_frame(struct ksignal *ksig, sigset_t *set,
+ struct pt_regs *regs)
{
struct rt_sigframe *frame;
- int err = 0;
+ int err = 0, sig = ksig->sig;
int signal;
unsigned long sp, ra, tp;
sp = regs->areg[1];
- if ((ka->sa.sa_flags & SA_ONSTACK) != 0 && sas_ss_flags(sp) == 0) {
+ if ((ksig->ka.sa.sa_flags & SA_ONSTACK) != 0 && sas_ss_flags(sp) == 0) {
sp = current->sas_ss_sp + current->sas_ss_size;
}
@@ -351,7 +351,7 @@ static int setup_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
panic ("Double exception sys_sigreturn\n");
if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame))) {
- goto give_sigsegv;
+ return -EFAULT;
}
signal = current_thread_info()->exec_domain
@@ -360,8 +360,8 @@ static int setup_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
? current_thread_info()->exec_domain->signal_invmap[sig]
: sig;
- if (ka->sa.sa_flags & SA_SIGINFO) {
- 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 user context. */
@@ -372,8 +372,8 @@ static int setup_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
err |= setup_sigcontext(frame, regs);
err |= __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set));
- if (ka->sa.sa_flags & SA_RESTORER) {
- ra = (unsigned long)ka->sa.sa_restorer;
+ if (ksig->ka.sa.sa_flags & SA_RESTORER) {
+ ra = (unsigned long)ksig->ka.sa.sa_restorer;
} else {
/* Create sys_rt_sigreturn syscall in stack frame */
@@ -381,7 +381,7 @@ static int setup_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
err |= gen_return_code(frame->retcode);
if (err) {
- goto give_sigsegv;
+ return -EFAULT;
}
ra = (unsigned long) frame->retcode;
}
@@ -393,7 +393,7 @@ static int setup_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
/* Set up registers for signal handler; preserve the threadptr */
tp = regs->threadptr;
- start_thread(regs, (unsigned long) ka->sa.sa_handler,
+ start_thread(regs, (unsigned long) ksig->ka.sa.sa_handler,
(unsigned long) frame);
/* Set up a stack frame for a call4
@@ -416,10 +416,6 @@ static int setup_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
#endif
return 0;
-
-give_sigsegv:
- force_sigsegv(sig, current);
- return -EFAULT;
}
/*
@@ -433,15 +429,11 @@ give_sigsegv:
*/
static void do_signal(struct pt_regs *regs)
{
- siginfo_t info;
- int signr;
- struct k_sigaction ka;
+ struct ksignal ksig;
task_pt_regs(current)->icountlevel = 0;
- signr = get_signal_to_deliver(&info, &ka, regs, NULL);
-
- if (signr > 0) {
+ if (get_signal(&ksig)) {
int ret;
/* Are we from a system call? */
@@ -457,7 +449,7 @@ static void do_signal(struct pt_regs *regs)
break;
case -ERESTARTSYS:
- if (!(ka.sa.sa_flags & SA_RESTART)) {
+ if (!(ksig.ka.sa.sa_flags & SA_RESTART)) {
regs->areg[2] = -EINTR;
break;
}
@@ -476,11 +468,8 @@ static void do_signal(struct pt_regs *regs)
/* Whee! Actually deliver the signal. */
/* Set up the stack frame */
- ret = setup_frame(signr, &ka, &info, sigmask_to_save(), regs);
- if (ret)
- return;
-
- signal_delivered(signr, &info, &ka, regs, 0);
+ ret = setup_frame(&ksig, sigmask_to_save(), regs);
+ signal_setup_done(ret, &ksig, 0);
if (current->ptrace & PT_SINGLESTEP)
task_pt_regs(current)->icountlevel = 1;
--
1.8.4.2
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 25/44] Rip out get_signal_to_deliver()
2014-03-02 23:59 [PATCH 23/44] unicore32: Use get_signal() signal_setup_done() Richard Weinberger
2014-03-02 23:59 ` [PATCH 24/44] xtensa: " Richard Weinberger
@ 2014-03-02 23:59 ` Richard Weinberger
2014-03-02 23:59 ` [PATCH 26/44] tracehook_signal_handler: Remove sig, info, ka and regs Richard Weinberger
` (9 subsequent siblings)
11 siblings, 0 replies; 18+ messages in thread
From: Richard Weinberger @ 2014-03-02 23:59 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, cmetcalf, gxt, linux-xtensa, akpm, oleg, tj, hch,
Richard Weinberger
Now we can turn get_signal() to the main function.
Signed-off-by: Richard Weinberger <richard@nod.at>
---
include/linux/signal.h | 14 +-------------
kernel/signal.c | 23 ++++++++++++-----------
2 files changed, 13 insertions(+), 24 deletions(-)
diff --git a/include/linux/signal.h b/include/linux/signal.h
index 2ac423b..33177f5 100644
--- a/include/linux/signal.h
+++ b/include/linux/signal.h
@@ -285,23 +285,11 @@ struct ksignal {
int sig;
};
-extern int get_signal_to_deliver(siginfo_t *info, struct k_sigaction *return_ka, struct pt_regs *regs, void *cookie);
+extern int get_signal(struct ksignal *ksig);
extern void signal_setup_done(int failed, struct ksignal *ksig, int stepping);
extern void signal_delivered(int sig, siginfo_t *info, struct k_sigaction *ka, struct pt_regs *regs, int stepping);
extern void exit_signals(struct task_struct *tsk);
-/*
- * Eventually that'll replace get_signal_to_deliver(); macro for now,
- * to avoid nastiness with include order.
- */
-#define get_signal(ksig) \
-({ \
- struct ksignal *p = (ksig); \
- p->sig = get_signal_to_deliver(&p->info, &p->ka, \
- signal_pt_regs(), NULL);\
- p->sig > 0; \
-})
-
extern struct kmem_cache *sighand_cachep;
int unhandled_signal(struct task_struct *tsk, int sig);
diff --git a/kernel/signal.c b/kernel/signal.c
index 52f881d..bd649bd 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -2189,8 +2189,7 @@ static int ptrace_signal(int signr, siginfo_t *info)
return signr;
}
-int get_signal_to_deliver(siginfo_t *info, struct k_sigaction *return_ka,
- struct pt_regs *regs, void *cookie)
+int get_signal(struct ksignal *ksig)
{
struct sighand_struct *sighand = current->sighand;
struct signal_struct *signal = current->signal;
@@ -2260,13 +2259,13 @@ relock:
goto relock;
}
- signr = dequeue_signal(current, ¤t->blocked, info);
+ signr = dequeue_signal(current, ¤t->blocked, &ksig->info);
if (!signr)
break; /* will return 0 */
if (unlikely(current->ptrace) && signr != SIGKILL) {
- signr = ptrace_signal(signr, info);
+ signr = ptrace_signal(signr, &ksig->info);
if (!signr)
continue;
}
@@ -2274,13 +2273,13 @@ relock:
ka = &sighand->action[signr-1];
/* Trace actually delivered signals. */
- trace_signal_deliver(signr, info, ka);
+ trace_signal_deliver(signr, &ksig->info, ka);
if (ka->sa.sa_handler == SIG_IGN) /* Do nothing. */
continue;
if (ka->sa.sa_handler != SIG_DFL) {
/* Run the handler. */
- *return_ka = *ka;
+ ksig->ka = *ka;
if (ka->sa.sa_flags & SA_ONESHOT)
ka->sa.sa_handler = SIG_DFL;
@@ -2330,7 +2329,7 @@ relock:
spin_lock_irq(&sighand->siglock);
}
- if (likely(do_signal_stop(info->si_signo))) {
+ if (likely(do_signal_stop(ksig->info.si_signo))) {
/* It released the siglock. */
goto relock;
}
@@ -2351,7 +2350,7 @@ relock:
if (sig_kernel_coredump(signr)) {
if (print_fatal_signals)
- print_fatal_signal(info->si_signo);
+ print_fatal_signal(ksig->info.si_signo);
proc_coredump_connector(current);
/*
* If it was able to dump core, this kills all
@@ -2361,17 +2360,19 @@ relock:
* first and our do_group_exit call below will use
* that value and ignore the one we pass it.
*/
- do_coredump(info);
+ do_coredump(&ksig->info);
}
/*
* Death signals, no core dump.
*/
- do_group_exit(info->si_signo);
+ do_group_exit(ksig->info.si_signo);
/* NOTREACHED */
}
spin_unlock_irq(&sighand->siglock);
- return signr;
+
+ ksig->sig = signr;
+ return ksig->sig > 0;
}
/**
--
1.8.4.2
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 26/44] tracehook_signal_handler: Remove sig, info, ka and regs
2014-03-02 23:59 [PATCH 23/44] unicore32: Use get_signal() signal_setup_done() Richard Weinberger
2014-03-02 23:59 ` [PATCH 24/44] xtensa: " Richard Weinberger
2014-03-02 23:59 ` [PATCH 25/44] Rip out get_signal_to_deliver() Richard Weinberger
@ 2014-03-02 23:59 ` Richard Weinberger
2014-03-02 23:59 ` [PATCH 27/44] Clean up signal_delivered() Richard Weinberger
` (8 subsequent siblings)
11 siblings, 0 replies; 18+ messages in thread
From: Richard Weinberger @ 2014-03-02 23:59 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, cmetcalf, gxt, linux-xtensa, akpm, oleg, tj, hch,
Richard Weinberger
These parameters are nowhere used, so we can remove them.
Signed-off-by: Richard Weinberger <richard@nod.at>
---
include/linux/tracehook.h | 8 +-------
kernel/signal.c | 2 +-
2 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/include/linux/tracehook.h b/include/linux/tracehook.h
index 1e98b55..c4877e3 100644
--- a/include/linux/tracehook.h
+++ b/include/linux/tracehook.h
@@ -133,10 +133,6 @@ static inline void tracehook_report_syscall_exit(struct pt_regs *regs, int step)
/**
* tracehook_signal_handler - signal handler setup is complete
- * @sig: number of signal being delivered
- * @info: siginfo_t of signal being delivered
- * @ka: sigaction setting that chose the handler
- * @regs: user register state
* @stepping: nonzero if debugger single-step or block-step in use
*
* Called by the arch code after a signal handler has been set up.
@@ -146,9 +142,7 @@ static inline void tracehook_report_syscall_exit(struct pt_regs *regs, int step)
* Called without locks, shortly before returning to user mode
* (or handling more signals).
*/
-static inline void tracehook_signal_handler(int sig, siginfo_t *info,
- const struct k_sigaction *ka,
- struct pt_regs *regs, int stepping)
+static inline void tracehook_signal_handler(int stepping)
{
if (stepping)
ptrace_notify(SIGTRAP);
diff --git a/kernel/signal.c b/kernel/signal.c
index bd649bd..b0a6256 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -2403,7 +2403,7 @@ void signal_delivered(int sig, siginfo_t *info, struct k_sigaction *ka,
if (!(ka->sa.sa_flags & SA_NODEFER))
sigaddset(&blocked, sig);
set_current_blocked(&blocked);
- tracehook_signal_handler(sig, info, ka, regs, stepping);
+ tracehook_signal_handler(stepping);
}
void signal_setup_done(int failed, struct ksignal *ksig, int stepping)
--
1.8.4.2
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 27/44] Clean up signal_delivered()
2014-03-02 23:59 [PATCH 23/44] unicore32: Use get_signal() signal_setup_done() Richard Weinberger
` (2 preceding siblings ...)
2014-03-02 23:59 ` [PATCH 26/44] tracehook_signal_handler: Remove sig, info, ka and regs Richard Weinberger
@ 2014-03-02 23:59 ` Richard Weinberger
2014-03-02 23:59 ` [PATCH 28/44] Add translate_signal() helper Richard Weinberger
` (7 subsequent siblings)
11 siblings, 0 replies; 18+ messages in thread
From: Richard Weinberger @ 2014-03-02 23:59 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, cmetcalf, gxt, linux-xtensa, akpm, oleg, tj, hch,
Richard Weinberger
- Pass a ksignal struct to it
- Remove unused regs parameter
- Make it private as it's nowhere outside of kernel/signal.c is used
Signed-off-by: Richard Weinberger <richard@nod.at>
---
include/linux/signal.h | 1 -
kernel/signal.c | 21 ++++++++-------------
2 files changed, 8 insertions(+), 14 deletions(-)
diff --git a/include/linux/signal.h b/include/linux/signal.h
index 33177f5..ef8fcfd 100644
--- a/include/linux/signal.h
+++ b/include/linux/signal.h
@@ -287,7 +287,6 @@ struct ksignal {
extern int get_signal(struct ksignal *ksig);
extern void signal_setup_done(int failed, struct ksignal *ksig, int stepping);
-extern void signal_delivered(int sig, siginfo_t *info, struct k_sigaction *ka, struct pt_regs *regs, int stepping);
extern void exit_signals(struct task_struct *tsk);
extern struct kmem_cache *sighand_cachep;
diff --git a/kernel/signal.c b/kernel/signal.c
index b0a6256..8346b20 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -2377,19 +2377,15 @@ relock:
/**
* signal_delivered -
- * @sig: number of signal being delivered
- * @info: siginfo_t of signal being delivered
- * @ka: sigaction setting that chose the handler
- * @regs: user register state
+ * @ksig: kernel signal struct
* @stepping: nonzero if debugger single-step or block-step in use
*
* This function should be called when a signal has succesfully been
- * delivered. It updates the blocked signals accordingly (@ka->sa.sa_mask
+ * delivered. It updates the blocked signals accordingly (@ksig->ka.sa.sa_mask
* is always blocked, and the signal itself is blocked unless %SA_NODEFER
- * is set in @ka->sa.sa_flags. Tracing is notified.
+ * is set in @ksig->ka.sa.sa_flags. Tracing is notified.
*/
-void signal_delivered(int sig, siginfo_t *info, struct k_sigaction *ka,
- struct pt_regs *regs, int stepping)
+static void signal_delivered(struct ksignal *ksig, int stepping)
{
sigset_t blocked;
@@ -2399,9 +2395,9 @@ void signal_delivered(int sig, siginfo_t *info, struct k_sigaction *ka,
simply clear the restore sigmask flag. */
clear_restore_sigmask();
- sigorsets(&blocked, ¤t->blocked, &ka->sa.sa_mask);
- if (!(ka->sa.sa_flags & SA_NODEFER))
- sigaddset(&blocked, sig);
+ sigorsets(&blocked, ¤t->blocked, &ksig->ka.sa.sa_mask);
+ if (!(ksig->ka.sa.sa_flags & SA_NODEFER))
+ sigaddset(&blocked, ksig->sig);
set_current_blocked(&blocked);
tracehook_signal_handler(stepping);
}
@@ -2411,8 +2407,7 @@ void signal_setup_done(int failed, struct ksignal *ksig, int stepping)
if (failed)
force_sigsegv(ksig->sig, current);
else
- signal_delivered(ksig->sig, &ksig->info, &ksig->ka,
- signal_pt_regs(), stepping);
+ signal_delivered(ksig, stepping);
}
/*
--
1.8.4.2
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 28/44] Add translate_signal() helper
2014-03-02 23:59 [PATCH 23/44] unicore32: Use get_signal() signal_setup_done() Richard Weinberger
` (3 preceding siblings ...)
2014-03-02 23:59 ` [PATCH 27/44] Clean up signal_delivered() Richard Weinberger
@ 2014-03-02 23:59 ` Richard Weinberger
2014-03-04 18:41 ` Oleg Nesterov
2014-03-02 23:59 ` [PATCH 29/44] arc: Use translate_signal() Richard Weinberger
` (6 subsequent siblings)
11 siblings, 1 reply; 18+ messages in thread
From: Richard Weinberger @ 2014-03-02 23:59 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, cmetcalf, gxt, linux-xtensa, akpm, oleg, tj, hch,
Richard Weinberger
Translating signals is common task. Currently many arch have this
open coded. This provides a common helper for all archs.
Signed-off-by: Richard Weinberger <richard@nod.at>
---
include/linux/signal.h | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/include/linux/signal.h b/include/linux/signal.h
index ef8fcfd..5dfe4c8 100644
--- a/include/linux/signal.h
+++ b/include/linux/signal.h
@@ -2,6 +2,8 @@
#define _LINUX_SIGNAL_H
#include <linux/list.h>
+#include <linux/personality.h>
+#include <linux/thread_info.h>
#include <uapi/linux/signal.h>
struct task_struct;
@@ -285,6 +287,16 @@ struct ksignal {
int sig;
};
+static inline int translate_signal(int sig)
+{
+ struct thread_info *info = current_thread_info();
+
+ if (info->exec_domain && info->exec_domain->signal_invmap && sig < 32)
+ return info->exec_domain->signal_invmap[sig];
+
+ return sig;
+}
+
extern int get_signal(struct ksignal *ksig);
extern void signal_setup_done(int failed, struct ksignal *ksig, int stepping);
extern void exit_signals(struct task_struct *tsk);
--
1.8.4.2
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 29/44] arc: Use translate_signal()
2014-03-02 23:59 [PATCH 23/44] unicore32: Use get_signal() signal_setup_done() Richard Weinberger
` (4 preceding siblings ...)
2014-03-02 23:59 ` [PATCH 28/44] Add translate_signal() helper Richard Weinberger
@ 2014-03-02 23:59 ` Richard Weinberger
2014-03-03 4:32 ` Vineet Gupta
2014-03-02 23:59 ` [PATCH 30/44] arm: " Richard Weinberger
` (5 subsequent siblings)
11 siblings, 1 reply; 18+ messages in thread
From: Richard Weinberger @ 2014-03-02 23:59 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, cmetcalf, gxt, linux-xtensa, akpm, oleg, tj, hch,
Richard Weinberger
Use the common helper instead of it's own variant.
Signed-off-by: Richard Weinberger <richard@nod.at>
---
arch/arc/kernel/signal.c | 15 +--------------
1 file changed, 1 insertion(+), 14 deletions(-)
diff --git a/arch/arc/kernel/signal.c b/arch/arc/kernel/signal.c
index c2031e2..bf11c8d 100644
--- a/arch/arc/kernel/signal.c
+++ b/arch/arc/kernel/signal.c
@@ -49,7 +49,6 @@
#include <linux/signal.h>
#include <linux/ptrace.h>
-#include <linux/personality.h>
#include <linux/uaccess.h>
#include <linux/syscalls.h>
#include <linux/tracehook.h>
@@ -166,18 +165,6 @@ static inline void __user *get_sigframe(struct k_sigaction *ka,
return frame;
}
-/*
- * translate the signal
- */
-static inline int map_sig(int sig)
-{
- struct thread_info *thread = current_thread_info();
- if (thread->exec_domain && thread->exec_domain->signal_invmap
- && sig < 32)
- sig = thread->exec_domain->signal_invmap[sig];
- return sig;
-}
-
static int
setup_rt_frame(struct ksignal *ksig, sigset_t *set, struct pt_regs *regs)
{
@@ -226,7 +213,7 @@ setup_rt_frame(struct ksignal *ksig, sigset_t *set, struct pt_regs *regs)
return err;
/* #1 arg to the user Signal handler */
- regs->r0 = map_sig(ksig->sig);
+ regs->r0 = translate_signal(ksig->sig);
/* setup PC of user space signal handler */
regs->ret = (unsigned long)ksig->ka.sa.sa_handler;
--
1.8.4.2
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 30/44] arm: Use translate_signal()
2014-03-02 23:59 [PATCH 23/44] unicore32: Use get_signal() signal_setup_done() Richard Weinberger
` (5 preceding siblings ...)
2014-03-02 23:59 ` [PATCH 29/44] arc: Use translate_signal() Richard Weinberger
@ 2014-03-02 23:59 ` Richard Weinberger
2014-03-02 23:59 ` [PATCH 31/44] arm64: " Richard Weinberger
` (4 subsequent siblings)
11 siblings, 0 replies; 18+ messages in thread
From: Richard Weinberger @ 2014-03-02 23:59 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, cmetcalf, gxt, linux-xtensa, akpm, oleg, tj, hch,
Richard Weinberger
Use the common helper instead of it's own variant.
Signed-off-by: Richard Weinberger <richard@nod.at>
---
arch/arm/kernel/signal.c | 14 +-------------
1 file changed, 1 insertion(+), 13 deletions(-)
diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c
index 04d6388..9c6a908 100644
--- a/arch/arm/kernel/signal.c
+++ b/arch/arm/kernel/signal.c
@@ -10,7 +10,6 @@
#include <linux/errno.h>
#include <linux/random.h>
#include <linux/signal.h>
-#include <linux/personality.h>
#include <linux/uaccess.h>
#include <linux/tracehook.h>
@@ -317,17 +316,6 @@ get_sigframe(struct ksignal *ksig, struct pt_regs *regs, int framesize)
return frame;
}
-/*
- * translate the signal
- */
-static inline int map_sig(int sig)
-{
- struct thread_info *thread = current_thread_info();
- if (sig < 32 && thread->exec_domain && thread->exec_domain->signal_invmap)
- sig = thread->exec_domain->signal_invmap[sig];
- return sig;
-}
-
static int
setup_return(struct pt_regs *regs, struct ksignal *ksig,
unsigned long __user *rc, void __user *frame)
@@ -411,7 +399,7 @@ setup_return(struct pt_regs *regs, struct ksignal *ksig,
}
}
- regs->ARM_r0 = map_sig(ksig->sig);
+ regs->ARM_r0 = translate_signal(ksig->sig);
regs->ARM_sp = (unsigned long)frame;
regs->ARM_lr = retcode;
regs->ARM_pc = handler;
--
1.8.4.2
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 31/44] arm64: Use translate_signal()
2014-03-02 23:59 [PATCH 23/44] unicore32: Use get_signal() signal_setup_done() Richard Weinberger
` (6 preceding siblings ...)
2014-03-02 23:59 ` [PATCH 30/44] arm: " Richard Weinberger
@ 2014-03-02 23:59 ` Richard Weinberger
2014-03-02 23:59 ` [PATCH 32/44] blackfin: " Richard Weinberger
` (3 subsequent siblings)
11 siblings, 0 replies; 18+ messages in thread
From: Richard Weinberger @ 2014-03-02 23:59 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, cmetcalf, gxt, linux-xtensa, akpm, oleg, tj, hch,
Richard Weinberger
Use the common helper instead of it's own open coded variant.
Signed-off-by: Richard Weinberger <richard@nod.at>
---
arch/arm64/kernel/signal.c | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/arch/arm64/kernel/signal.c b/arch/arm64/kernel/signal.c
index f6f23dd..165a72a 100644
--- a/arch/arm64/kernel/signal.c
+++ b/arch/arm64/kernel/signal.c
@@ -19,7 +19,6 @@
#include <linux/errno.h>
#include <linux/signal.h>
-#include <linux/personality.h>
#include <linux/freezer.h>
#include <linux/uaccess.h>
#include <linux/tracehook.h>
@@ -282,16 +281,10 @@ static void handle_signal(struct ksignal *ksig, struct pt_regs *regs)
struct thread_info *thread = current_thread_info();
struct task_struct *tsk = current;
sigset_t *oldset = sigmask_to_save();
- int usig = ksig->sig;
+ int usig = translate_signal(ksig->sig);
int ret;
/*
- * translate the signal
- */
- if (usig < 32 && thread->exec_domain && thread->exec_domain->signal_invmap)
- usig = thread->exec_domain->signal_invmap[usig];
-
- /*
* Set up the stack frame
*/
if (is_compat_task()) {
--
1.8.4.2
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 32/44] blackfin: Use translate_signal()
2014-03-02 23:59 [PATCH 23/44] unicore32: Use get_signal() signal_setup_done() Richard Weinberger
` (7 preceding siblings ...)
2014-03-02 23:59 ` [PATCH 31/44] arm64: " Richard Weinberger
@ 2014-03-02 23:59 ` Richard Weinberger
2014-03-02 23:59 ` [PATCH 33/44] frv: " Richard Weinberger
` (2 subsequent siblings)
11 siblings, 0 replies; 18+ messages in thread
From: Richard Weinberger @ 2014-03-02 23:59 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, cmetcalf, gxt, linux-xtensa, akpm, oleg, tj, hch,
Richard Weinberger
Use the common helper instead of it's own open coded variant.
Signed-off-by: Richard Weinberger <richard@nod.at>
---
arch/blackfin/kernel/signal.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/arch/blackfin/kernel/signal.c b/arch/blackfin/kernel/signal.c
index 1389cd3..707165a 100644
--- a/arch/blackfin/kernel/signal.c
+++ b/arch/blackfin/kernel/signal.c
@@ -8,7 +8,6 @@
#include <linux/syscalls.h>
#include <linux/ptrace.h>
#include <linux/tty.h>
-#include <linux/personality.h>
#include <linux/binfmts.h>
#include <linux/uaccess.h>
#include <linux/tracehook.h>
@@ -159,11 +158,7 @@ setup_rt_frame(struct ksignal *ksig, sigset_t *set, struct pt_regs *regs)
frame = get_sigframe(&ksig->ka, regs, sizeof(*frame));
- err |= __put_user((current_thread_info()->exec_domain
- && current_thread_info()->exec_domain->signal_invmap
- && ksig->sig < 32
- ? current_thread_info()->exec_domain->
- signal_invmap[ksig->sig] : ksig->sig), &frame->sig);
+ err |= __put_user(translate_signal(ksig->sig), &frame->sig);
err |= __put_user(&frame->info, &frame->pinfo);
err |= __put_user(&frame->uc, &frame->puc);
--
1.8.4.2
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 33/44] frv: Use translate_signal()
2014-03-02 23:59 [PATCH 23/44] unicore32: Use get_signal() signal_setup_done() Richard Weinberger
` (8 preceding siblings ...)
2014-03-02 23:59 ` [PATCH 32/44] blackfin: " Richard Weinberger
@ 2014-03-02 23:59 ` Richard Weinberger
2014-03-02 23:59 ` [PATCH 34/44] m32r: " Richard Weinberger
2014-03-02 23:59 ` [PATCH 35/44] m68k: " Richard Weinberger
11 siblings, 0 replies; 18+ messages in thread
From: Richard Weinberger @ 2014-03-02 23:59 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, cmetcalf, gxt, linux-xtensa, akpm, oleg, tj, hch,
Richard Weinberger
Use the common helper instead of it's own open coded variant.
Signed-off-by: Richard Weinberger <richard@nod.at>
---
arch/frv/kernel/signal.c | 27 ++++++---------------------
1 file changed, 6 insertions(+), 21 deletions(-)
diff --git a/arch/frv/kernel/signal.c b/arch/frv/kernel/signal.c
index 8e37cf2..108a74e 100644
--- a/arch/frv/kernel/signal.c
+++ b/arch/frv/kernel/signal.c
@@ -19,7 +19,6 @@
#include <linux/wait.h>
#include <linux/ptrace.h>
#include <linux/unistd.h>
-#include <linux/personality.h>
#include <linux/tracehook.h>
#include <asm/ucontext.h>
#include <asm/uaccess.h>
@@ -183,7 +182,6 @@ static inline void __user *get_sigframe(struct k_sigaction *ka,
static int setup_frame(struct ksignal *ksig, sigset_t *set)
{
struct sigframe __user *frame;
- int rsig, sig = ksig->sig;
set_fs(USER_DS);
@@ -192,13 +190,7 @@ static int setup_frame(struct ksignal *ksig, sigset_t *set)
if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
return -EFAULT;
- rsig = sig;
- if (sig < 32 &&
- __current_thread_info->exec_domain &&
- __current_thread_info->exec_domain->signal_invmap)
- rsig = __current_thread_info->exec_domain->signal_invmap[sig];
-
- if (__put_user(rsig, &frame->sig) < 0)
+ if (__put_user(translate_signal(ksig->sig), &frame->sig) < 0)
return -EFAULT;
if (setup_sigcontext(&frame->sc, set->sig[0]))
@@ -246,11 +238,11 @@ static int setup_frame(struct ksignal *ksig, sigset_t *set)
__frame->sp = (unsigned long) frame;
__frame->lr = (unsigned long) &frame->retcode;
- __frame->gr8 = sig;
+ __frame->gr8 = ksig->sig;
#if DEBUG_SIG
printk("SIG deliver %d (%s:%d): sp=%p pc=%lx ra=%p\n",
- sig, current->comm, current->pid, frame, __frame->pc,
+ ksig->sig, current->comm, current->pid, frame, __frame->pc,
frame->pretcode);
#endif
@@ -264,7 +256,6 @@ static int setup_frame(struct ksignal *ksig, sigset_t *set)
static int setup_rt_frame(struct ksignal *ksig, sigset_t *set)
{
struct rt_sigframe __user *frame;
- int rsig, sig = ksig->sig;
set_fs(USER_DS);
@@ -273,13 +264,7 @@ static int setup_rt_frame(struct ksignal *ksig, sigset_t *set)
if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
return -EFAULT;
- rsig = sig;
- if (sig < 32 &&
- __current_thread_info->exec_domain &&
- __current_thread_info->exec_domain->signal_invmap)
- rsig = __current_thread_info->exec_domain->signal_invmap[sig];
-
- if (__put_user(rsig, &frame->sig) ||
+ if (__put_user(translate_signal(ksig->sig), &frame->sig) ||
__put_user(&frame->info, &frame->pinfo) ||
__put_user(&frame->uc, &frame->puc))
return -EFAULT;
@@ -335,12 +320,12 @@ static int setup_rt_frame(struct ksignal *ksig, sigset_t *set)
__frame->sp = (unsigned long) frame;
__frame->lr = (unsigned long) &frame->retcode;
- __frame->gr8 = sig;
+ __frame->gr8 = ksig->sig;
__frame->gr9 = (unsigned long) &frame->info;
#if DEBUG_SIG
printk("SIG deliver %d (%s:%d): sp=%p pc=%lx ra=%p\n",
- sig, current->comm, current->pid, frame, __frame->pc,
+ ksig->sig, current->comm, current->pid, frame, __frame->pc,
frame->pretcode);
#endif
return 0;
--
1.8.4.2
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 34/44] m32r: Use translate_signal()
2014-03-02 23:59 [PATCH 23/44] unicore32: Use get_signal() signal_setup_done() Richard Weinberger
` (9 preceding siblings ...)
2014-03-02 23:59 ` [PATCH 33/44] frv: " Richard Weinberger
@ 2014-03-02 23:59 ` Richard Weinberger
2014-03-02 23:59 ` [PATCH 35/44] m68k: " Richard Weinberger
11 siblings, 0 replies; 18+ messages in thread
From: Richard Weinberger @ 2014-03-02 23:59 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, cmetcalf, gxt, linux-xtensa, akpm, oleg, tj, hch,
Richard Weinberger
Use the common helper instead of it's own open coded variant.
Signed-off-by: Richard Weinberger <richard@nod.at>
---
arch/m32r/kernel/signal.c | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/arch/m32r/kernel/signal.c b/arch/m32r/kernel/signal.c
index cce3fd3..2673513 100644
--- a/arch/m32r/kernel/signal.c
+++ b/arch/m32r/kernel/signal.c
@@ -19,7 +19,6 @@
#include <linux/wait.h>
#include <linux/unistd.h>
#include <linux/stddef.h>
-#include <linux/personality.h>
#include <linux/tracehook.h>
#include <asm/cacheflush.h>
#include <asm/ucontext.h>
@@ -178,18 +177,14 @@ static int setup_rt_frame(struct ksignal *ksig, sigset_t *set,
{
struct rt_sigframe __user *frame;
int err = 0;
- int signal, sig = ksig->sig;
+ int signal;
frame = get_sigframe(&ksig->ka, regs->spu, sizeof(*frame));
if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
return -EFAULT;
- signal = current_thread_info()->exec_domain
- && current_thread_info()->exec_domain->signal_invmap
- && sig < 32
- ? current_thread_info()->exec_domain->signal_invmap[sig]
- : sig;
+ signal = translate_signal(ksig->sig);
err |= __put_user(signal, &frame->sig);
if (err)
--
1.8.4.2
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH 35/44] m68k: Use translate_signal()
2014-03-02 23:59 [PATCH 23/44] unicore32: Use get_signal() signal_setup_done() Richard Weinberger
` (10 preceding siblings ...)
2014-03-02 23:59 ` [PATCH 34/44] m32r: " Richard Weinberger
@ 2014-03-02 23:59 ` Richard Weinberger
11 siblings, 0 replies; 18+ messages in thread
From: Richard Weinberger @ 2014-03-02 23:59 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, cmetcalf, gxt, linux-xtensa, akpm, oleg, tj, hch,
Richard Weinberger
Use the common helper instead of it's own open coded variant.
Signed-off-by: Richard Weinberger <richard@nod.at>
---
arch/m68k/kernel/signal.c | 15 ++-------------
1 file changed, 2 insertions(+), 13 deletions(-)
diff --git a/arch/m68k/kernel/signal.c b/arch/m68k/kernel/signal.c
index c8e6fa8..b8a428b 100644
--- a/arch/m68k/kernel/signal.c
+++ b/arch/m68k/kernel/signal.c
@@ -39,7 +39,6 @@
#include <linux/unistd.h>
#include <linux/stddef.h>
#include <linux/highuid.h>
-#include <linux/personality.h>
#include <linux/tty.h>
#include <linux/binfmts.h>
#include <linux/module.h>
@@ -871,12 +870,7 @@ static int setup_frame(struct ksignal *ksig, sigset_t *set,
if (fsize)
err |= copy_to_user (frame + 1, regs + 1, fsize);
- err |= __put_user((current_thread_info()->exec_domain
- && current_thread_info()->exec_domain->signal_invmap
- && sig < 32
- ? current_thread_info()->exec_domain->signal_invmap[sig]
- : sig),
- &frame->sig);
+ err |= __put_user(translate_signal(sig), &frame->sig);
err |= __put_user(regs->vector, &frame->code);
err |= __put_user(&frame->sc, &frame->psc);
@@ -956,12 +950,7 @@ static int setup_rt_frame(struct ksignal *ksig, sigset_t *set,
if (fsize)
err |= copy_to_user (&frame->uc.uc_extra, regs + 1, fsize);
- err |= __put_user((current_thread_info()->exec_domain
- && current_thread_info()->exec_domain->signal_invmap
- && sig < 32
- ? current_thread_info()->exec_domain->signal_invmap[sig]
- : sig),
- &frame->sig);
+ err |= __put_user(translate_signal(sig), &frame->sig);
err |= __put_user(&frame->info, &frame->pinfo);
err |= __put_user(&frame->uc, &frame->puc);
err |= copy_siginfo_to_user(&frame->info, &ksig->info);
--
1.8.4.2
^ permalink raw reply related [flat|nested] 18+ messages in thread
* Re: [PATCH 29/44] arc: Use translate_signal()
2014-03-02 23:59 ` [PATCH 29/44] arc: Use translate_signal() Richard Weinberger
@ 2014-03-03 4:32 ` Vineet Gupta
0 siblings, 0 replies; 18+ messages in thread
From: Vineet Gupta @ 2014-03-03 4:32 UTC (permalink / raw)
To: Richard Weinberger; +Cc: lkml, linux-arch
Hi Richard,
Thanks for this.
On Monday 03 March 2014 07:59 AM, Richard Weinberger wrote:
> Use the common helper instead of it's own variant.
>
> Signed-off-by: Richard Weinberger <richard@nod.at>
Acked-by: Vineet Gupta <vgupta@synopsys.com> [arch/arc bits]
-Vineet
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 28/44] Add translate_signal() helper
2014-03-02 23:59 ` [PATCH 28/44] Add translate_signal() helper Richard Weinberger
@ 2014-03-04 18:41 ` Oleg Nesterov
2014-03-04 20:43 ` Richard Weinberger
0 siblings, 1 reply; 18+ messages in thread
From: Oleg Nesterov @ 2014-03-04 18:41 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, cmetcalf, gxt, linux-xtensa, akpm, tj,
hch
On 03/03, Richard Weinberger wrote:
>
> +static inline int translate_signal(int sig)
> +{
> + struct thread_info *info = current_thread_info();
> +
> + if (info->exec_domain
Afaics it can't be NULL.
> && info->exec_domain->signal_invmap && sig < 32)
> + return info->exec_domain->signal_invmap[sig];
> +
And why default_exec_domain has .signal_invmap = ident_map ?
translate_signal-like code should check ->signal_invmap != NULL
anyway.
Off topic, but can't we kill exec_domain->signal_map ? it seems that
it is unused.
Hmm. And who actually uses exec_domain->handler() ?? asm-offsets.c,
but I do not see any usage of TI_EXEC_DOMAIN.
In short: I agree with this change but I am totally confused. To the
point, I am not sure I even understand ->signal_invmap. I mean, it
seems that only arthur_exec_domain has a non-ident map. Why, say,
x86 does signr_convert() ? and only if CONFIG_X86_32? Is there any
external module which does register_exec_domain(strange_invmap) ?
Oleg.
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 28/44] Add translate_signal() helper
2014-03-04 18:41 ` Oleg Nesterov
@ 2014-03-04 20:43 ` Richard Weinberger
2014-03-04 21:00 ` Christoph Hellwig
0 siblings, 1 reply; 18+ messages in thread
From: Richard Weinberger @ 2014-03-04 20:43 UTC (permalink / raw)
To: Oleg Nesterov
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, cmetcalf, gxt, linux-xtensa, akpm, tj,
hch
Am 04.03.2014 19:41, schrieb Oleg Nesterov:
> On 03/03, Richard Weinberger wrote:
>>
>> +static inline int translate_signal(int sig)
>> +{
>> + struct thread_info *info = current_thread_info();
>> +
>> + if (info->exec_domain
>
> Afaics it can't be NULL.
Good point. Will change.
>> && info->exec_domain->signal_invmap && sig < 32)
>> + return info->exec_domain->signal_invmap[sig];
>> +
>
> And why default_exec_domain has .signal_invmap = ident_map ?
> translate_signal-like code should check ->signal_invmap != NULL
> anyway.
>
> Off topic, but can't we kill exec_domain->signal_map ? it seems that
> it is unused.
>
> Hmm. And who actually uses exec_domain->handler() ?? asm-offsets.c,
> but I do not see any usage of TI_EXEC_DOMAIN.
>
> In short: I agree with this change but I am totally confused. To the
> point, I am not sure I even understand ->signal_invmap. I mean, it
> seems that only arthur_exec_domain has a non-ident map. Why, say,
> x86 does signr_convert() ? and only if CONFIG_X86_32? Is there any
> external module which does register_exec_domain(strange_invmap) ?
I remember a discussion with Al where he noted that register_exec_domain()
is currently only used by out of tree horrors. B-)
I'm sure we can rip it out of most archs. They seem to have it only because
they've copy&pasted it from i386.
Thanks,
//richard
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 28/44] Add translate_signal() helper
2014-03-04 20:43 ` Richard Weinberger
@ 2014-03-04 21:00 ` Christoph Hellwig
0 siblings, 0 replies; 18+ messages in thread
From: Christoph Hellwig @ 2014-03-04 21:00 UTC (permalink / raw)
To: Richard Weinberger
Cc: Oleg Nesterov, 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, cmetcalf,
gxt, linux-xtensa, akpm, tj, hch
On Tue, Mar 04, 2014 at 09:43:10PM +0100, Richard Weinberger wrote:
> I remember a discussion with Al where he noted that register_exec_domain()
> is currently only used by out of tree horrors. B-)
>
> I'm sure we can rip it out of most archs. They seem to have it only because
> they've copy&pasted it from i386.
We do have a few in-tree uses obviously. Would be good to know how much
of that actuall is used.
Except for that the major users is iBCS which became linux-abi long time
ago. I think someone is still keeing it on life support and
occasionally forward porting it, but that's not a reason to keep any of
this in tree. Back when I maintained it linux-abi already was a large
patch to core code and not just modules, and I doubt that has changed in
the last 10 years.
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 28/44] Add translate_signal() helper
@ 2014-03-04 21:00 ` Christoph Hellwig
0 siblings, 0 replies; 18+ messages in thread
From: Christoph Hellwig @ 2014-03-04 21:00 UTC (permalink / raw)
To: Richard Weinberger
Cc: Oleg Nesterov, 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, cmetcalf,
gxt, linux-xtensa, akpm, tj, hch
On Tue, Mar 04, 2014 at 09:43:10PM +0100, Richard Weinberger wrote:
> I remember a discussion with Al where he noted that register_exec_domain()
> is currently only used by out of tree horrors. B-)
>
> I'm sure we can rip it out of most archs. They seem to have it only because
> they've copy&pasted it from i386.
We do have a few in-tree uses obviously. Would be good to know how much
of that actuall is used.
Except for that the major users is iBCS which became linux-abi long time
ago. I think someone is still keeing it on life support and
occasionally forward porting it, but that's not a reason to keep any of
this in tree. Back when I maintained it linux-abi already was a large
patch to core code and not just modules, and I doubt that has changed in
the last 10 years.
^ permalink raw reply [flat|nested] 18+ messages in thread
end of thread, other threads:[~2014-03-04 21:00 UTC | newest]
Thread overview: 18+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-03-02 23:59 [PATCH 23/44] unicore32: Use get_signal() signal_setup_done() Richard Weinberger
2014-03-02 23:59 ` [PATCH 24/44] xtensa: " Richard Weinberger
2014-03-02 23:59 ` [PATCH 25/44] Rip out get_signal_to_deliver() Richard Weinberger
2014-03-02 23:59 ` [PATCH 26/44] tracehook_signal_handler: Remove sig, info, ka and regs Richard Weinberger
2014-03-02 23:59 ` [PATCH 27/44] Clean up signal_delivered() Richard Weinberger
2014-03-02 23:59 ` [PATCH 28/44] Add translate_signal() helper Richard Weinberger
2014-03-04 18:41 ` Oleg Nesterov
2014-03-04 20:43 ` Richard Weinberger
2014-03-04 21:00 ` Christoph Hellwig
2014-03-04 21:00 ` Christoph Hellwig
2014-03-02 23:59 ` [PATCH 29/44] arc: Use translate_signal() Richard Weinberger
2014-03-03 4:32 ` Vineet Gupta
2014-03-02 23:59 ` [PATCH 30/44] arm: " Richard Weinberger
2014-03-02 23:59 ` [PATCH 31/44] arm64: " Richard Weinberger
2014-03-02 23:59 ` [PATCH 32/44] blackfin: " Richard Weinberger
2014-03-02 23:59 ` [PATCH 33/44] frv: " Richard Weinberger
2014-03-02 23:59 ` [PATCH 34/44] m32r: " Richard Weinberger
2014-03-02 23:59 ` [PATCH 35/44] m68k: " 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.