X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=kernel%2Fexit.c;h=29617024d245a36b90e0f1399366485e3594d74b;hb=refs%2Fheads%2Fvserver;hp=17987bc019b35a5ebe039513c70706fb426ca1ee;hpb=e0ff8aa1acd079b70e796571917ae0449b7c465b;p=linux-2.6.git diff --git a/kernel/exit.c b/kernel/exit.c index 17987bc01..29617024d 100644 --- a/kernel/exit.c +++ b/kernel/exit.c @@ -13,13 +13,17 @@ #include #include #include -#include +#include #include #include #include #include +#include #include #include +#include +#include +#include #include #include #include @@ -38,9 +42,12 @@ #include #include /* for audit_free() */ #include +#include #include #include #include +#include +#include #include #include @@ -48,7 +55,6 @@ #include extern void sem_exit (void); -extern struct task_struct *child_reaper; static void exit_mm(struct task_struct * tsk); @@ -128,6 +134,7 @@ static void __exit_signal(struct task_struct *tsk) flush_sigqueue(&tsk->pending); if (sig) { flush_sigqueue(&sig->shared_pending); + taskstats_tgid_free(sig); __cleanup_signal(sig); } } @@ -141,11 +148,12 @@ void release_task(struct task_struct * p) { struct task_struct *leader; int zap_leader; + int inhibited_leader; repeat: + tracehook_release_task(p); atomic_dec(&p->user->processes); write_lock_irq(&tasklist_lock); - ptrace_unlink(p); - BUG_ON(!list_empty(&p->ptrace_list) || !list_empty(&p->ptrace_children)); + BUG_ON(tracehook_check_released(p)); __exit_signal(p); /* @@ -154,10 +162,14 @@ repeat: * group leader's parent process. (if it wants notification.) */ zap_leader = 0; + inhibited_leader = 0; leader = p->group_leader; if (leader != p && thread_group_empty(leader) && leader->exit_state == EXIT_ZOMBIE) { BUG_ON(leader->exit_signal == -1); - do_notify_parent(leader, leader->exit_signal); + if (tracehook_inhibit_wait_zombie(leader)) + inhibited_leader = 1; + else + do_notify_parent(leader, leader->exit_signal); /* * If we were the last child thread and the leader has * exited already, and the leader's parent ignores SIGCHLD, @@ -178,6 +190,13 @@ repeat: p = leader; if (unlikely(zap_leader)) goto repeat; + + /* + * If tracing usurps normal reaping of the leader, tracing needs + * to be notified it would normally be reapable now. + */ + if (unlikely(inhibited_leader)) + tracehook_report_delayed_group_leader(leader); } /* @@ -188,21 +207,18 @@ repeat: int session_of_pgrp(int pgrp) { struct task_struct *p; - int sid = -1; + int sid = 0; read_lock(&tasklist_lock); - do_each_task_pid(pgrp, PIDTYPE_PGID, p) { - if (p->signal->session > 0) { - sid = p->signal->session; - goto out; - } - } while_each_task_pid(pgrp, PIDTYPE_PGID, p); - p = find_task_by_pid(pgrp); - if (p) - sid = p->signal->session; -out: + + p = find_task_by_pid_type(PIDTYPE_PGID, pgrp); + if (p == NULL) + p = find_task_by_pid(pgrp); + if (p != NULL) + sid = process_session(p); + read_unlock(&tasklist_lock); - + return sid; } @@ -222,10 +238,10 @@ static int will_become_orphaned_pgrp(int pgrp, struct task_struct *ignored_task) do_each_task_pid(pgrp, PIDTYPE_PGID, p) { if (p == ignored_task || p->exit_state - || p->real_parent->pid == 1) + || is_init(p->parent)) continue; - if (process_group(p->real_parent) != pgrp - && p->real_parent->signal->session == p->signal->session) { + if (process_group(p->parent) != pgrp && + process_session(p->parent) == process_session(p)) { ret = 0; break; } @@ -252,17 +268,6 @@ static int has_stopped_jobs(int pgrp) do_each_task_pid(pgrp, PIDTYPE_PGID, p) { if (p->state != TASK_STOPPED) continue; - - /* If p is stopped by a debugger on a signal that won't - stop it, then don't count p as stopped. This isn't - perfect but it's a good approximation. */ - if (unlikely (p->ptrace) - && p->exit_code != SIGSTOP - && p->exit_code != SIGTSTP - && p->exit_code != SIGTTOU - && p->exit_code != SIGTTIN) - continue; - retval = 1; break; } while_each_task_pid(pgrp, PIDTYPE_PGID, p); @@ -270,7 +275,8 @@ static int has_stopped_jobs(int pgrp) } /** - * reparent_to_init - Reparent the calling kernel thread to the init task. + * reparent_to_init - Reparent the calling kernel thread to the init task + * of the pid space that the thread belongs to. * * If a kernel thread is launched as a result of a system call, or if * it ever exits, it should generally reparent itself to init so that @@ -285,19 +291,15 @@ static void reparent_to_init(void) { write_lock_irq(&tasklist_lock); - ptrace_unlink(current); /* Reparent to init */ remove_parent(current); - current->parent = child_reaper; - current->real_parent = child_reaper; + current->parent = child_reaper(current); add_parent(current); /* Set the exit signal to SIGCHLD so we signal init on exit */ current->exit_signal = SIGCHLD; - if ((current->policy == SCHED_NORMAL || - current->policy == SCHED_BATCH) - && (task_nice(current) < 0)) + if (!has_rt_policy(current) && (task_nice(current) < 0)) set_user_nice(current, 0); /* cpus_allowed? */ /* rt_priority? */ @@ -314,9 +316,9 @@ void __set_special_pids(pid_t session, pid_t pgrp) { struct task_struct *curr = current->group_leader; - if (curr->signal->session != session) { + if (process_session(curr) != session) { detach_pid(curr, PIDTYPE_SID); - curr->signal->session = session; + set_signal_session(curr->signal, session); attach_pid(curr, PIDTYPE_SID, session); } if (process_group(curr) != pgrp) { @@ -326,7 +328,7 @@ void __set_special_pids(pid_t session, pid_t pgrp) } } -void set_special_pids(pid_t session, pid_t pgrp) +static void set_special_pids(pid_t session, pid_t pgrp) { write_lock_irq(&tasklist_lock); __set_special_pids(session, pgrp); @@ -409,9 +411,11 @@ void daemonize(const char *name, ...) fs = init_task.fs; current->fs = fs; atomic_inc(&fs->count); - exit_namespace(current); - current->namespace = init_task.namespace; - get_namespace(current->namespace); + + exit_task_namespaces(current); + current->nsproxy = init_task.nsproxy; + get_task_namespaces(current); + exit_files(current); current->files = init_task.files; atomic_inc(¤t->files->count); @@ -437,7 +441,7 @@ static void close_files(struct files_struct * files) for (;;) { unsigned long set; i = j * __NFDBITS; - if (i >= fdt->max_fdset || i >= fdt->max_fds) + if (i >= fdt->max_fds) break; set = fdt->open_fds->fds_bits[j++]; while (set) { @@ -480,9 +484,7 @@ void fastcall put_files_struct(struct files_struct *files) * you can free files immediately. */ fdt = files_fdtable(files); - if (fdt == &files->fdtab) - fdt->free_files = files; - else + if (fdt != &files->fdtab) kmem_cache_free(files_cachep, files); free_fdtable(fdt); } @@ -490,6 +492,18 @@ void fastcall put_files_struct(struct files_struct *files) EXPORT_SYMBOL(put_files_struct); +void reset_files_struct(struct task_struct *tsk, struct files_struct *files) +{ + struct files_struct *old; + + old = tsk->files; + task_lock(tsk); + tsk->files = files; + task_unlock(tsk); + put_files_struct(old); +} +EXPORT_SYMBOL(reset_files_struct); + static inline void __exit_files(struct task_struct *tsk) { struct files_struct * files = tsk->files; @@ -519,6 +533,7 @@ static inline void __put_fs_struct(struct fs_struct *fs) dput(fs->altroot); mntput(fs->altrootmnt); } + atomic_dec(&vs_global_fs); kmem_cache_free(fs_cachep, fs); } } @@ -591,59 +606,48 @@ static inline void choose_new_parent(struct task_struct *p, struct task_struct *reaper) { /* check for reaper context */ - vxwprintk((p->xid != reaper->xid) && (reaper != child_reaper), + vxwprintk((p->xid != reaper->xid) && (reaper != child_reaper(p)), "rogue reaper: %p[%d,#%u] <> %p[%d,#%u]", p, p->pid, p->xid, reaper, reaper->pid, reaper->xid); + if (p == reaper) + reaper = vx_child_reaper(p); + /* * Make sure we're not reparenting to ourselves and that * the parent is not a zombie. */ BUG_ON(p == reaper || reaper->exit_state); - p->real_parent = reaper; + p->parent = reaper; } static void -reparent_thread(struct task_struct *p, struct task_struct *father, int traced) +reparent_thread(struct task_struct *p, struct task_struct *father) { - /* We don't want people slaying init. */ - if (p->exit_signal != -1) - p->exit_signal = SIGCHLD; - if (p->pdeath_signal) /* We already hold the tasklist_lock here. */ group_send_sig_info(p->pdeath_signal, SEND_SIG_NOINFO, p); /* Move the child from its dying parent to the new one. */ - if (unlikely(traced)) { - /* Preserve ptrace links if someone else is tracing this child. */ - list_del_init(&p->ptrace_list); - if (p->parent != p->real_parent) - list_add(&p->ptrace_list, &p->real_parent->ptrace_children); - } else { - /* If this child is being traced, then we're the one tracing it - * anyway, so let go of it. - */ - p->ptrace = 0; - remove_parent(p); - p->parent = p->real_parent; - add_parent(p); + list_move_tail(&p->sibling, &p->parent->children); - /* If we'd notified the old parent about this child's death, - * also notify the new parent. - */ - if (p->exit_state == EXIT_ZOMBIE && p->exit_signal != -1 && - thread_group_empty(p)) - do_notify_parent(p, p->exit_signal); - else if (p->state == TASK_TRACED) { - /* - * If it was at a trace stop, turn it into - * a normal stop since it's no longer being - * traced. - */ - ptrace_untrace(p); - } - } + /* If this is a threaded reparent there is no need to + * notify anyone anything has happened. + */ + if (p->parent->group_leader == father->group_leader) + return; + + /* We don't want people slaying init. */ + if (p->exit_signal != -1) + p->exit_signal = SIGCHLD; + + /* If we'd notified the old parent about this child's death, + * also notify the new parent. + */ + if (!tracehook_inhibit_wait_zombie(p) && + p->exit_state == EXIT_ZOMBIE && + p->exit_signal != -1 && thread_group_empty(p)) + do_notify_parent(p, p->exit_signal); /* * process group orphan check @@ -652,10 +656,11 @@ reparent_thread(struct task_struct *p, struct task_struct *father, int traced) * outside, so the child pgrp is now orphaned. */ if ((process_group(p) != process_group(father)) && - (p->signal->session == father->signal->session)) { + (process_session(p) == process_session(father))) { int pgrp = process_group(p); - if (will_become_orphaned_pgrp(pgrp, NULL) && has_stopped_jobs(pgrp)) { + if (will_become_orphaned_pgrp(pgrp, NULL) && + has_stopped_jobs(pgrp)) { __kill_pg_info(SIGHUP, SEND_SIG_PRIV, pgrp); __kill_pg_info(SIGCONT, SEND_SIG_PRIV, pgrp); } @@ -666,10 +671,11 @@ reparent_thread(struct task_struct *p, struct task_struct *father, int traced) * When we die, we re-parent all our children. * Try to give them to another thread in our thread * group, and if no such member exists, give it to - * the global child reaper process (ie "init") + * the child reaper process (ie "init") in our pid + * space. */ static void -forget_original_parent(struct task_struct *father, struct list_head *to_release) +forget_original_parent(struct task_struct *father) { struct task_struct *p, *reaper = father; struct list_head *_p, *_n; @@ -677,53 +683,16 @@ forget_original_parent(struct task_struct *father, struct list_head *to_release) do { reaper = next_thread(reaper); if (reaper == father) { + // reaper = child_reaper(father); reaper = vx_child_reaper(father); break; } } while (reaper->exit_state); - /* - * There are only two places where our children can be: - * - * - in our child list - * - in our ptraced child list - * - * Search them and reparent children. - */ list_for_each_safe(_p, _n, &father->children) { - int ptrace; p = list_entry(_p, struct task_struct, sibling); - - ptrace = p->ptrace; - - /* if father isn't the real parent, then ptrace must be enabled */ - BUG_ON(father != p->real_parent && !ptrace); - - if (father == p->real_parent) { - /* reparent with a reaper, real father it's us */ - choose_new_parent(p, vx_child_reaper(p)); - reparent_thread(p, father, 0); - } else { - /* reparent ptraced task to its real parent */ - __ptrace_unlink (p); - if (p->exit_state == EXIT_ZOMBIE && p->exit_signal != -1 && - thread_group_empty(p)) - do_notify_parent(p, p->exit_signal); - } - - /* - * if the ptraced child is a zombie with exit_signal == -1 - * we must collect it before we exit, or it will remain - * zombie forever since we prevented it from self-reap itself - * while it was being traced by us, to be able to see it in wait4. - */ - if (unlikely(ptrace && p->exit_state == EXIT_ZOMBIE && p->exit_signal == -1)) - list_add(&p->ptrace_list, to_release); - } - list_for_each_safe(_p, _n, &father->ptrace_children) { - p = list_entry(_p, struct task_struct, ptrace_list); choose_new_parent(p, reaper); - reparent_thread(p, father, 1); + reparent_thread(p, father); } } @@ -735,7 +704,8 @@ static void exit_notify(struct task_struct *tsk) { int state; struct task_struct *t; - struct list_head ptrace_dead, *_p, *_n; + int noreap; + void *cookie; if (signal_pending(tsk) && !(tsk->signal->flags & SIGNAL_GROUP_EXIT) && !thread_group_empty(tsk)) { @@ -771,10 +741,8 @@ static void exit_notify(struct task_struct *tsk) * jobs, send them a SIGHUP and then a SIGCONT. (POSIX 3.2.2.2) */ - INIT_LIST_HEAD(&ptrace_dead); - forget_original_parent(tsk, &ptrace_dead); + forget_original_parent(tsk); BUG_ON(!list_empty(&tsk->children)); - BUG_ON(!list_empty(&tsk->ptrace_children)); /* * Check to see if any process groups have become orphaned @@ -786,10 +754,10 @@ static void exit_notify(struct task_struct *tsk) * is about to become orphaned. */ - t = tsk->real_parent; + t = tsk->parent; if ((process_group(t) != process_group(tsk)) && - (t->signal->session == tsk->signal->session) && + (process_session(t) == process_session(tsk)) && will_become_orphaned_pgrp(process_group(tsk), tsk) && has_stopped_jobs(process_group(tsk))) { __kill_pg_info(SIGHUP, SEND_SIG_PRIV, process_group(tsk)); @@ -818,32 +786,18 @@ static void exit_notify(struct task_struct *tsk) && !capable(CAP_KILL)) tsk->exit_signal = SIGCHLD; - - /* If something other than our normal parent is ptracing us, then - * send it a SIGCHLD instead of honoring exit_signal. exit_signal - * only has special meaning to our real parent. - */ - if (tsk->exit_signal != -1 && thread_group_empty(tsk)) { - int signal = tsk->parent == tsk->real_parent ? tsk->exit_signal : SIGCHLD; - do_notify_parent(tsk, signal); - } else if (tsk->ptrace) { - do_notify_parent(tsk, SIGCHLD); - } + if (!tracehook_notify_death(tsk, &noreap, &cookie) + && tsk->exit_signal != -1 && thread_group_empty(tsk)) + do_notify_parent(tsk, tsk->exit_signal); state = EXIT_ZOMBIE; - if (tsk->exit_signal == -1 && - (likely(tsk->ptrace == 0) || - unlikely(tsk->parent->signal->flags & SIGNAL_GROUP_EXIT))) + if (tsk->exit_signal == -1 && !noreap) state = EXIT_DEAD; tsk->exit_state = state; write_unlock_irq(&tasklist_lock); - list_for_each_safe(_p, _n, &ptrace_dead) { - list_del_init(_p); - t = list_entry(_p, struct task_struct, ptrace_list); - release_task(t); - } + tracehook_report_death(tsk, state, cookie); /* If the process is dead, release it - nobody will wait for it */ if (state == EXIT_DEAD) @@ -853,9 +807,7 @@ static void exit_notify(struct task_struct *tsk) fastcall NORET_TYPE void do_exit(long code) { struct task_struct *tsk = current; - struct taskstats *tidstats; int group_dead; - unsigned int mycpu; profile_task_exit(tsk); @@ -865,14 +817,16 @@ fastcall NORET_TYPE void do_exit(long code) panic("Aiee, killing interrupt handler!"); if (unlikely(!tsk->pid)) panic("Attempted to kill the idle task!"); - if (unlikely(tsk == child_reaper)) - panic("Attempted to kill init!"); - - if (unlikely(current->ptrace & PT_TRACE_EXIT)) { - current->ptrace_message = code; - ptrace_notify((PTRACE_EVENT_EXIT << 8) | SIGTRAP); + if (unlikely(tsk == child_reaper(tsk))) { + if (tsk->nsproxy->pid_ns != &init_pid_ns) + tsk->nsproxy->pid_ns->child_reaper = init_pid_ns.child_reaper; + else + panic("Attempted to kill init!"); } + + tracehook_report_exit(&code); + /* * We're taking recursive faults here in do_exit. Safest is to just * leave this task alone and wait for reboot. @@ -888,13 +842,13 @@ fastcall NORET_TYPE void do_exit(long code) tsk->flags |= PF_EXITING; + ptrace_exit(tsk); + if (unlikely(in_atomic())) printk(KERN_INFO "note: %s[%d] exited with preempt_count %d\n", current->comm, current->pid, preempt_count()); - taskstats_exit_alloc(&tidstats, &mycpu); - acct_update_integrals(tsk); if (tsk->mm) { update_hiwater_rss(tsk->mm); @@ -905,15 +859,6 @@ fastcall NORET_TYPE void do_exit(long code) hrtimer_cancel(&tsk->signal->real_timer); exit_itimers(tsk->signal); } - - if (current->tux_info) { -#ifdef CONFIG_TUX_DEBUG - printk("Possibly unexpected TUX-thread exit(%ld) at %p?\n", - code, __builtin_return_address(0)); -#endif - current->tux_exit(); - } - acct_collect(code, group_dead); if (unlikely(tsk->robust_list)) exit_robust_list(tsk); @@ -923,8 +868,8 @@ fastcall NORET_TYPE void do_exit(long code) #endif if (unlikely(tsk->audit_context)) audit_free(tsk); - taskstats_exit_send(tsk, tidstats, group_dead, mycpu); - taskstats_exit_free(tidstats); + + taskstats_exit(tsk, group_dead); exit_mm(tsk); @@ -933,7 +878,6 @@ fastcall NORET_TYPE void do_exit(long code) exit_sem(tsk); __exit_files(tsk); __exit_fs(tsk); - exit_namespace(tsk); exit_thread(); cpuset_exit(tsk); exit_keys(tsk); @@ -947,9 +891,12 @@ fastcall NORET_TYPE void do_exit(long code) tsk->exit_code = code; proc_exit_connector(tsk); + exit_task_namespaces(tsk); + // ns = exit_task_namespaces_early(tsk); /* needs to stay before exit_notify() */ exit_vx_info_early(tsk, code); exit_notify(tsk); + // exit_task_namespaces(tsk, ns); #ifdef CONFIG_NUMA mpol_free(tsk->mempolicy); tsk->mempolicy = NULL; @@ -977,15 +924,15 @@ fastcall NORET_TYPE void do_exit(long code) exit_vx_info(tsk, code); exit_nx_info(tsk); - /* PF_DEAD causes final put_task_struct after we schedule. */ preempt_disable(); - BUG_ON(tsk->flags & PF_DEAD); - tsk->flags |= PF_DEAD; + /* causes final put_task_struct in finish_task_switch(). */ + tsk->state = TASK_DEAD; schedule(); BUG(); /* Avoid "noreturn function does return". */ - for (;;) ; + for (;;) + cpu_relax(); /* For when BUG is null */ } EXPORT_SYMBOL_GPL(do_exit); @@ -994,7 +941,7 @@ NORET_TYPE void complete_and_exit(struct completion *comp, long code) { if (comp) complete(comp); - + do_exit(code); } @@ -1058,10 +1005,9 @@ static int eligible_child(pid_t pid, int options, struct task_struct *p) } /* - * Do not consider detached threads that are - * not ptraced: + * Do not consider detached threads. */ - if (p->exit_signal == -1 && !p->ptrace) + if (p->exit_signal == -1) return 0; /* Wait for all children (clone and not) if __WALL is set; @@ -1132,7 +1078,7 @@ static int wait_task_zombie(struct task_struct *p, int noreap, if (unlikely(p->exit_state != EXIT_ZOMBIE)) return 0; - if (unlikely(p->exit_signal == -1 && p->ptrace == 0)) + if (unlikely(p->exit_signal == -1)) return 0; get_task_struct(p); read_unlock(&tasklist_lock); @@ -1156,15 +1102,9 @@ static int wait_task_zombie(struct task_struct *p, int noreap, BUG_ON(state != EXIT_DEAD); return 0; } - if (unlikely(p->exit_signal == -1 && p->ptrace == 0)) { - /* - * This can only happen in a race with a ptraced thread - * dying on another processor. - */ - return 0; - } + BUG_ON(p->exit_signal == -1); - if (likely(p->real_parent == p->parent) && likely(p->signal)) { + if (likely(p->signal)) { struct signal_struct *psig; struct signal_struct *sig; @@ -1246,28 +1186,8 @@ static int wait_task_zombie(struct task_struct *p, int noreap, return retval; } retval = p->pid; - if (p->real_parent != p->parent) { - write_lock_irq(&tasklist_lock); - /* Double-check with lock held. */ - if (p->real_parent != p->parent) { - __ptrace_unlink(p); - // TODO: is this safe? - p->exit_state = EXIT_ZOMBIE; - /* - * If this is not a detached task, notify the parent. - * If it's still not detached after that, don't release - * it now. - */ - if (p->exit_signal != -1) { - do_notify_parent(p, p->exit_signal); - if (p->exit_signal != -1) - p = NULL; - } - } - write_unlock_irq(&tasklist_lock); - } - if (p != NULL) - release_task(p); + release_task(p); + BUG_ON(!retval); return retval; } @@ -1286,7 +1206,7 @@ static int wait_task_stopped(struct task_struct *p, int delayed_group_leader, if (!p->exit_code) return 0; - if (delayed_group_leader && !(p->ptrace & PT_PTRACED) && + if (delayed_group_leader && p->signal && p->signal->group_stop_count > 0) /* * A group stop is in progress and this is the group leader. @@ -1307,14 +1227,13 @@ static int wait_task_stopped(struct task_struct *p, int delayed_group_leader, if (unlikely(noreap)) { pid_t pid = p->pid; uid_t uid = p->uid; - int why = (p->ptrace & PT_PTRACED) ? CLD_TRAPPED : CLD_STOPPED; exit_code = p->exit_code; if (unlikely(!exit_code) || unlikely(p->state & TASK_TRACED)) goto bail_ref; - return wait_noreap_copyout(p, pid, uid, - why, (exit_code << 8) | 0x7f, + return wait_noreap_copyout(p, pid, uid, CLD_STOPPED, + (exit_code << 8) | 0x7f, infop, ru); } @@ -1370,9 +1289,7 @@ bail_ref: if (!retval && infop) retval = put_user(0, &infop->si_errno); if (!retval && infop) - retval = put_user((short)((p->ptrace & PT_PTRACED) - ? CLD_TRAPPED : CLD_STOPPED), - &infop->si_code); + retval = put_user((short)CLD_STOPPED, &infop->si_code); if (!retval && infop) retval = put_user(exit_code, &infop->si_status); if (!retval && infop) @@ -1440,22 +1357,6 @@ static int wait_task_continued(struct task_struct *p, int noreap, } -static inline int my_ptrace_child(struct task_struct *p) -{ - if (!(p->ptrace & PT_PTRACED)) - return 0; - if (!(p->ptrace & PT_ATTACHED)) - return 1; - /* - * This child was PTRACE_ATTACH'd. We should be seeing it only if - * we are the attacher. If we are the real parent, this is a race - * inside ptrace_attach. It is waiting for the tasklist_lock, - * which we have to switch the parent links, but has already set - * the flags in p->ptrace. - */ - return (p->parent != p->real_parent); -} - static long do_wait(pid_t pid, int options, struct siginfo __user *infop, int __user *stat_addr, struct rusage __user *ru) { @@ -1487,26 +1388,17 @@ repeat: switch (p->state) { case TASK_TRACED: - /* - * When we hit the race with PTRACE_ATTACH, - * we will not report this child. But the - * race means it has not yet been moved to - * our ptrace_children list, so we need to - * set the flag here to avoid a spurious ECHILD - * when the race happens with the only child. - */ flag = 1; - if (!my_ptrace_child(p)) - continue; - /*FALLTHROUGH*/ + continue; case TASK_STOPPED: /* * It's stopped now, so it might later * continue, exit, or stop again. */ flag = 1; - if (!(options & WUNTRACED) && - !my_ptrace_child(p)) + if (!(options & WUNTRACED)) + continue; + if (tracehook_inhibit_wait_stopped(p)) continue; retval = wait_task_stopped(p, ret == 2, (options & WNOWAIT), @@ -1531,6 +1423,10 @@ repeat: goto check_continued; if (!likely(options & WEXITED)) continue; + if (tracehook_inhibit_wait_zombie(p)) { + flag = 1; + continue; + } retval = wait_task_zombie( p, (options & WNOWAIT), infop, stat_addr, ru); @@ -1547,6 +1443,8 @@ check_continued: flag = 1; if (!unlikely(options & WCONTINUED)) continue; + if (tracehook_inhibit_wait_continued(p)) + continue; retval = wait_task_continued( p, (options & WNOWAIT), infop, stat_addr, ru); @@ -1555,16 +1453,15 @@ check_continued: break; } } - if (!flag) { - list_for_each(_p, &tsk->ptrace_children) { - p = list_entry(_p, struct task_struct, - ptrace_list); - if (!eligible_child(pid, options, p)) - continue; - flag = 1; - break; - } + + retval = ptrace_do_wait(tsk, pid, options, + infop, stat_addr, ru); + if (retval != -ECHILD) { + flag = 1; + if (retval != 0) /* He released the lock. */ + goto end; } + if (options & __WNOTHREAD) break; tsk = next_thread(tsk); @@ -1588,7 +1485,7 @@ end: remove_wait_queue(¤t->signal->wait_chldexit,&wait); if (infop) { if (retval > 0) - retval = 0; + retval = 0; else { /* * For a WNOHANG return, clear out all the fields