From owner-p4-projects@FreeBSD.ORG  Mon Jun 26 20:14:13 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 A8B6516A61C; Mon, 26 Jun 2006 20:14:12 +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 5C25D16A677
	for <perforce@freebsd.org>; Mon, 26 Jun 2006 20:14:12 +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 DD45C4424B
	for <perforce@freebsd.org>; Mon, 26 Jun 2006 18:47:31 +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 k5QIlVxh006591
	for <perforce@freebsd.org>; Mon, 26 Jun 2006 18:47:31 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5QIlVMK006588
	for perforce@freebsd.org; Mon, 26 Jun 2006 18:47:31 GMT
	(envelope-from kmacy@freebsd.org)
Date: Mon, 26 Jun 2006 18:47:31 GMT
Message-Id: <200606261847.k5QIlVMK006588@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 100082 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:14:14 -0000

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

Change 100082 by kmacy@kmacy_storage:sun4v_work_sleepq on 2006/06/26 18:47:29

	undo locking changes from 99969 as it causes an LOR
	a real fix for the locking overhead in sleepq would require a re-write

Affected files ...

.. //depot/projects/kmacy_sun4v/src/sys/kern/kern_synch.c#10 edit
.. //depot/projects/kmacy_sun4v/src/sys/kern/sys_generic.c#6 edit
.. //depot/projects/kmacy_sun4v/src/sys/kern/vfs_subr.c#8 edit

Differences ...

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

@@ -159,9 +159,7 @@
 	 * sleeps.
 	 */
 	if (TD_ON_SLEEPQ(td)) {
-		TD_SLOCK(td);
 		sleepq_remove(td, td->td_wchan);
-		TD_SUNLOCK(td);
 	}
 	flags = SLEEPQ_MSLEEP;
 	if (catch)

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

@@ -1136,12 +1136,10 @@
 	}
 	TAILQ_REMOVE(&td->td_selq, sip, si_thrlist);
 	sip->si_thread = NULL;
-	mtx_unlock(&sellock);
 
 	atomic_clear_int(&td->td_flags, TDF_SELECT);
-	TD_SLOCK(td);
 	sleepq_remove(td, &selwait);
-	TD_SUNLOCK(td);
+	mtx_unlock(&sellock);
 
 }
 

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

@@ -1731,9 +1731,7 @@
 	int ret = 0;
 
 	td = FIRST_THREAD_IN_PROC(updateproc);
-	TD_SLOCK(td);
 	sleepq_remove(td, &lbolt);
-	TD_SUNLOCK(td);
 	mtx_lock(&sync_mtx);
 	if (rushjob < syncdelay / 2) {
 		rushjob += 1;