moonjuice/kernel_arpi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

signal: Remove SEND_SIG_FORCED

Browse Source 
There are no more users of SEND_SIG_FORCED so it may be safely removed.

Remove the definition of SEND_SIG_FORCED, it's use in is_si_special,
it's use in TP_STORE_SIGINFO, and it's use in __send_signal as without
any users the uses of SEND_SIG_FORCED are now unncessary.

This makes the code simpler, easier to understand and use.  Users of
signal sending functions now no longer need to ask themselves do I
need to use SEND_SIG_FORCED.

Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
This commit is contained in:
Eric W. Biederman
2018-09-03 10:39:04 +02:00
parent 079b22dc9b
commit 4ff4c31a6e
3 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/linux/sched/signal.h
View File

@@ -477,7 +477,6 @@ static inline int kill_cad_pid(int sig, int priv)
/* These can be the second arg to send_sig_info/send_group_sig_info. */ /* These can be the second arg to send_sig_info/send_group_sig_info. */
#define SEND_SIG_NOINFO ((struct siginfo *) 0) #define SEND_SIG_NOINFO ((struct siginfo *) 0)
#define SEND_SIG_PRIV ((struct siginfo *) 1) #define SEND_SIG_PRIV ((struct siginfo *) 1)
#define SEND_SIG_FORCED ((struct siginfo *) 2)
/* /*
* True if we are on the alternate signal stack. * True if we are on the alternate signal stack.

3
include/trace/events/signal.h
View File

@@ -11,8 +11,7 @@
#define TP_STORE_SIGINFO(__entry, info) \ #define TP_STORE_SIGINFO(__entry, info) \
do { \ do { \
if (info == SEND_SIG_NOINFO || \ if (info == SEND_SIG_NOINFO) { \
info == SEND_SIG_FORCED) { \
__entry->errno = 0; \ __entry->errno = 0; \
__entry->code = SI_USER; \ __entry->code = SI_USER; \
} else if (info == SEND_SIG_PRIV) { \ } else if (info == SEND_SIG_PRIV) { \

7
kernel/signal.c
View File

@@ -736,7 +736,7 @@ static void flush_sigqueue_mask(sigset_t *mask, struct sigpending *s)
static inline int is_si_special(const struct siginfo *info) static inline int is_si_special(const struct siginfo *info)
{ {
return info <= SEND_SIG_FORCED; return info <= SEND_SIG_PRIV;
} }
static inline bool si_fromuser(const struct siginfo *info) static inline bool si_fromuser(const struct siginfo *info)
@@ -1039,7 +1039,7 @@ static int __send_signal(int sig, struct siginfo *info, struct task_struct *t,
result = TRACE_SIGNAL_IGNORED; result = TRACE_SIGNAL_IGNORED;
if (!prepare_signal(sig, t, if (!prepare_signal(sig, t,
from_ancestor_ns || (info == SEND_SIG_PRIV) || (info == SEND_SIG_FORCED))) from_ancestor_ns || (info == SEND_SIG_PRIV)))
goto ret; goto ret;
pending = (type != PIDTYPE_PID) ? &t->signal->shared_pending : &t->pending; pending = (type != PIDTYPE_PID) ? &t->signal->shared_pending : &t->pending;
@@ -1057,8 +1057,7 @@ static int __send_signal(int sig, struct siginfo *info, struct task_struct *t,
* Skip useless siginfo allocation for SIGKILL SIGSTOP, * Skip useless siginfo allocation for SIGKILL SIGSTOP,
* and kernel threads. * and kernel threads.
*/ */
if ((info == SEND_SIG_FORCED) || if (sig_kernel_only(sig) || (t->flags & PF_KTHREAD))
sig_kernel_only(sig) || (t->flags & PF_KTHREAD))
goto out_set; goto out_set;
/* /*