From owner-p4-projects@FreeBSD.ORG  Mon Jun 26 20:55:16 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3011716A403; Mon, 26 Jun 2006 20:55:16 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 0ED8416A400
	for <perforce@freebsd.org>; Mon, 26 Jun 2006 20:55:16 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id CC2F344679
	for <perforce@freebsd.org>; Mon, 26 Jun 2006 20:55:15 +0000 (GMT)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5QKtFuj022383
	for <perforce@freebsd.org>; Mon, 26 Jun 2006 20:55:15 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5QKtF9l022380
	for perforce@freebsd.org; Mon, 26 Jun 2006 20:55:15 GMT
	(envelope-from kmacy@freebsd.org)
Date: Mon, 26 Jun 2006 20:55:15 GMT
Message-Id: <200606262055.k5QKtF9l022380@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy <kmacy@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 100090 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 26 Jun 2006 20:55:16 -0000

http://perforce.freebsd.org/chv.cgi?CH=100090

Change 100090 by kmacy@kmacy_storage:sun4v_work_sleepq on 2006/06/26 20:55:08

	fix missing lock acquisitions of threads

Affected files ...

.. //depot/projects/kmacy_sun4v/src/sys/kern/subr_turnstile.c#8 edit

Differences ...

==== //depot/projects/kmacy_sun4v/src/sys/kern/subr_turnstile.c#8 (text+ko) ====

@@ -88,8 +88,7 @@
  */
 #define	TC_TABLESIZE	128			/* Must be power of 2. */
 #define	TC_MASK		(TC_TABLESIZE - 1)
-#define	TC_SHIFT	8
-#define	TC_HASH(lock)	(((uintptr_t)(lock) >> TC_SHIFT) & TC_MASK)
+#define	TC_HASH(lock)	((lock)->lo_id & TC_MASK)
 #define	TC_LOOKUP(lock)	&turnstile_chains[TC_HASH(lock)]
 
 /*
@@ -837,7 +836,6 @@
 	 */
 	td = curthread;
 	pri = PRI_MAX;
-	TD_SLOCK(td);
 	mtx_lock_spin(&td_contested_lock);
 	LIST_FOREACH(ts, &td->td_contested, ts_link) {
 		cp = turnstile_first_waiter(ts)->td_priority;
@@ -845,8 +843,10 @@
 			pri = cp;
 	}
 	mtx_unlock_spin(&td_contested_lock);
+	TD_SLOCK(td);
 	sched_unlend_prio(td, pri);
-
+	TD_SUNLOCK(td);
+	
 	/*
 	 * Wake up all the pending threads.  If a thread is not blocked
 	 * on a lock, then it is currently executing on another CPU in
@@ -866,14 +866,15 @@
 #endif
 			TD_CLR_LOCK(td);
 			MPASS(TD_CAN_RUN(td));
+			TD_SLOCK(td);
 			setrunqueue(td, SRQ_BORING);
+			TD_SUNLOCK(td);
 		} else {
 			atomic_set_int(&td->td_flags, TDF_TSNOBLOCK);
 			MPASS(TD_IS_RUNNING(td) || TD_ON_RUNQ(td));
 		}
 	}
 	critical_exit();
-	TD_SUNLOCK(td);
 }
 
 /*