From owner-p4-projects@FreeBSD.ORG  Tue Aug  7 15:39:59 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 32CF016A46B; Tue,  7 Aug 2007 15:39:59 +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 DFBBE16A468
	for <perforce@FreeBSD.org>; Tue,  7 Aug 2007 15:39:58 +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 D749E13C461
	for <perforce@FreeBSD.org>; Tue,  7 Aug 2007 15:39:58 +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 l77Fdwe9083102
	for <perforce@FreeBSD.org>; Tue, 7 Aug 2007 15:39:58 GMT
	(envelope-from zec@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l77Fdwo6083099
	for perforce@freebsd.org; Tue, 7 Aug 2007 15:39:58 GMT
	(envelope-from zec@FreeBSD.org)
Date: Tue, 7 Aug 2007 15:39:58 GMT
Message-Id: <200708071539.l77Fdwo6083099@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 124828 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: Tue, 07 Aug 2007 15:39:59 -0000

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

Change 124828 by zec@zec_tpx32 on 2007/08/07 15:39:55

	With each netgraph node store its vnet affinity.  So far this
	info is used to set the curvnet context when processing the
	workqueue in ngintr().

Affected files ...

.. //depot/projects/vimage/src/sys/netgraph/netgraph.h#4 edit
.. //depot/projects/vimage/src/sys/netgraph/ng_base.c#19 edit

Differences ...

==== //depot/projects/vimage/src/sys/netgraph/netgraph.h#4 (text+ko) ====

@@ -340,6 +340,7 @@
 	LIST_ENTRY(ng_node)	  nd_idnodes;	/* ID hash collision list */
 	TAILQ_ENTRY(ng_node)	  nd_work;	/* nodes with work to do */
 	struct	ng_queue	  nd_input_queue; /* input queue for locking */
+	struct	vnet		 *nd_vnet;	/* network stack instance */
 #ifdef	NETGRAPH_DEBUG /*----------------------------------------------*/
 #define ND_MAGIC 0x59264837
 	int	nd_magic;

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

@@ -633,6 +633,9 @@
 		return (ENOMEM);
 	}
 	node->nd_type = type;
+#ifdef VIMAGE
+	node->nd_vnet = curvnet;
+#endif
 	NG_NODE_REF(node);				/* note reference */
 	type->refs++;
 
@@ -3399,6 +3402,7 @@
 			NG_WORKLIST_UNLOCK();
 			break;
 		}
+		CURVNET_SET(node->nd_vnet);
 		node->nd_flags &= ~NGF_WORKQ;	
 		TAILQ_REMOVE(&ng_worklist, node, nd_work);
 		NG_WORKLIST_UNLOCK();
@@ -3433,6 +3437,7 @@
 			}
 		}
 		NG_NODE_UNREF(node);
+		CURVNET_RESTORE();
 	}
 }