PERFORCE change 152248 for review

[Marko Zec]

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

Change 152248 by zec at zec_tpx32 on 2008/10/30 22:16:00

	Merge a few missing and remove excessive INIT_VNET_
	initializers from the vimage branch, reducing the diff
	between vimage and vimage-commit2.

Affected files ...

.. //depot/projects/vimage-commit2/src/sys/net/route.c#16 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/in_pcb.c#21 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/in_rmx.c#14 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/ip_divert.c#12 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw_pfil.c#6 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/tcp_input.c#21 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/tcp_subr.c#22 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/tcp_syncache.c#23 edit
.. //depot/projects/vimage-commit2/src/sys/netinet6/raw_ip6.c#13 edit

Differences ...

==== //depot/projects/vimage-commit2/src/sys/net/route.c#16 (text+ko) ====

@@ -145,6 +145,7 @@
 static void
 route_init(void)
 {
+	INIT_VNET_INET(curvnet);
 	int table;
 	struct domain *dom;
 	int fam;

==== //depot/projects/vimage-commit2/src/sys/netinet/in_pcb.c#21 (text+ko) ====

@@ -120,6 +120,7 @@
 static int
 sysctl_net_ipport_check(SYSCTL_HANDLER_ARGS)
 {
+	INIT_VNET_INET(curvnet);
 	int error;
 
 	error = sysctl_handle_int(oidp, oidp->oid_arg1, oidp->oid_arg2, req);

==== //depot/projects/vimage-commit2/src/sys/netinet/in_rmx.c#14 (text+ko) ====

@@ -287,6 +287,7 @@
 static void
 in_rtqtimo_one(void *rock)
 {
+	INIT_VNET_INET(curvnet);
 	struct radix_node_head *rnh = rock;
 	struct rtqk_arg arg;
 	static time_t last_adjusted_timeout = 0;

==== //depot/projects/vimage-commit2/src/sys/netinet/ip_divert.c#12 (text+ko) ====

@@ -580,6 +580,7 @@
 static int
 div_pcblist(SYSCTL_HANDLER_ARGS)
 {
+	INIT_VNET_INET(curvnet);
 	int error, i, n;
 	struct inpcb *inp, **inp_list;
 	inp_gen_t gencnt;

==== //depot/projects/vimage-commit2/src/sys/netinet/ip_fw_pfil.c#6 (text+ko) ====

@@ -487,6 +487,7 @@
 int
 ipfw_chg_hook(SYSCTL_HANDLER_ARGS)
 {
+	INIT_VNET_IPFW(curvnet);
 	int enable = *(int *)arg1;
 	int error;
 

==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_input.c#21 (text+ko) ====

@@ -2981,6 +2981,7 @@
 	int isipv6;
 #endif
 	KASSERT(tp != NULL, ("%s: tp == NULL", __func__));
+	INIT_VNET_INET(tp->t_vnet);
 	
 	tcp_mss_update(tp, offer, &metrics);
 

==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_subr.c#22 (text+ko) ====

@@ -130,7 +130,7 @@
 static int
 sysctl_net_inet_tcp_mss_check(SYSCTL_HANDLER_ARGS)
 {
-	INIT_VNET_INET(TD_TO_VNET(curthread));
+	INIT_VNET_INET(curvnet);
 	int error, new;
 
 	new = V_tcp_mssdflt;
@@ -144,15 +144,16 @@
 	return (error);
 }
 
-SYSCTL_PROC(_net_inet_tcp, TCPCTL_MSSDFLT, mssdflt, CTLTYPE_INT|CTLFLAG_RW,
-	   &tcp_mssdflt, 0, &sysctl_net_inet_tcp_mss_check, "I",
-	   "Default TCP Maximum Segment Size");
+SYSCTL_V_PROC(V_NET, vnet_inet, _net_inet_tcp, TCPCTL_MSSDFLT, mssdflt,
+    CTLTYPE_INT|CTLFLAG_RW, tcp_mssdflt, 0,
+    &sysctl_net_inet_tcp_mss_check, "I",
+   "Default TCP Maximum Segment Size");
 
 #ifdef INET6
 static int
 sysctl_net_inet_tcp_mss_v6_check(SYSCTL_HANDLER_ARGS)
 {
-	INIT_VNET_INET6(TD_TO_VNET(curthread));
+	INIT_VNET_INET6(curvnet);
 	int error, new;
 
 	new = V_tcp_v6mssdflt;
@@ -166,9 +167,10 @@
 	return (error);
 }
 
-SYSCTL_PROC(_net_inet_tcp, TCPCTL_V6MSSDFLT, v6mssdflt, CTLTYPE_INT|CTLFLAG_RW,
-	   &tcp_v6mssdflt, 0, &sysctl_net_inet_tcp_mss_v6_check, "I",
-	   "Default TCP Maximum Segment Size for IPv6");
+SYSCTL_V_PROC(V_NET, vnet_inet, _net_inet_tcp, TCPCTL_V6MSSDFLT, v6mssdflt,
+    CTLTYPE_INT|CTLFLAG_RW, tcp_v6mssdflt, 0,
+    &sysctl_net_inet_tcp_mss_v6_check, "I",
+   "Default TCP Maximum Segment Size for IPv6");
 #endif
 
 /*
@@ -947,6 +949,9 @@
 tcp_notify(struct inpcb *inp, int error)
 {
 	struct tcpcb *tp;
+#ifdef INVARIANTS
+	INIT_VNET_INET(inp->inp_vnet); /* V_tcbinfo WLOCK ASSERT */
+#endif
 
 	INP_INFO_WLOCK_ASSERT(&V_tcbinfo);
 	INP_WLOCK_ASSERT(inp);
@@ -1940,6 +1945,7 @@
 tcp_signature_compute(struct mbuf *m, int _unused, int len, int optlen,
     u_char *buf, u_int direction)
 {
+	INIT_VNET_IPSEC(curvnet);
 	union sockaddr_union dst;
 	struct ippseudo ippseudo;
 	MD5_CTX ctx;

==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_syncache.c#23 (text+ko) ====

@@ -359,11 +359,13 @@
 syncache_timer(void *xsch)
 {
 	struct syncache_head *sch = (struct syncache_head *)xsch;
-	INIT_VNET_INET(sch->sch_vnet);
 	struct syncache *sc, *nsc;
 	int tick = ticks;
 	char *s;
 
+	CURVNET_SET(sch->sch_vnet);
+	INIT_VNET_INET(sch->sch_vnet);
+
 	/* NB: syncache_head has already been locked by the callout. */
 	SCH_LOCK_ASSERT(sch);
 
@@ -412,6 +414,7 @@
 	if (!TAILQ_EMPTY(&(sch)->sch_bucket))
 		callout_reset(&(sch)->sch_timer, (sch)->sch_nextc - tick,
 			syncache_timer, (void *)(sch));
+	CURVNET_RESTORE();
 }
 
 /*
@@ -929,6 +932,7 @@
 tcp_offload_syncache_expand(struct in_conninfo *inc, struct tcpopt *to,
     struct tcphdr *th, struct socket **lsop, struct mbuf *m)
 {
+	INIT_VNET_INET(curvnet);
 	int rc;
 	
 	INP_INFO_WLOCK(&V_tcbinfo);

==== //depot/projects/vimage-commit2/src/sys/netinet6/raw_ip6.c#13 (text+ko) ====

@@ -765,7 +765,6 @@
 rip6_send(struct socket *so, int flags, struct mbuf *m, struct sockaddr *nam,
     struct mbuf *control, struct thread *td)
 {
-	INIT_VNET_INET(so->so_vnet);
 	struct inpcb *inp;
 	struct sockaddr_in6 tmp;
 	struct sockaddr_in6 *dst;