From owner-p4-projects@FreeBSD.ORG  Sat Dec  1 00:35:49 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2215116A41B; Sat,  1 Dec 2007 00:35:49 +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 BB63A16A418
	for <perforce@FreeBSD.org>; Sat,  1 Dec 2007 00:35:48 +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 AB3DE13C447
	for <perforce@FreeBSD.org>; Sat,  1 Dec 2007 00:35:48 +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 lB10Zm4W029978
	for <perforce@FreeBSD.org>; Sat, 1 Dec 2007 00:35:48 GMT
	(envelope-from zec@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB10ZmXt029975
	for perforce@freebsd.org; Sat, 1 Dec 2007 00:35:48 GMT
	(envelope-from zec@FreeBSD.org)
Date: Sat, 1 Dec 2007 00:35:48 GMT
Message-Id: <200712010035.lB10ZmXt029975@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 129854 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: Sat, 01 Dec 2007 00:35:49 -0000

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

Change 129854 by zec@zec_tpx32 on 2007/12/01 00:35:47

	In ng_iface, mark mbufs with M_REMOTE_VNET and / or switch the
	per-thread vnet context if crossing a vnet boundary.

Affected files ...

.. //depot/projects/vimage/src/sys/netgraph/ng_iface.c#5 edit

Differences ...

==== //depot/projects/vimage/src/sys/netgraph/ng_iface.c#5 (text+ko) ====

@@ -464,6 +464,14 @@
 
 	/* Send packet. If hook is not connected,
 	   mbuf will get freed. */
+#ifdef VIMAGE
+	if (ifp->if_vnet != priv->node->nd_vnet) {
+		m->m_flags |= M_REMOTE_VNET;
+		CURVNET_SET_QUIET(priv->node->nd_vnet);
+		NG_SEND_DATA_ONLY(error, *get_hook_from_iffam(priv, iffam), m);
+		CURVNET_RESTORE();
+	} else
+#endif
 	NG_SEND_DATA_ONLY(error, *get_hook_from_iffam(priv, iffam), m);
 
 	/* Update stats. */
@@ -756,6 +764,12 @@
 	ifp->if_ipackets++;
 	ifp->if_ibytes += m->m_pkthdr.len;
 
+#ifdef VIMAGE
+	/* Mark up the mbuf if crossing vnet boundary */
+	if (ifp->if_vnet != NG_HOOK_NODE(hook)->nd_vnet)
+		m->m_flags |= M_REMOTE_VNET;
+#endif
+
 	/* Note receiving interface */
 	m->m_pkthdr.rcvif = ifp;