Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit daded34b authored by Roland McGrath's avatar Roland McGrath Committed by Linus Torvalds
Browse files

tracehook: vfork-done 



This moves the PTRACE_EVENT_VFORK_DONE tracing into a tracehook.h inline,
tracehook_report_vfork_done().  The change has no effect, just clean-up.

Signed-off-by: default avatarRoland McGrath <roland@redhat.com>
Cc: Oleg Nesterov <oleg@tv-sign.ru>
Reviewed-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 09a05394

include/linux/tracehook.h

+18 −0
Original line number Diff line number Diff line
@@ -210,4 +210,22 @@ static inline void tracehook_report_clone_complete(int trace, 
		ptrace_event(0, trace, pid);

}



/**

 * tracehook_report_vfork_done - vfork parent's child has exited or exec'd

 * @child:		child task, already running

 * @pid:		new child's PID in the parent's namespace

 *

 * Called after a %CLONE_VFORK parent has waited for the child to complete.

 * The clone/vfork system call will return immediately after this.

 * The @child pointer may be invalid if a self-reaping child died and

 * tracehook_report_clone() took no action to prevent it from self-reaping.

 *

 * Called with no locks held.

 */

static inline void tracehook_report_vfork_done(struct task_struct *child,

					       pid_t pid)

{

	ptrace_event(PT_TRACE_VFORK_DONE, PTRACE_EVENT_VFORK_DONE, pid);

}



#endif	/* <linux/tracehook.h> */

kernel/fork.c

+1 −4
Original line number Diff line number Diff line
@@ -1414,10 +1414,7 @@ long do_fork(unsigned long clone_flags, 
			freezer_do_not_count();

			wait_for_completion(&vfork);

			freezer_count();

			if (unlikely (current->ptrace & PT_TRACE_VFORK_DONE)) {

				current->ptrace_message = nr;

				ptrace_notify ((PTRACE_EVENT_VFORK_DONE << 8) | SIGTRAP);

			}

			tracehook_report_vfork_done(p, nr);

		}

	} else {

		nr = PTR_ERR(p);