From owner-p4-projects@FreeBSD.ORG  Wed Oct 31 04:40:40 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7686716A41B; Wed, 31 Oct 2007 04:40:40 +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 3C17416A49C
	for <perforce@freebsd.org>; Wed, 31 Oct 2007 04:40:40 +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 2EA4813C4BC
	for <perforce@freebsd.org>; Wed, 31 Oct 2007 04:40:40 +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 l9V4eeFs098833
	for <perforce@freebsd.org>; Wed, 31 Oct 2007 04:40:40 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9V4eeep098830
	for perforce@freebsd.org; Wed, 31 Oct 2007 04:40:40 GMT
	(envelope-from kmacy@freebsd.org)
Date: Wed, 31 Oct 2007 04:40:40 GMT
Message-Id: <200710310440.l9V4eeep098830@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 128387 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, 31 Oct 2007 04:40:40 -0000

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

Change 128387 by kmacy@kmacy:storage:toestack on 2007/10/31 04:40:37

	ignore events on non-offloaded interfaces
	drop route lock so as to avoid LOR on t3cdev lock

Affected files ...

.. //depot/projects/toestack/sys/dev/cxgb/cxgb_offload.c#13 edit

Differences ...

==== //depot/projects/toestack/sys/dev/cxgb/cxgb_offload.c#13 (text+ko) ====

@@ -876,7 +876,28 @@
 static void
 cxgb_route_event(void *unused, int event, struct rtentry *rt0, struct rtentry *rt1)
 {
+	struct toedev *tdev0, *tdev1 = NULL;
+
+	/* 
+	 * ignore events on non-offloaded interfaces
+	 */
 	
+	tdev0 = TOEDEV(rt0->rt_ifp);
+	if (rt1)
+		tdev1 = TOEDEV(rt1->rt_ifp);
+	if (tdev0 == NULL && tdev1 == NULL)
+		return;
+        /*
+	 * avoid LORs by dropping the route lock but keeping a reference
+	 * 
+	 */
+	RT_ADDREF(rt0);
+	RT_UNLOCK(rt0);
+	if (rt1) {
+		RT_ADDREF(rt1);
+		RT_UNLOCK(rt1);
+	}
+
 	switch (event) {
 		case RTEVENT_ARP_UPDATE: {
 			cxgb_neigh_update(rt0);
@@ -892,6 +913,14 @@
 		default:
 			break;
 	}
+
+	RT_LOCK(rt0);
+	RT_REMREF(rt0);
+	if (rt1) {
+		RT_LOCK(rt1);
+		RT_REMREF(rt1);
+	}
+	
 }
 
 /*