1ed81b739e
from existing functions for initializing global state. At this stage, the new per-vnet initializer functions are directly called from the existing global initialization code, which should in most cases result in compiler inlining those new functions, hence yielding a near-zero functional change. Modify the existing initializer functions which are invoked via protosw, like ip_init() et. al., to allow them to be invoked multiple times, i.e. per each vnet. Global state, if any, is initialized only if such functions are called within the context of vnet0, which will be determined via the IS_DEFAULT_VNET(curvnet) check (currently always true). While here, V_irtualize a few remaining global UMA zones used by net/netinet/netipsec networking code. While it is not yet clear to me or anybody else whether this is the right thing to do, at this stage this makes the code more readable, and makes it easier to track uncollected UMA-zone-backed objects on vnet removal. In the long run, it's quite possible that some form of shared use of UMA zone pools among multiple vnets should be considered. Bump __FreeBSD_version due to changes in layout of structs vnet_ipfw, vnet_inet and vnet_net. Approved by: julian (mentor)
93 lines
2.9 KiB
C
93 lines
2.9 KiB
C
/*-
|
|
* Copyright (c) 2006-2008 University of Zagreb
|
|
* Copyright (c) 2006-2008 FreeBSD Foundation
|
|
*
|
|
* This software was developed by the University of Zagreb and the
|
|
* FreeBSD Foundation under sponsorship by the Stichting NLnet and the
|
|
* FreeBSD Foundation.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*
|
|
* $FreeBSD$
|
|
*/
|
|
|
|
#ifndef _NET_VNET_H_
|
|
#define _NET_VNET_H_
|
|
|
|
#include <net/if_var.h>
|
|
|
|
struct vnet_net {
|
|
int _if_index;
|
|
struct ifindex_entry *_ifindex_table;
|
|
struct ifnethead _ifnet;
|
|
struct ifgrouphead _ifg_head;
|
|
|
|
int _if_indexlim;
|
|
struct knlist _ifklist;
|
|
|
|
struct rtstat _rtstat;
|
|
struct radix_node_head *_rt_tables[RT_MAXFIBS][AF_MAX+1];
|
|
int _rttrash;
|
|
uma_zone_t _rtzone;
|
|
|
|
struct ifnet *_loif;
|
|
LIST_HEAD(, lo_softc) _lo_list;
|
|
|
|
LIST_HEAD(, rawcb) _rawcb_list;
|
|
|
|
int _ether_ipfw;
|
|
};
|
|
|
|
/* Size guard. See sys/vimage.h. */
|
|
VIMAGE_CTASSERT(SIZEOF_vnet_net, sizeof(struct vnet_net));
|
|
|
|
#ifndef VIMAGE
|
|
#ifndef VIMAGE_GLOBALS
|
|
extern struct vnet_net vnet_net_0;
|
|
#endif
|
|
#endif
|
|
|
|
/*
|
|
* Symbol translation macros
|
|
*/
|
|
#define INIT_VNET_NET(vnet) \
|
|
INIT_FROM_VNET(vnet, VNET_MOD_NET, struct vnet_net, vnet_net)
|
|
|
|
#define VNET_NET(sym) VSYM(vnet_net, sym)
|
|
|
|
#define V_ether_ipfw VNET_NET(ether_ipfw)
|
|
#define V_if_index VNET_NET(if_index)
|
|
#define V_if_indexlim VNET_NET(if_indexlim)
|
|
#define V_ifg_head VNET_NET(ifg_head)
|
|
#define V_ifindex_table VNET_NET(ifindex_table)
|
|
#define V_ifklist VNET_NET(ifklist)
|
|
#define V_ifnet VNET_NET(ifnet)
|
|
#define V_lo_list VNET_NET(lo_list)
|
|
#define V_loif VNET_NET(loif)
|
|
#define V_rawcb_list VNET_NET(rawcb_list)
|
|
#define V_rt_tables VNET_NET(rt_tables)
|
|
#define V_rtstat VNET_NET(rtstat)
|
|
#define V_rttrash VNET_NET(rttrash)
|
|
#define V_rtzone VNET_NET(rtzone)
|
|
|
|
#endif /* !_NET_VNET_H_ */
|