From owner-p4-projects@FreeBSD.ORG Wed Apr 15 07:44:48 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A3E08106571B; Wed, 15 Apr 2009 07:44:47 +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 3E586106570F for ; Wed, 15 Apr 2009 07:44:47 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 209598FC08 for ; Wed, 15 Apr 2009 07:44:47 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n3F7ilig030355 for ; Wed, 15 Apr 2009 07:44:47 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3F7ik5O030353 for perforce@freebsd.org; Wed, 15 Apr 2009 07:44:46 GMT (envelope-from zec@fer.hr) Date: Wed, 15 Apr 2009 07:44:46 GMT Message-Id: <200904150744.n3F7ik5O030353@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 160654 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Apr 2009 07:44:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=160654 Change 160654 by zec@zec_amdx2 on 2009/04/15 07:44:27 Declare vnet container struct sizes when registering vnet modules, so that the initialization subsystem can allocate memory for those structs. This makes options VIMAGE builds bootable again. Submitted from: a non-default VIMAGE far, far away... Affected files ... .. //depot/projects/vimage/src/sys/net/if_gif.c#28 edit .. //depot/projects/vimage/src/sys/netgraph/ng_base.c#53 edit .. //depot/projects/vimage/src/sys/netinet/ip_fw2.c#72 edit .. //depot/projects/vimage/src/sys/netinet/ip_input.c#53 edit .. //depot/projects/vimage/src/sys/netinet/ip_mroute.c#20 edit .. //depot/projects/vimage/src/sys/netinet/tcp_subr.c#80 edit .. //depot/projects/vimage/src/sys/netinet6/ip6_input.c#53 edit .. //depot/projects/vimage/src/sys/netipsec/ipsec.c#45 edit Differences ... ==== //depot/projects/vimage/src/sys/net/if_gif.c#28 (text+ko) ==== @@ -127,6 +127,7 @@ static const vnet_modinfo_t vnet_gif_modinfo = { .vmi_id = VNET_MOD_GIF, .vmi_name = "gif", + .vmi_size = sizeof(struct vnet_gif), .vmi_dependson = VNET_MOD_NET, .vmi_iattach = vnet_gif_iattach }; ==== //depot/projects/vimage/src/sys/netgraph/ng_base.c#53 (text+ko) ==== @@ -275,6 +275,7 @@ static vnet_modinfo_t vnet_netgraph_modinfo = { .vmi_id = VNET_MOD_NETGRAPH, .vmi_name = "netgraph", + .vmi_size = sizeof(struct vnet_netgraph), .vmi_dependson = VNET_MOD_LOIF, .vmi_iattach = vnet_netgraph_iattach, #ifdef VIMAGE ==== //depot/projects/vimage/src/sys/netinet/ip_fw2.c#72 (text+ko) ==== ==== //depot/projects/vimage/src/sys/netinet/ip_input.c#53 (text+ko) ==== @@ -230,6 +230,7 @@ static const vnet_modinfo_t vnet_inet_modinfo = { .vmi_id = VNET_MOD_INET, .vmi_name = "inet", + .vmi_size = sizeof(struct vnet_inet) }; static void vnet_inet_register() ==== //depot/projects/vimage/src/sys/netinet/ip_mroute.c#20 (text+ko) ==== ==== //depot/projects/vimage/src/sys/netinet/tcp_subr.c#80 (text+ko) ==== @@ -345,7 +345,6 @@ V_tcp_autosndbuf_inc = 8*1024; V_tcp_autosndbuf_max = 256*1024; - /* * These have to be type stable for the benefit of the timers. */ @@ -369,6 +368,9 @@ INP_INFO_LOCK_INIT(&V_tcbinfo, "tcp"); LIST_INIT(&V_tcb); V_tcbinfo.ipi_listhead = &V_tcb; +#ifdef VIMAGE + V_tcbinfo.ipi_vnet = curvnet; +#endif hashsize = TCBHASHSIZE; TUNABLE_INT_FETCH("net.inet.tcp.tcbhashsize", &hashsize); if (!powerof2(hashsize)) { ==== //depot/projects/vimage/src/sys/netinet6/ip6_input.c#53 (text+ko) ==== @@ -161,6 +161,7 @@ static const vnet_modinfo_t vnet_inet6_modinfo = { .vmi_id = VNET_MOD_INET6, .vmi_name = "inet6", + .vmi_size = sizeof(struct vnet_inet6), .vmi_dependson = VNET_MOD_INET /* XXX revisit - TCP/UDP needs this? */ }; ==== //depot/projects/vimage/src/sys/netipsec/ipsec.c#45 (text+ko) ==== @@ -251,6 +251,7 @@ static const vnet_modinfo_t vnet_ipsec_modinfo = { .vmi_id = VNET_MOD_IPSEC, .vmi_name = "ipsec", + .vmi_size = sizeof(struct vnet_ipsec), .vmi_dependson = VNET_MOD_INET, /* XXX revisit - INET6 ? */ .vmi_iattach = ipsec_iattach, #ifdef VIMAGE