From owner-p4-projects@FreeBSD.ORG  Wed Aug 15 14:53:58 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 32E7316A46E; Wed, 15 Aug 2007 14:53:58 +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 E837916A46C
	for <perforce@FreeBSD.org>; Wed, 15 Aug 2007 14:53:57 +0000 (UTC)
	(envelope-from zec@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id D381E13C48D
	for <perforce@FreeBSD.org>; Wed, 15 Aug 2007 14:53:57 +0000 (UTC)
	(envelope-from zec@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 l7FErvip089307
	for <perforce@FreeBSD.org>; Wed, 15 Aug 2007 14:53:57 GMT
	(envelope-from zec@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l7FErviu089304
	for perforce@freebsd.org; Wed, 15 Aug 2007 14:53:57 GMT
	(envelope-from zec@FreeBSD.org)
Date: Wed, 15 Aug 2007 14:53:57 GMT
Message-Id: <200708151453.l7FErviu089304@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	zec@FreeBSD.org using -f
From: Marko Zec <zec@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 125175 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, 15 Aug 2007 14:53:58 -0000

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

Change 125175 by zec@zec_tpx32 on 2007/08/15 14:53:40

	Clear the M_REMOTE_VNET mbuf flag once it has been used
	for defering the direct netisr dispatch.
	
	While here, do style-fixing on a few asserts.

Affected files ...

.. //depot/projects/vimage/src/sys/net/netisr.c#7 edit

Differences ...

==== //depot/projects/vimage/src/sys/net/netisr.c#7 (text+ko) ====

@@ -143,7 +143,7 @@
 		IF_DEQUEUE(ni->ni_queue, m);
 		if (m == NULL)
 			break;
-		VNET_ASSERT(m->m_pkthdr.rcvif);
+		VNET_ASSERT(m->m_pkthdr.rcvif != NULL);
 		CURVNET_SET(m->m_pkthdr.rcvif->if_vnet);
 		ni->ni_handler(m);
 		CURVNET_RESTORE();
@@ -167,6 +167,7 @@
 		m_freem(m);
 		return;
 	}
+	VNET_ASSERT(m->m_pkthdr.rcvif != NULL)
 	/*
 	 * Do direct dispatch only for MPSAFE netisrs (and
 	 * only when enabled).  Note that when a netisr is
@@ -201,6 +202,15 @@
 		 */
 		ni->ni_handler(m);
 	} else {
+#ifdef VIMAGE
+		/*
+		 * Once direct netisr dispatching is avoided using the 
+		 * M_REMOTE_VNET flag, it should not be observed any
+		 * more, so clear it here in order to avoid further
+		 * defering of direct netisr dispatching.
+		 */
+		m->m_flags &= ~M_REMOTE_VNET;
+#endif
 		isrstat.isrs_deferred++;
 		if (IF_HANDOFF(ni->ni_queue, m, NULL))
 			schednetisr(num);
@@ -227,7 +237,10 @@
 		m_freem(m);
 		return (ENXIO);
 	}
-	VNET_ASSERT(m->m_pkthdr.rcvif)
+	VNET_ASSERT(m->m_pkthdr.rcvif != NULL)
+#ifdef VIMAGE
+	m->m_flags &= ~M_REMOTE_VNET;
+#endif
 	isrstat.isrs_queued++;
 	if (!IF_HANDOFF(ni->ni_queue, m, NULL))
 		return (ENOBUFS);	/* IF_HANDOFF has free'd the mbuf */