Skip to contentSkip to conversation

ptrace: kill the now unneeded args from tracehook_finish_clone() path

RFC PATCH In review Oleg Nesterov 2 participants 2 messages May 25, 2009 – May 26, 2009

Subsystems (5)
lore
Share & tools
lore

Oleg Nesterov

author maintainer
#0 lore raw

RFC PATCH 1/1 ptrace: kill the now unneeded args from tracehook_finish_clone() path

With the previous change tracehook_finish_clone() and ptrace_init_task() do not need any arguments except "child", remove them.

 include/linux/ptrace.h    |    7 +++----
 include/linux/tracehook.h |   10 +++-------
 kernel/fork.c             |    2 +-
 3 files changed, 7 insertions(+), 12 deletions(-)
include/linux/ptrace.h renamed from include/linux/ptrace.h~4_FORK_TRACE +3 -4
@@ -162,20 +162,19 @@ static inline int ptrace_event(int mask,
 /**
  * ptrace_init_task - initialize ptrace state for a new child
  * @child:		new child task
- * @ptrace:		true if child should be ptrace'd by parent's tracer
  *
  * This is called immediately after adding @child to its parent's children
- * list.  @ptrace is false in the normal case, and true to ptrace @child.
+ * list.
  *
  * Called with current's siglock and write_lock_irq(&tasklist_lock) held.
  */
-static inline void ptrace_init_task(struct task_struct *child, bool ptrace)
+static inline void ptrace_init_task(struct task_struct *child)
 {
 	INIT_LIST_HEAD(&child->ptrace_entry);
 	INIT_LIST_HEAD(&child->ptraced);
 	child->parent = child->real_parent;
 	child->ptrace = 0;
-	if (unlikely(ptrace)) {
+	if (unlikely(child->ptrace_task)) {
 		child->ptrace = current->ptrace;
 		ptrace_link(child, current->parent);
 	}
include/linux/tracehook.h renamed from include/linux/tracehook.h~4_FORK_TRACE +3 -7
@@ -219,7 +219,7 @@ static inline void tracehook_report_exit
  * @clone_flags:	%CLONE_* flags from clone/fork/vfork system call
  *
  * This is called before a new user task is to be cloned.
- * Its return value will be passed to tracehook_finish_clone().
+ * Its return value will be passed to tracehook_init_task().
  *
  * Called with no locks held.
  */
@@ -275,18 +275,14 @@ static inline void tracehook_free_task(s
 /**
  * tracehook_finish_clone - new child created and being attached
  * @child:		new child task
- * @clone_flags:	%CLONE_* flags from clone/fork/vfork system call
- * @trace:		return value from tracehook_prepare_clone()
  *
  * This is called immediately after adding @child to its parent's children list.
- * The @trace value is that returned by tracehook_prepare_clone().
  *
  * Called with current's siglock and write_lock_irq(&tasklist_lock) held.
  */
-static inline void tracehook_finish_clone(struct task_struct *child,
-					  unsigned long clone_flags, int trace)
+static inline void tracehook_finish_clone(struct task_struct *child)
 {
-	ptrace_init_task(child, (clone_flags & CLONE_PTRACE) || trace);
+	ptrace_init_task(child);
 }
 
 /**
kernel/fork.c renamed from kernel/fork.c~4_FORK_TRACE +1 -1
@@ -1247,7 +1247,7 @@ static struct task_struct *copy_process(
 
 	if (likely(p->pid)) {
 		list_add_tail(&p->sibling, &p->real_parent->children);
-		tracehook_finish_clone(p, clone_flags, trace);
+		tracehook_finish_clone(p);
 
 		if (thread_group_leader(p)) {
 			if (clone_flags & CLONE_NEWPID)
#1 lore raw

include/linux/ptrace.h static inline int ptrace_event(int mask, · line 177

Quoted 1 line
include/linux/ptrace.h renamed from include/linux/ptrace.h~4_FORK_TRACE +1 -0
+	if (unlikely(child->ptrace_task)) {

This merits a comment explaining that tracehook_init_task() will have allocated the struct if and only if we decided to propagate its creator's ptrace settings to it.

Thanks,
Roland