First step at removing struct sleep_state.

Pass the timeout and sleep priority not only to sleep_setup() but also
to sleep_finish(). With that sls_timeout and sls_catch can be removed
from struct sleep_state.

The timeout is now setup first thing in sleep_finish() and no longer as
last thing in sleep_setup(). This should not cause a noticeable difference
since the code run between sleep_setup() and sleep_finish() is minimal.

OK kettenis@

11 files changed, 57 insertions, 58 deletions

diff --git a/sys/dev/dt/dt_dev.c b/sys/dev/dt/dt_dev.c
index 96c4709f2f7..4236a6fc90f 100644
--- a/sys/dev/dt/dt_dev.c
+++ b/sys/dev/dt/dt_dev.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dt_dev.c,v 1.26 2023/04/26 16:53:59 claudio Exp $ */
+/*	$OpenBSD: dt_dev.c,v 1.27 2023/06/28 08:23:25 claudio Exp $ */
 
 /*
  * Copyright (c) 2019 Martin Pieuchot <mpi@openbsd.org>
@@ -240,8 +240,8 @@ dtread(dev_t dev, struct uio *uio, int flags)
 		return (EMSGSIZE);
 
 	while (!sc->ds_evtcnt) {
-		sleep_setup(&sls, sc, PWAIT | PCATCH, "dtread", 0);
-		error = sleep_finish(&sls, !sc->ds_evtcnt);
+		sleep_setup(&sls, sc, PWAIT | PCATCH, "dtread");
+		error = sleep_finish(&sls, PWAIT | PCATCH, 0, !sc->ds_evtcnt);
 		if (error == EINTR || error == ERESTART)
 			break;
 	}
diff --git a/sys/dev/pci/drm/drm_linux.c b/sys/dev/pci/drm/drm_linux.c
index fb2dfe029d2..d710aebc5f0 100644
--- a/sys/dev/pci/drm/drm_linux.c
+++ b/sys/dev/pci/drm/drm_linux.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: drm_linux.c,v 1.98 2023/06/01 10:21:26 claudio Exp $	*/
+/*	$OpenBSD: drm_linux.c,v 1.99 2023/06/28 08:23:25 claudio Exp $	*/
 /*
  * Copyright (c) 2013 Jonathan Gray <jsg@openbsd.org>
  * Copyright (c) 2015, 2016 Mark Kettenis <kettenis@openbsd.org>
@@ -135,14 +135,15 @@ schedule_timeout(long timeout)
 {
 	struct sleep_state sls;
 	unsigned long deadline;
-	int wait, spl, timo = 0;
+	int wait, spl, prio, timo = 0;
 
 	MUTEX_ASSERT_LOCKED(&sch_mtx);
 	KASSERT(!cold);
 
 	if (timeout != MAX_SCHEDULE_TIMEOUT)
 		timo = timeout;
-	sleep_setup(&sls, sch_ident, sch_priority, "schto", timo);
+	prio = sch_priority;
+	sleep_setup(&sls, sch_ident, prio, "schto");
 
 	wait = (sch_proc == curproc && timeout > 0);
 
@@ -152,7 +153,7 @@ schedule_timeout(long timeout)
 
 	if (timeout != MAX_SCHEDULE_TIMEOUT)
 		deadline = jiffies + timeout;
-	sleep_finish(&sls, wait);
+	sleep_finish(&sls, prio, timo, wait);
 	if (timeout != MAX_SCHEDULE_TIMEOUT)
 		timeout = deadline - jiffies;
 
diff --git a/sys/dev/pci/if_myx.c b/sys/dev/pci/if_myx.c
index 76012c1134a..4b07f0b97dd 100644
--- a/sys/dev/pci/if_myx.c
+++ b/sys/dev/pci/if_myx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_myx.c,v 1.116 2022/03/11 18:00:48 mpi Exp $	*/
+/*	$OpenBSD: if_myx.c,v 1.117 2023/06/28 08:23:25 claudio Exp $	*/
 
 /*
  * Copyright (c) 2007 Reyk Floeter <reyk@openbsd.org>
@@ -1397,9 +1397,9 @@ myx_down(struct myx_softc *sc)
 	(void)myx_cmd(sc, MYXCMD_SET_IFDOWN, &mc, NULL);
 
 	while (sc->sc_state != MYX_S_OFF) {
-		sleep_setup(&sls, sts, PWAIT, "myxdown", 0);
+		sleep_setup(&sls, sts, PWAIT, "myxdown");
 		membar_consumer();
-		sleep_finish(&sls, sc->sc_state != MYX_S_OFF);
+		sleep_finish(&sls, PWAIT, 0, sc->sc_state != MYX_S_OFF);
 	}
 
 	s = splnet();
diff --git a/sys/kern/kern_rwlock.c b/sys/kern/kern_rwlock.c
index 3edb80e5be5..17e00fedaa3 100644
--- a/sys/kern/kern_rwlock.c
+++ b/sys/kern/kern_rwlock.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_rwlock.c,v 1.48 2022/05/10 16:56:16 bluhm Exp $	*/
+/*	$OpenBSD: kern_rwlock.c,v 1.49 2023/06/28 08:23:25 claudio Exp $	*/
 
 /*
  * Copyright (c) 2002, 2003 Artur Grabowski <art@openbsd.org>
@@ -279,11 +279,11 @@ retry:
 		prio = op->wait_prio;
 		if (flags & RW_INTR)
 			prio |= PCATCH;
-		sleep_setup(&sls, rwl, prio, rwl->rwl_name, 0);
+		sleep_setup(&sls, rwl, prio, rwl->rwl_name);
 
 		do_sleep = !rw_cas(&rwl->rwl_owner, o, set);
 
-		error = sleep_finish(&sls, do_sleep);
+		error = sleep_finish(&sls, prio, 0, do_sleep);
 		if ((flags & RW_INTR) &&
 		    (error != 0))
 			return (error);
diff --git a/sys/kern/kern_sched.c b/sys/kern/kern_sched.c
index 7b84cd13c65..fe179e4ef64 100644
--- a/sys/kern/kern_sched.c
+++ b/sys/kern/kern_sched.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_sched.c,v 1.76 2022/12/05 23:18:37 deraadt Exp $	*/
+/*	$OpenBSD: kern_sched.c,v 1.77 2023/06/28 08:23:25 claudio Exp $	*/
 /*
  * Copyright (c) 2007, 2008 Artur Grabowski <art@openbsd.org>
  *
@@ -673,8 +673,8 @@ sched_stop_secondary_cpus(void)
 		if (CPU_IS_PRIMARY(ci) || !CPU_IS_RUNNING(ci))
 			continue;
 		while ((spc->spc_schedflags & SPCF_HALTED) == 0) {
-			sleep_setup(&sls, spc, PZERO, "schedstate", 0);
-			sleep_finish(&sls,
+			sleep_setup(&sls, spc, PZERO, "schedstate");
+			sleep_finish(&sls, PZERO, 0,
 			    (spc->spc_schedflags & SPCF_HALTED) == 0);
 		}
 	}
diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c
index 52e8571663b..5304c904dab 100644
--- a/sys/kern/kern_sig.c
+++ b/sys/kern/kern_sig.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_sig.c,v 1.306 2023/04/03 11:57:50 claudio Exp $	*/
+/*	$OpenBSD: kern_sig.c,v 1.307 2023/06/28 08:23:25 claudio Exp $	*/
 /*	$NetBSD: kern_sig.c,v 1.54 1996/04/22 01:38:32 christos Exp $	*/
 
 /*
@@ -2170,9 +2170,9 @@ single_thread_wait(struct process *pr, int recheck)
 	/* wait until they're all suspended */
 	wait = pr->ps_singlecount > 0;
 	while (wait) {
-		sleep_setup(&sls, &pr->ps_singlecount, PWAIT, "suspend", 0);
+		sleep_setup(&sls, &pr->ps_singlecount, PWAIT, "suspend");
 		wait = pr->ps_singlecount > 0;
-		sleep_finish(&sls, wait);
+		sleep_finish(&sls, PWAIT, 0, wait);
 		if (!recheck)
 			break;
 	}
diff --git a/sys/kern/kern_synch.c b/sys/kern/kern_synch.c
index 8165d2f27b8..e6e1a472059 100644
--- a/sys/kern/kern_synch.c
+++ b/sys/kern/kern_synch.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_synch.c,v 1.192 2023/06/01 10:21:26 claudio Exp $	*/
+/*	$OpenBSD: kern_synch.c,v 1.193 2023/06/28 08:23:25 claudio Exp $	*/
 /*	$NetBSD: kern_synch.c,v 1.37 1996/04/22 01:38:37 christos Exp $	*/
 
 /*
@@ -151,8 +151,8 @@ tsleep(const volatile void *ident, int priority, const char *wmesg, int timo)
 		return (0);
 	}
 
-	sleep_setup(&sls, ident, priority, wmesg, timo);
-	return sleep_finish(&sls, 1);
+	sleep_setup(&sls, ident, priority, wmesg);
+	return sleep_finish(&sls, priority, timo, 1);
 }
 
 int
@@ -244,7 +244,7 @@ msleep(const volatile void *ident, struct mutex *mtx, int priority,
 		return (0);
 	}
 
-	sleep_setup(&sls, ident, priority, wmesg, timo);
+	sleep_setup(&sls, ident, priority, wmesg);
 
 	/* XXX - We need to make sure that the mutex doesn't
 	 * unblock splsched. This can be made a bit more
@@ -254,7 +254,7 @@ msleep(const volatile void *ident, struct mutex *mtx, int priority,
 	MUTEX_OLDIPL(mtx) = splsched();
 	mtx_leave(mtx);
 	/* signal may stop the process, release mutex before that */
-	error = sleep_finish(&sls, 1);
+	error = sleep_finish(&sls, priority, timo, 1);
 
 	if ((priority & PNORELOCK) == 0) {
 		mtx_enter(mtx);
@@ -304,11 +304,11 @@ rwsleep(const volatile void *ident, struct rwlock *rwl, int priority,
 	rw_assert_anylock(rwl);
 	status = rw_status(rwl);
 
-	sleep_setup(&sls, ident, priority, wmesg, timo);
+	sleep_setup(&sls, ident, priority, wmesg);
 
 	rw_exit(rwl);
 	/* signal may stop the process, release rwlock before that */
-	error = sleep_finish(&sls, 1);
+	error = sleep_finish(&sls, priority, timo, 1);
 
 	if ((priority & PNORELOCK) == 0)
 		rw_enter(rwl, status);
@@ -341,7 +341,7 @@ rwsleep_nsec(const volatile void *ident, struct rwlock *rwl, int priority,
 
 void
 sleep_setup(struct sleep_state *sls, const volatile void *ident, int prio,
-    const char *wmesg, int timo)
+    const char *wmesg)
 {
 	struct proc *p = curproc;
 
@@ -354,9 +354,6 @@ sleep_setup(struct sleep_state *sls, const volatile void *ident, int prio,
 		panic("tsleep: not SONPROC");
 #endif
 
-	sls->sls_catch = prio & PCATCH;
-	sls->sls_timeout = 0;
-
 	SCHED_LOCK(sls->sls_s);
 
 	TRACEPOINT(sched, sleep, NULL);
@@ -367,20 +364,22 @@ sleep_setup(struct sleep_state *sls, const volatile void *ident, int prio,
 	p->p_slppri = prio & PRIMASK;
 	TAILQ_INSERT_TAIL(&slpque[LOOKUP(ident)], p, p_runq);
 
-	if (timo) {
-		KASSERT((p->p_flag & P_TIMEOUT) == 0);
-		sls->sls_timeout = 1;
-		timeout_add(&p->p_sleep_to, timo);
-	}
 }
 
 int
-sleep_finish(struct sleep_state *sls, int do_sleep)
+sleep_finish(struct sleep_state *sls, int prio, int timo, int do_sleep)
 {
 	struct proc *p = curproc;
-	int error = 0, error1 = 0;
+	int catch, error = 0, error1 = 0;
+
+	catch = prio & PCATCH;
+
+	if (timo != 0) {
+		KASSERT((p->p_flag & P_TIMEOUT) == 0);
+		timeout_add(&p->p_sleep_to, timo);
+	}
 
-	if (sls->sls_catch != 0) {
+	if (catch != 0) {
 		/*
 		 * We put ourselves on the sleep queue and start our
 		 * timeout before calling sleep_signal_check(), as we could
@@ -396,10 +395,10 @@ sleep_finish(struct sleep_state *sls, int do_sleep)
 		atomic_setbits_int(&p->p_flag, P_SINTR);
 		if ((error = sleep_signal_check()) != 0) {
 			p->p_stat = SONPROC;
-			sls->sls_catch = 0;
+			catch = 0;
 			do_sleep = 0;
 		} else if (p->p_wchan == NULL) {
-			sls->sls_catch = 0;
+			catch = 0;
 			do_sleep = 0;
 		}
 	}
@@ -427,7 +426,7 @@ sleep_finish(struct sleep_state *sls, int do_sleep)
 	 */
 	atomic_clearbits_int(&p->p_flag, P_SINTR);
 
-	if (sls->sls_timeout) {
+	if (timo != 0) {
 		if (p->p_flag & P_TIMEOUT) {
 			error1 = EWOULDBLOCK;
 		} else {
@@ -438,7 +437,7 @@ sleep_finish(struct sleep_state *sls, int do_sleep)
 	}
 
 	/* Check if thread was woken up because of a unwind or signal */
-	if (sls->sls_catch != 0)
+	if (catch != 0)
 		error = sleep_signal_check();
 
 	/* Signal errors are higher priority than timeouts. */
@@ -837,9 +836,9 @@ refcnt_finalize(struct refcnt *r, const char *wmesg)
 	KASSERT(refs != ~0);
 	TRACEINDEX(refcnt, r->r_traceidx, r, refs + 1, -1);
 	while (refs) {
-		sleep_setup(&sls, r, PWAIT, wmesg, 0);
+		sleep_setup(&sls, r, PWAIT, wmesg);
 		refs = atomic_load_int(&r->r_refs);
-		sleep_finish(&sls, refs);
+		sleep_finish(&sls, PWAIT, 0, refs);
 	}
 	TRACEINDEX(refcnt, r->r_traceidx, r, refs, 0);
 	/* Order subsequent loads and stores after refs == 0 load. */
@@ -888,8 +887,8 @@ cond_wait(struct cond *c, const char *wmesg)
 
 	wait = atomic_load_int(&c->c_wait);
 	while (wait) {
-		sleep_setup(&sls, c, PWAIT, wmesg, 0);
+		sleep_setup(&sls, c, PWAIT, wmesg);
 		wait = atomic_load_int(&c->c_wait);
-		sleep_finish(&sls, wait);
+		sleep_finish(&sls, PWAIT, 0, wait);
 	}
 }
diff --git a/sys/kern/kern_timeout.c b/sys/kern/kern_timeout.c
index dcd0280b2ce..9eccb02f7a4 100644
--- a/sys/kern/kern_timeout.c
+++ b/sys/kern/kern_timeout.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_timeout.c,v 1.91 2023/06/26 16:26:20 cheloha Exp $	*/
+/*	$OpenBSD: kern_timeout.c,v 1.92 2023/06/28 08:23:25 claudio Exp $	*/
 /*
  * Copyright (c) 2001 Thomas Nordin <nordin@openbsd.org>
  * Copyright (c) 2000-2001 Artur Grabowski <art@openbsd.org>
@@ -752,8 +752,8 @@ softclock_thread(void *arg)
 
 	s = splsoftclock();
 	for (;;) {
-		sleep_setup(&sls, &timeout_proc, PSWP, "bored", 0);
-		sleep_finish(&sls, CIRCQ_EMPTY(&timeout_proc));
+		sleep_setup(&sls, &timeout_proc, PSWP, "bored");
+		sleep_finish(&sls, PSWP, 0, CIRCQ_EMPTY(&timeout_proc));
 
 		mtx_enter(&timeout_mutex);
 		while (!CIRCQ_EMPTY(&timeout_proc)) {
diff --git a/sys/kern/subr_log.c b/sys/kern/subr_log.c
index 930322555bb..1f4ae515bfa 100644
--- a/sys/kern/subr_log.c
+++ b/sys/kern/subr_log.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: subr_log.c,v 1.75 2022/07/02 08:50:42 visa Exp $	*/
+/*	$OpenBSD: subr_log.c,v 1.76 2023/06/28 08:23:25 claudio Exp $	*/
 /*	$NetBSD: subr_log.c,v 1.11 1996/03/30 22:24:44 christos Exp $	*/
 
 /*
@@ -250,8 +250,9 @@ logread(dev_t dev, struct uio *uio, int flag)
 		 * Set up and enter sleep manually instead of using msleep()
 		 * to keep log_mtx as a leaf lock.
 		 */
-		sleep_setup(&sls, mbp, LOG_RDPRI | PCATCH, "klog", 0);
-		error = sleep_finish(&sls, logsoftc.sc_state & LOG_RDWAIT);
+		sleep_setup(&sls, mbp, LOG_RDPRI | PCATCH, "klog");
+		error = sleep_finish(&sls, LOG_RDPRI | PCATCH, 0,
+		    logsoftc.sc_state & LOG_RDWAIT);
 		mtx_enter(&log_mtx);
 		if (error)
 			goto out;
diff --git a/sys/sys/proc.h b/sys/sys/proc.h
index d25db222d61..7594beb7bb4 100644
--- a/sys/sys/proc.h
+++ b/sys/sys/proc.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: proc.h,v 1.341 2023/06/01 10:21:26 claudio Exp $	*/
+/*	$OpenBSD: proc.h,v 1.342 2023/06/28 08:23:25 claudio Exp $	*/
 /*	$NetBSD: proc.h,v 1.44 1996/04/22 01:23:21 christos Exp $	*/
 
 /*-
@@ -587,8 +587,6 @@ int	proc_cansugid(struct proc *);
 
 struct sleep_state {
 	int sls_s;
-	int sls_catch;
-	int sls_timeout;
 };
 
 struct cond {
diff --git a/sys/sys/systm.h b/sys/sys/systm.h
index 31a5622bdf4..29115bc0368 100644
--- a/sys/sys/systm.h
+++ b/sys/sys/systm.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: systm.h,v 1.161 2023/01/31 15:18:56 deraadt Exp $	*/
+/*	$OpenBSD: systm.h,v 1.162 2023/06/28 08:23:25 claudio Exp $	*/
 /*	$NetBSD: systm.h,v 1.50 1996/06/09 04:55:09 briggs Exp $	*/
 
 /*-
@@ -251,8 +251,8 @@ void	stop_periodic_resettodr(void);
 
 struct sleep_state;
 void	sleep_setup(struct sleep_state *, const volatile void *, int,
-	    const char *, int);
-int	sleep_finish(struct sleep_state *, int);
+	    const char *);
+int	sleep_finish(struct sleep_state *, int, int, int);
 void	sleep_queue_init(void);
 
 struct cond;