From owner-p4-projects@FreeBSD.ORG  Wed Oct 15 20:43:43 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 38C9116A4C0; Wed, 15 Oct 2003 20:43:43 -0700 (PDT)
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 109BC16A4B3
	for <perforce@freebsd.org>; Wed, 15 Oct 2003 20:43:43 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 8E75443F93
	for <perforce@freebsd.org>; Wed, 15 Oct 2003 20:43:42 -0700 (PDT)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h9G3hgXJ037462
	for <perforce@freebsd.org>; Wed, 15 Oct 2003 20:43:42 -0700 (PDT)
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9G3hfgi037459
	for perforce@freebsd.org; Wed, 15 Oct 2003 20:43:41 -0700 (PDT)
	(envelope-from sam@freebsd.org)
Date: Wed, 15 Oct 2003 20:43:41 -0700 (PDT)
Message-Id: <200310160343.h9G3hfgi037459@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 39765 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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: Thu, 16 Oct 2003 03:43:43 -0000

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

Change 39765 by sam@sam_ebb on 2003/10/15 20:43:00

	Workaround a LOR between Giant and the dummynet lock
	by dropping the dummynet lock each time we re-enter
	the network stack.  This can be removed when the stack
	no longer depends on Giant.

Affected files ...

.. //depot/projects/netperf/sys/netinet/ip_dummynet.c#10 edit

Differences ...

==== //depot/projects/netperf/sys/netinet/ip_dummynet.c#10 (text+ko) ====

@@ -429,6 +429,8 @@
 {
     struct dn_pkt *pkt ;
 
+    DUMMYNET_LOCK_ASSERT();
+
     while ( (pkt = pipe->head) && DN_KEY_LEQ(pkt->output_time, curr_time) ) {
 	/*
 	 * first unlink, then call procedures, since ip_input() can invoke
@@ -436,6 +438,8 @@
 	 */
 	pipe->head = DN_NEXT(pkt) ;
 
+	/* XXX: drop the lock for now to avoid LOR's */
+	DUMMYNET_UNLOCK();
 	/*
 	 * The actual mbuf is preceded by a struct dn_pkt, resembling an mbuf
 	 * (NOT A REAL one, just a small block of malloc'ed memory) with
@@ -496,6 +500,7 @@
 	    break ;
 	}
 	free(pkt, M_DUMMYNET);
+	DUMMYNET_LOCK();
     }
     /* if there are leftover packets, put into the heap for next event */
     if ( (pkt = pipe->head) )