From owner-p4-projects  Sat Jun 22 18:55: 8 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id ED95737B401; Sat, 22 Jun 2002 18:54:57 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id 4E33637B400
	for <perforce@freebsd.org>; Sat, 22 Jun 2002 18:54:57 -0700 (PDT)
Received: (from perforce@localhost)
	by freefall.freebsd.org (8.11.6/8.11.6) id g5N1svF96517
	for perforce@freebsd.org; Sat, 22 Jun 2002 18:54:57 -0700 (PDT)
	(envelope-from dillon@freebsd.org)
Date: Sat, 22 Jun 2002 18:54:57 -0700 (PDT)
Message-Id: <200206230154.g5N1svF96517@freefall.freebsd.org>
X-Authentication-Warning: freefall.freebsd.org: perforce set sender to dillon@freebsd.org using -f
From: Matt Dillon <dillon@FreeBSD.org>
Subject: PERFORCE change 13298 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13298

Change 13298 by dillon@apollo on 2002/06/22 18:54:12

	Reorder scheduler mutex around SUSPEND.  Adjust kasserts.

Affected files ...

... //depot/projects/kse/sys/kern/kern_thread.c#76 edit

Differences ...

==== //depot/projects/kse/sys/kern/kern_thread.c#76 (text+ko) ====

@@ -313,10 +313,12 @@
 
 	/* Reassign this thread's KSE. */
 	if (ke != NULL) {
-KASSERT((ke->ke_state != KES_ONRUNQ), ("zapping kse on run queue"));
-KASSERT((ke->ke_thread->td_state != TDS_RUNQ), ("zapping thread on run queue"));
+KASSERT((ke->ke_state == KES_RUNNING), ("zapping kse not running"));
+KASSERT((ke->ke_thread == td ), ("kse ke_thread mismatch against curthread"));
+KASSERT((ke->ke_thread->td_state == TDS_RUNNING), ("zapping thread not running"));
 		ke->ke_thread = NULL;
 		td->td_kse = NULL;
+		mtx_assert(&sched_lock, MA_OWNED);
 		ke->ke_state = KES_UNQUEUED;
 		kse_reassign(ke);
 	}
@@ -483,10 +485,10 @@
 		 * Wake us up when everyone else has suspended.
 		 * (or died)
 		 */
+		mtx_lock_spin(&sched_lock);
 		TAILQ_INSERT_TAIL(&p->p_suspended, td, td_runq);
 		td->td_state = TDS_SUSPENDED;
 		p->p_suspcount++;
-		mtx_lock_spin(&sched_lock);
 		mtx_unlock(&Giant);
 		PROC_UNLOCK(p);
 		mi_switch();
@@ -585,10 +587,11 @@
 		 * (lent kse's can not go back to userland?)
 		 * and can only be lent in STOPPED state.
 		 */
+		mtx_assert(&Giant, MA_NOTOWNED);
+		mtx_lock_spin(&sched_lock);
 		p->p_suspcount++;
 		td->td_state = TDS_SUSPENDED;
 		TAILQ_INSERT_TAIL(&p->p_suspended, td, td_runq);
-		mtx_lock_spin(&sched_lock);
 		PROC_UNLOCK(p);
 		mi_switch();
 		mtx_unlock_spin(&sched_lock);

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message