move exit_ptrace() from forget_original_parent() to do_exit()
PATCH 3/4 move exit_ptrace() from forget_original_parent() to do_exit()
By discussion with Roland.
Call exit_ptrace() from do_exit(), no need to delay this call until forget_original_parent().
If we ever change exit_ptrace() to do the blocking calls, it makes sense to move it after exit_signals().
kernel/exit.c renamed from kernel/exit.c~3_MOVE +1 -2
@@ -803,8 +803,6 @@ static void forget_original_parent(strucstruct task_struct *p, *n, *reaper;LIST_HEAD (dead_childs); -exit_ptrace (father); -write_lock_irq (&tasklist_lock); reaper =find_new_reaper (father);
@@ -956,6 +954,7 @@ NORET_TYPE void do_exit(long code)schedule (); } +exit_ptrace (tsk);exit_signals (tsk);/* sets PF_EXITING */ /* * tsk->flags are checked in the futex code to protect against
Quoted 2 lines
If we ever change
exit_ptrace()to do the blocking calls, it makes sense to move it afterexit_signals().
I'm not sure I understand this comment. I guess you just mean that if we block, we should be sure to do the exit_signals() pass-the-pending-buck work afterwards. OK. But I think we want it after exit_signals anyway so that ptrace_traceme() can check PF_EXITING (cf 1/4 review).
Also, I think this patch should be the very last of the series. The others reorganize code but we don't think they really reorder anything. This one we thinks reorders things in a way that's fine, but it clearly does a big shift of the ordering of where ptrace cleanups happen relative to lots of other tear-down. So that seems the most likely to cause some unimagined subtle regression down the line. If it comes to a bisect that hits this patch, I think we'd rather be comparing one with all those tweaks to forget_original_parent merged in as the baseline than juggling their incremental effects after this one's big reordering.
Thanks,
Roland
Quoted 7 lines · Roland McGrath
Quoted 3 lines
If we ever change
exit_ptrace()to do the blocking calls, it makes sense to move it afterexit_signals().I'm not sure I understand this comment. I guess you just mean that if we block, we should be sure to do the
exit_signals()pass-the-pending-buck work afterwards.
Another reason: it is better to set PF_EXITING asap, before doing something which can block/etc. PF_EXITING means that complete_signal()->wants_signal() will not pick us as ->curr_target.
Quoted 2 lines
OK. But I think we want it after
exit_signalsanyway so thatptrace_traceme()can checkPF_EXITING(cf 1/4 review).
Yes, you are right.
Quoted 1 line
Also, I think this patch should be the very last of the series.
Agreed.
Oleg.