Revert commitid: AZrsCSWEYDm7XWuv;

Kill SINGLE_PTRACE and use SINGLE_SUSPEND which has almost the same semantic.

This diff did not properly kill SINGLE_PTRACE and broke RAMDISK kernels.

3 files changed, 14 insertions, 10 deletions

diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c
index 192d5e66ff6..81a5b2c96c9 100644
--- a/sys/kern/kern_exec.c
+++ b/sys/kern/kern_exec.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_exec.c,v 1.220 2021/03/08 10:12:05 mpi Exp $	*/
+/*	$OpenBSD: kern_exec.c,v 1.221 2021/03/08 18:09:15 claudio Exp $	*/
 /*	$NetBSD: kern_exec.c,v 1.75 1996/02/09 18:59:28 christos Exp $	*/
 
 /*-
@@ -432,7 +432,7 @@ sys_execve(struct proc *p, void *v, register_t *retval)
 	 * we're committed: any further errors will kill the process, so
 	 * kill the other threads now.
 	 */
-	single_thread_set(p, SINGLE_EXIT, 1);
+	single_thread_set(p, SINGLE_EXIT, 0);
 
 	/*
 	 * Prepare vmspace for remapping. Note that uvmspace_exec can replace
diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c
index fa72891271e..8898286ea81 100644
--- a/sys/kern/kern_exit.c
+++ b/sys/kern/kern_exit.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_exit.c,v 1.197 2021/03/08 10:12:05 mpi Exp $	*/
+/*	$OpenBSD: kern_exit.c,v 1.198 2021/03/08 18:09:15 claudio Exp $	*/
 /*	$NetBSD: kern_exit.c,v 1.39 1996/04/22 01:38:25 christos Exp $	*/
 
 /*
@@ -136,7 +136,7 @@ exit1(struct proc *p, int xexit, int xsig, int flags)
 	} else {
 		/* nope, multi-threaded */
 		if (flags == EXIT_NORMAL)
-			single_thread_set(p, SINGLE_EXIT, 1);
+			single_thread_set(p, SINGLE_EXIT, 0);
 		else if (flags == EXIT_THREAD)
 			single_thread_check(p, 0);
 	}
diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c
index a0933d9e79e..0550839fe11 100644
--- a/sys/kern/kern_sig.c
+++ b/sys/kern/kern_sig.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_sig.c,v 1.276 2021/03/08 10:54:53 mpi Exp $	*/
+/*	$OpenBSD: kern_sig.c,v 1.277 2021/03/08 18:09:15 claudio Exp $	*/
 /*	$NetBSD: kern_sig.c,v 1.54 1996/04/22 01:38:32 christos Exp $	*/
 
 /*
@@ -1488,7 +1488,7 @@ sigexit(struct proc *p, int signum)
 
 		/* if there are other threads, pause them */
 		if (P_HASSIBLING(p))
-			single_thread_set(p, SINGLE_SUSPEND, 1);
+			single_thread_set(p, SINGLE_SUSPEND, 0);
 
 		if (coredump(p) == 0)
 			signum |= WCOREFLAG;
@@ -1998,12 +1998,14 @@ single_thread_check(struct proc *p, int deep)
  * where the other threads should stop:
  *  - SINGLE_SUSPEND: stop wherever they are, will later either be told to exit
  *    (by setting to SINGLE_EXIT) or be released (via single_thread_clear())
+ *  - SINGLE_PTRACE: stop wherever they are, will wait for them to stop
+ *    later (via single_thread_wait()) and released as with SINGLE_SUSPEND
  *  - SINGLE_UNWIND: just unwind to kernel boundary, will be told to exit
  *    or released as with SINGLE_SUSPEND
  *  - SINGLE_EXIT: unwind to kernel boundary and exit
  */
 int
-single_thread_set(struct proc *p, enum single_thread_mode mode, int wait)
+single_thread_set(struct proc *p, enum single_thread_mode mode, int deep)
 {
 	struct process *pr = p->p_p;
 	struct proc *q;
@@ -2012,7 +2014,7 @@ single_thread_set(struct proc *p, enum single_thread_mode mode, int wait)
 	KASSERT(curproc == p);
 
 	SCHED_LOCK(s);
-	error = single_thread_check_locked(p, (mode == SINGLE_UNWIND), s);
+	error = single_thread_check_locked(p, deep, s);
 	if (error) {
 		SCHED_UNLOCK(s);
 		return error;
@@ -2020,6 +2022,7 @@ single_thread_set(struct proc *p, enum single_thread_mode mode, int wait)
 
 	switch (mode) {
 	case SINGLE_SUSPEND:
+	case SINGLE_PTRACE:
 		break;
 	case SINGLE_UNWIND:
 		atomic_setbits_int(&pr->ps_flags, PS_SINGLEUNWIND);
@@ -2058,7 +2061,8 @@ single_thread_set(struct proc *p, enum single_thread_mode mode, int wait)
 			/* if it's not interruptible, then just have to wait */
 			if (q->p_flag & P_SINTR) {
 				/* merely need to suspend?  just stop it */
-				if (mode == SINGLE_SUSPEND) {
+				if (mode == SINGLE_SUSPEND ||
+				    mode == SINGLE_PTRACE) {
 					q->p_stat = SSTOP;
 					break;
 				}
@@ -2083,7 +2087,7 @@ single_thread_set(struct proc *p, enum single_thread_mode mode, int wait)
 	}
 	SCHED_UNLOCK(s);
 
-	if (wait)
+	if (mode != SINGLE_PTRACE)
 		single_thread_wait(pr, 1);
 
 	return 0;