eddfbb763d
(DPCPU), as suggested by Peter Wemm, and implement a new per-virtual network stack memory allocator. Modify vnet to use the allocator instead of monolithic global container structures (vinet, ...). This change solves many binary compatibility problems associated with VIMAGE, and restores ELF symbols for virtualized global variables. Each virtualized global variable exists as a "reference copy", and also once per virtual network stack. Virtualized global variables are tagged at compile-time, placing the in a special linker set, which is loaded into a contiguous region of kernel memory. Virtualized global variables in the base kernel are linked as normal, but those in modules are copied and relocated to a reserved portion of the kernel's vnet region with the help of a the kernel linker. Virtualized global variables exist in per-vnet memory set up when the network stack instance is created, and are initialized statically from the reference copy. Run-time access occurs via an accessor macro, which converts from the current vnet and requested symbol to a per-vnet address. When "options VIMAGE" is not compiled into the kernel, normal global ELF symbols will be used instead and indirection is avoided. This change restores static initialization for network stack global variables, restores support for non-global symbols and types, eliminates the need for many subsystem constructors, eliminates large per-subsystem structures that caused many binary compatibility issues both for monitoring applications (netstat) and kernel modules, removes the per-function INIT_VNET_*() macros throughout the stack, eliminates the need for vnet_symmap ksym(2) munging, and eliminates duplicate definitions of virtualized globals under VIMAGE_GLOBALS. Bump __FreeBSD_version and update UPDATING. Portions submitted by: bz Reviewed by: bz, zec Discussed with: gnn, jamie, jeff, jhb, julian, sam Suggested by: peter Approved by: re (kensmith)
84 lines
3.4 KiB
C
84 lines
3.4 KiB
C
/* $FreeBSD$ */
|
|
/* $KAME: keysock.h,v 1.8 2000/03/27 05:11:06 sumikawa Exp $ */
|
|
|
|
/*-
|
|
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
|
|
* All rights reserved.
|
|
*
|
|
* 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.
|
|
* 3. Neither the name of the project nor the names of its contributors
|
|
* may be used to endorse or promote products derived from this software
|
|
* without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE PROJECT 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 PROJECT 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.
|
|
*/
|
|
|
|
#ifndef _NETIPSEC_KEYSOCK_H_
|
|
#define _NETIPSEC_KEYSOCK_H_
|
|
|
|
/* statistics for pfkey socket */
|
|
struct pfkeystat {
|
|
/* kernel -> userland */
|
|
u_quad_t out_total; /* # of total calls */
|
|
u_quad_t out_bytes; /* total bytecount */
|
|
u_quad_t out_msgtype[256]; /* message type histogram */
|
|
u_quad_t out_invlen; /* invalid length field */
|
|
u_quad_t out_invver; /* invalid version field */
|
|
u_quad_t out_invmsgtype; /* invalid message type field */
|
|
u_quad_t out_tooshort; /* msg too short */
|
|
u_quad_t out_nomem; /* memory allocation failure */
|
|
u_quad_t out_dupext; /* duplicate extension */
|
|
u_quad_t out_invexttype; /* invalid extension type */
|
|
u_quad_t out_invsatype; /* invalid sa type */
|
|
u_quad_t out_invaddr; /* invalid address extension */
|
|
/* userland -> kernel */
|
|
u_quad_t in_total; /* # of total calls */
|
|
u_quad_t in_bytes; /* total bytecount */
|
|
u_quad_t in_msgtype[256]; /* message type histogram */
|
|
u_quad_t in_msgtarget[3]; /* one/all/registered */
|
|
u_quad_t in_nomem; /* memory allocation failure */
|
|
/* others */
|
|
u_quad_t sockerr; /* # of socket related errors */
|
|
};
|
|
|
|
#define KEY_SENDUP_ONE 0
|
|
#define KEY_SENDUP_ALL 1
|
|
#define KEY_SENDUP_REGISTERED 2
|
|
|
|
#ifdef _KERNEL
|
|
struct keycb {
|
|
struct rawcb kp_raw; /* rawcb */
|
|
int kp_promisc; /* promiscuous mode */
|
|
int kp_registered; /* registered socket */
|
|
};
|
|
|
|
VNET_DECLARE(struct pfkeystat, pfkeystat);
|
|
#define V_pfkeystat VNET_GET(pfkeystat)
|
|
|
|
extern int key_output(struct mbuf *m, struct socket *so);
|
|
extern int key_usrreq __P((struct socket *,
|
|
int, struct mbuf *, struct mbuf *, struct mbuf *));
|
|
|
|
extern int key_sendup __P((struct socket *, struct sadb_msg *, u_int, int));
|
|
extern int key_sendup_mbuf __P((struct socket *, struct mbuf *, int));
|
|
#endif /* _KERNEL */
|
|
|
|
#endif /*_NETIPSEC_KEYSOCK_H_*/
|