From owner-p4-projects@FreeBSD.ORG  Wed Sep 12 23:38:17 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4529516A496; Wed, 12 Sep 2007 23:38:17 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 01D6416A47F
	for <perforce@freebsd.org>; Wed, 12 Sep 2007 23:38:17 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id E829A13C457
	for <perforce@freebsd.org>; Wed, 12 Sep 2007 23:38:16 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l8CNcGaM095988
	for <perforce@freebsd.org>; Wed, 12 Sep 2007 23:38:16 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8CNcGXP095985
	for perforce@freebsd.org; Wed, 12 Sep 2007 23:38:16 GMT
	(envelope-from kmacy@freebsd.org)
Date: Wed, 12 Sep 2007 23:38:16 GMT
Message-Id: <200709122338.l8CNcGXP095985@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 126346 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: Wed, 12 Sep 2007 23:38:17 -0000

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

Change 126346 by kmacy@kmacy_home:ethng on 2007/09/12 23:38:04

	narrow the scope of the rnh lock so we don't recurse on it in rtrequest
	make sure we drop the route lock before destroying it

Affected files ...

.. //depot/projects/ethng/src/sys/net/route.c#4 edit

Differences ...

==== //depot/projects/ethng/src/sys/net/route.c#4 (text+ko) ====

@@ -153,6 +153,7 @@
 		 */
 		newrt = rt = RNTORT(rn);
 		nflags = rt->rt_flags & ~ignflags;
+		RADIX_NODE_HEAD_UNLOCK_SHARED(rnh);
 		if (report && (nflags & RTF_CLONING)) {
 			/*
 			 * We are apparently adding (report = 0 in delete).
@@ -162,12 +163,17 @@
 			err = rtrequest(RTM_RESOLVE, dst, NULL,
 					      NULL, 0, &newrt);
 			if (err) {
+				RADIX_NODE_HEAD_LOCK_SHARED(rnh);
+				if (!((rn = rnh->rnh_matchaddr(dst, rnh)) &&
+					(rn->rn_flags & RNF_ROOT) == 0)) 
+					goto miss;
 				/*
 				 * If the cloning didn't succeed, maybe
 				 * what we have will do. Return that.
 				 */
 				newrt = rt;		/* existing route */
 				RT_LOCK(newrt);
+				RADIX_NODE_HEAD_UNLOCK_SHARED(rnh);
 				RT_ADDREF(newrt);
 				goto miss;
 			}
@@ -197,7 +203,6 @@
 			RT_LOCK(newrt);
 			RT_ADDREF(newrt);
 		}
-		RADIX_NODE_HEAD_UNLOCK_SHARED(rnh);
 	} else {
 		/*
 		 * Either we hit the root or couldn't find any match,
@@ -297,6 +302,7 @@
 		/*
 		 * and the rtentry itself of course
 		 */
+		RT_UNLOCK(rt);
 		RT_LOCK_DESTROY(rt);
 		uma_zfree(rtzone, rt);
 		return;