Skip to contentSkip to conversation

introduce tracehook_finish_jctl() helper

PATCH In review Oleg Nesterov 3 participants 6 messages Jul 29, 2009 – Aug 3, 2009 Tracing

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 introduce tracehook_finish_jctl() helper

(textually depends on signals-tracehook_notify_jctl-change.patch)

Introduce the empty inline tracehook_finish_jctl() helper called by do_signal_stop() after wakeup.

Currently we lack the ability to report this state change.

Also fix the comment, it should be placed before schedule().

---

 include/linux/tracehook.h |    9 +++++++++
 kernel/signal.c           |    2 ++
 2 files changed, 11 insertions(+)
include/linux/tracehook.h renamed from include/linux/tracehook.h~2_FINISH_JCTL +9 -0
@@ -521,6 +521,15 @@ static inline int tracehook_notify_jctl(
 	return notify ?: (current->ptrace & PT_PTRACED) ? why : 0;
 }
 
+/**
+ * tracehook_finish_jctl - report about return from job control stop
+ *
+ * This is called by do_signal_stop() after wakeup.
+ */
+static inline void tracehook_finish_jctl(void)
+{
+}
+
 #define DEATH_REAP			-1
 #define DEATH_DELAYED_GROUP_LEADER	-2
 
kernel/signal.c renamed from kernel/signal.c~2_FINISH_JCTL +3 -3
@@ -1735,12 +1735,12 @@ static int do_signal_stop(int signr)
 		read_unlock(&tasklist_lock);
 	}
 
+	/* Now we don't run again until woken by SIGCONT or SIGKILL */
 	do {
 		schedule();
 	} while (try_to_freeze());
-	/*
-	 * Now we don't run again until continued.
-	 */
+
+	tracehook_finish_jctl();
 	current->exit_code = 0;
 
 	return 1;
#2 lore raw
In reply to Oleg Nesterov
Quoted 41 lines · On Wed, 29 Jul 2009 04:01:40 +0200 Oleg Nesterov <[email protected]> wrote:

(textually depends on signals-tracehook_notify_jctl-change.patch)

Introduce the empty inline tracehook_finish_jctl() helper called by do_signal_stop() after wakeup.

Currently we lack the ability to report this state change.

Also fix the comment, it should be placed before schedule().

---

 include/linux/tracehook.h |    9 +++++++++
 kernel/signal.c           |    2 ++
 2 files changed, 11 insertions(+)
include/linux/tracehook.h renamed from include/linux/tracehook.h~2_FINISH_JCTL +9 -0
@@ -521,6 +521,15 @@ static inline int tracehook_notify_jctl(
 	return notify ?: (current->ptrace & PT_PTRACED) ? why : 0;
 }
 
+/**
+ * tracehook_finish_jctl - report about return from job control stop
+ *
+ * This is called by do_signal_stop() after wakeup.
+ */
+static inline void tracehook_finish_jctl(void)
+{
+}
+
 #define DEATH_REAP			-1
 #define DEATH_DELAYED_GROUP_LEADER	-2
 
kernel/signal.c renamed from kernel/signal.c~2_FINISH_JCTL +1 -0
@@ -1735,12 +1735,12 @@ static int do_signal_stop(int signr)
 		read_unlock(&tasklist_lock);
 	}
 
+	/* Now we don't run again until woken by SIGCONT or SIGKILL */

kernel/signal.c static int do_signal_stop(int signr) · line 1745

Quoted 10 lines
kernel/signal.c renamed from kernel/signal.c~2_FINISH_JCTL +2 -3
 	do {
 		schedule();
 	} while (try_to_freeze());
-	/*
-	 * Now we don't run again until continued.
-	 */
+
+	tracehook_finish_jctl();
 	current->exit_code = 0;
 

Confused. This patch has no effect.

#3 lore raw
Quoted 17 lines · Andrew Morton
Quoted 13 lines · On Wed, 29 Jul 2009 04:01:40 +0200 Oleg Nesterov <[email protected]> wrote:
include/linux/tracehook.h renamed from include/linux/tracehook.h~2_FINISH_JCTL +4 -0
+static inline void tracehook_finish_jctl(void)
+{
+}
+
 #define DEATH_REAP			-1
 #define DEATH_DELAYED_GROUP_LEADER	-2
kernel/signal.c renamed from kernel/signal.c~2_FINISH_JCTL +0 -0
@@ -1735,12 +1735,12 @@ static int do_signal_stop(int signr)
 		read_unlock(&tasklist_lock);
 	}
 
Quoted 13 lines

kernel/signal.c static int do_signal_stop(int signr) · line 1745

Quoted 11 lines
kernel/signal.c renamed from kernel/signal.c~2_FINISH_JCTL +3 -3
+	/* Now we don't run again until woken by SIGCONT or SIGKILL */
 	do {
 		schedule();
 	} while (try_to_freeze());
-	/*
-	 * Now we don't run again until continued.
-	 */
+
+	tracehook_finish_jctl();
 	current->exit_code = 0;
 

Confused. This patch has no effect.

Yes, currently tracehook_finish_jctl() does nothing. This patch is needed to add the functional changes later, without touching the code outside of tracehook/etc. It is like tracehook_notify_resume() which does nothing until we add the real tracing.

Oleg.

#4 lore raw
In reply to Andrew Morton
Quoted 1 line

Confused. This patch has no effect.

Indeed, the three patches changing do_signal_stop() have no immediate material effect. They all just clean up the code and prepare the hooks that utrace (or something like it) needs to make tracing stops mesh well with job control stops. I'd thought it might be simpler for review to just roll these three together and send you a single patch to replace signals-tracehook_notify_jctl-change.patch; but Oleg decided to keep it sliced smaller.

Thanks,
Roland

#5 lore raw
Quoted 10 lines · Roland McGrath
Quoted 2 lines

Confused. This patch has no effect.

Indeed, the three patches changing do_signal_stop() have no immediate material effect. They all just clean up the code and prepare the hooks that utrace (or something like it) needs to make tracing stops mesh well with job control stops. I'd thought it might be simpler for review to just roll these three together and send you a single patch to replace signals-tracehook_notify_jctl-change.patch; but Oleg decided to keep it sliced smaller.

But let me repeat, I would be happy if these 2 new patches are folded into signals-tracehook_notify_jctl-change.patch.

Oleg.