From owner-p4-projects@FreeBSD.ORG  Tue Sep 16 14:33:48 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4D70216A4C0; Tue, 16 Sep 2003 14:33:48 -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 22BE716A4B3
	for <perforce@freebsd.org>; Tue, 16 Sep 2003 14:33:48 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id A674B43FDF
	for <perforce@freebsd.org>; Tue, 16 Sep 2003 14:33:47 -0700 (PDT)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h8GLXl0U048875
	for <perforce@freebsd.org>; Tue, 16 Sep 2003 14:33:47 -0700 (PDT)
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h8GLXllN048872
	for perforce@freebsd.org; Tue, 16 Sep 2003 14:33:47 -0700 (PDT)
Date: Tue, 16 Sep 2003 14:33:47 -0700 (PDT)
Message-Id: <200309162133.h8GLXllN048872@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 38147 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: Tue, 16 Sep 2003 21:33:48 -0000

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

Change 38147 by sam@sam_ebb on 2003/09/16 14:33:07

	o must make mutex recursive due to the tangled path that ICMP
	  packets take
	o remove bogus Giant assert; we get called from everywhere and
	  cannot assume (for the moment) whether or not Giant is held

Affected files ...

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

Differences ...

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

@@ -165,8 +165,13 @@
 #endif
 
 static struct mtx dummynet_mtx;
+/*
+ * NB: Recursion is needed to deal with re-entry via ICMP.  That is,
+ *     a packet may be dispatched via ip_input from dummynet_io and
+ *     re-enter through ip_output.  Yech.
+ */
 #define	DUMMYNET_LOCK_INIT() \
-	mtx_init(&dummynet_mtx, "dummynet", NULL, MTX_DEF)
+	mtx_init(&dummynet_mtx, "dummynet", NULL, MTX_DEF | MTX_RECURSE)
 #define	DUMMYNET_LOCK_DESTROY()	mtx_destroy(&dummynet_mtx)
 #define	DUMMYNET_LOCK()		mtx_lock(&dummynet_mtx)
 #define	DUMMYNET_UNLOCK()	mtx_unlock(&dummynet_mtx)
@@ -1125,8 +1130,6 @@
     is_pipe = (fwa->rule->fw_flg & IP_FW_F_COMMAND) == IP_FW_F_PIPE;
 #endif
 
-    mtx_assert(&Giant, MA_NOTOWNED);
-
     pipe_nr &= 0xffff ;
 
     DUMMYNET_LOCK();