hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

make do_notify_parent() return bool 

- change do_notify_parent() to return a boolean, true if the task should
  be reaped because its parent ignores SIGCHLD.

- update the only caller which checks the returned value, exit_notify().

This temporary uglifies exit_notify() even more, will be cleanuped by
the next change.

Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Acked-by: Tejun Heo <tj@kernel.org>
This commit is contained in:
Oleg Nesterov 2011-06-22 23:08:18 +02:00
parent 06d984737b
commit 53c8f9f199
3 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/linux/sched.h
View File

@ -2145,7 +2145,7 @@ static inline int dequeue_signal_lock(struct task_struct *tsk, sigset_t *mask, s
spin_unlock_irqrestore(&tsk->sighand->siglock, flags); spin_unlock_irqrestore(&tsk->sighand->siglock, flags);
return ret; return ret;
} }
extern void block_all_signals(int (*notifier)(void *priv), void *priv, extern void block_all_signals(int (*notifier)(void *priv), void *priv,
sigset_t *mask); sigset_t *mask);
@ -2160,7 +2160,7 @@ extern int kill_pid_info_as_uid(int, struct siginfo *, struct pid *, uid_t, uid_
extern int kill_pgrp(struct pid *pid, int sig, int priv); extern int kill_pgrp(struct pid *pid, int sig, int priv);
extern int kill_pid(struct pid *pid, int sig, int priv); extern int kill_pid(struct pid *pid, int sig, int priv);
extern int kill_proc_info(int, struct siginfo *, pid_t); extern int kill_proc_info(int, struct siginfo *, pid_t);
extern int do_notify_parent(struct task_struct *, int); extern bool do_notify_parent(struct task_struct *, int);
extern void __wake_up_parent(struct task_struct *p, struct task_struct *parent); extern void __wake_up_parent(struct task_struct *p, struct task_struct *parent);
extern void force_sig(int, struct task_struct *); extern void force_sig(int, struct task_struct *);
extern int send_sig(int, struct task_struct *, int); extern int send_sig(int, struct task_struct *, int);

9
kernel/exit.c
View File

@ -820,6 +820,7 @@ static void forget_original_parent(struct task_struct *father)
static void exit_notify(struct task_struct *tsk, int group_dead) static void exit_notify(struct task_struct *tsk, int group_dead)
{ {
int signal; int signal;
bool autoreap;
void *cookie; void *cookie;
/* /*
@ -858,9 +859,11 @@ static void exit_notify(struct task_struct *tsk, int group_dead)
signal = tracehook_notify_death(tsk, &cookie, group_dead); signal = tracehook_notify_death(tsk, &cookie, group_dead);
if (signal >= 0) if (signal >= 0)
signal = do_notify_parent(tsk, signal); autoreap = do_notify_parent(tsk, signal);
else
autoreap = (signal == DEATH_REAP);
tsk->exit_state = signal == DEATH_REAP ? EXIT_DEAD : EXIT_ZOMBIE; tsk->exit_state = autoreap ? EXIT_DEAD : EXIT_ZOMBIE;
/* mt-exec, de_thread() is waiting for group leader */ /* mt-exec, de_thread() is waiting for group leader */
if (unlikely(tsk->signal->notify_count < 0)) if (unlikely(tsk->signal->notify_count < 0))
@ -868,7 +871,7 @@ static void exit_notify(struct task_struct *tsk, int group_dead)
write_unlock_irq(&tasklist_lock); write_unlock_irq(&tasklist_lock);
/* If the process is dead, release it - nobody will wait for it */ /* If the process is dead, release it - nobody will wait for it */
if (signal == DEATH_REAP) if (autoreap)
release_task(tsk); release_task(tsk);
} }

17
kernel/signal.c
View File

@ -1577,15 +1577,15 @@ ret:
* Let a parent know about the death of a child. * Let a parent know about the death of a child.
* For a stopped/continued status change, use do_notify_parent_cldstop instead. * For a stopped/continued status change, use do_notify_parent_cldstop instead.
* *
* Returns -1 if our parent ignored us and so we've switched to * Returns true if our parent ignored us and so we've switched to
* self-reaping, or else @sig. * self-reaping.
*/ */
int do_notify_parent(struct task_struct *tsk, int sig) bool do_notify_parent(struct task_struct *tsk, int sig)
{ {
struct siginfo info; struct siginfo info;
unsigned long flags; unsigned long flags;
struct sighand_struct *psig; struct sighand_struct *psig;
int ret = sig; bool autoreap = false;
BUG_ON(sig == -1); BUG_ON(sig == -1);
@ -1649,16 +1649,17 @@ int do_notify_parent(struct task_struct *tsk, int sig)
* is implementation-defined: we do (if you don't want * is implementation-defined: we do (if you don't want
* it, just use SIG_IGN instead). * it, just use SIG_IGN instead).
*/ */
ret = tsk->exit_signal = -1; autoreap = true;
tsk->exit_signal = -1;
if (psig->action[SIGCHLD-1].sa.sa_handler == SIG_IGN) if (psig->action[SIGCHLD-1].sa.sa_handler == SIG_IGN)
sig = -1; sig = 0;
} }
if (valid_signal(sig) && sig > 0) if (valid_signal(sig) && sig)
__group_send_sig_info(sig, &info, tsk->parent); __group_send_sig_info(sig, &info, tsk->parent);
__wake_up_parent(tsk, tsk->parent); __wake_up_parent(tsk, tsk->parent);
spin_unlock_irqrestore(&psig->siglock, flags); spin_unlock_irqrestore(&psig->siglock, flags);
return ret; return autoreap;
} }
/** /**