diff options
author | rwatson <rwatson@FreeBSD.org> | 2009-07-14 22:48:30 +0000 |
---|---|---|
committer | rwatson <rwatson@FreeBSD.org> | 2009-07-14 22:48:30 +0000 |
commit | 57ca4583e728cab422fba8f15de10bd0b637b3dd (patch) | |
tree | 13848f891fb2f7a396281b31633563d0f764ff65 /sys/netipsec/ipsec.h | |
parent | ef443476d9706035ac219f0280ef0b817dda7a6d (diff) | |
download | FreeBSD-src-57ca4583e728cab422fba8f15de10bd0b637b3dd.zip FreeBSD-src-57ca4583e728cab422fba8f15de10bd0b637b3dd.tar.gz |
Build on Jeff Roberson's linker-set based dynamic per-CPU allocator
(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)
Diffstat (limited to 'sys/netipsec/ipsec.h')
-rw-r--r-- | sys/netipsec/ipsec.h | 52 |
1 files changed, 32 insertions, 20 deletions
diff --git a/sys/netipsec/ipsec.h b/sys/netipsec/ipsec.h index c869ec8..03df7bc 100644 --- a/sys/netipsec/ipsec.h +++ b/sys/netipsec/ipsec.h @@ -332,25 +332,40 @@ struct ipsec_history { u_int32_t ih_spi; }; -extern int ipsec_debug; -#ifdef REGRESSION -extern int ipsec_replay; -extern int ipsec_integrity; -#endif +VNET_DECLARE(int, ipsec_debug); +#define V_ipsec_debug VNET_GET(ipsec_debug) +VNET_DECLARE(struct ipsecstat, ipsec4stat); +#define V_ipsec4stat VNET_GET(ipsec4stat) +VNET_DECLARE(int, ip4_ah_offsetmask); +#define V_ip4_ah_offsetmask VNET_GET(ip4_ah_offsetmask) +VNET_DECLARE(int, ip4_ipsec_dfbit); +#define V_ip4_ipsec_dfbit VNET_GET(ip4_ipsec_dfbit) +VNET_DECLARE(int, ip4_esp_trans_deflev); +#define V_ip4_esp_trans_deflev VNET_GET(ip4_esp_trans_deflev) +VNET_DECLARE(int, ip4_esp_net_deflev); +#define V_ip4_esp_net_deflev VNET_GET(ip4_esp_net_deflev) +VNET_DECLARE(int, ip4_ah_trans_deflev); +#define V_ip4_ah_trans_deflev VNET_GET(ip4_ah_trans_deflev) +VNET_DECLARE(int, ip4_ah_net_deflev); +#define V_ip4_ah_net_deflev VNET_GET(ip4_ah_net_deflev) +VNET_DECLARE(struct secpolicy, ip4_def_policy); +#define V_ip4_def_policy VNET_GET(ip4_def_policy) +VNET_DECLARE(int, ip4_ipsec_ecn); +#define V_ip4_ipsec_ecn VNET_GET(ip4_ipsec_ecn) +VNET_DECLARE(int, ip4_esp_randpad); +#define V_ip4_esp_randpad VNET_GET(ip4_esp_randpad) + +VNET_DECLARE(int, crypto_support); +#define V_crypto_support VNET_GET(crypto_support) -extern struct ipsecstat ipsec4stat; -extern struct secpolicy ip4_def_policy; -extern int ip4_esp_trans_deflev; -extern int ip4_esp_net_deflev; -extern int ip4_ah_trans_deflev; -extern int ip4_ah_net_deflev; extern int ip4_ah_cleartos; -extern int ip4_ah_offsetmask; -extern int ip4_ipsec_dfbit; -extern int ip4_ipsec_ecn; -extern int ip4_ipsec_filtertunnel; -extern int ip4_esp_randpad; -extern int crypto_support; + +#ifdef REGRESSION +VNET_DECLARE(int, ipsec_replay); +#define V_ipsec_replay VNET_GET(ipsec_replay) +VNET_DECLARE(int, ipsec_integrity); +#define V_ipsec_integrity VNET_GET(ipsec_integrity) +#endif #define ipseclog(x) do { if (V_ipsec_debug) log x; } while (0) /* for openbsd compatibility */ @@ -360,7 +375,6 @@ extern struct ipsecrequest *ipsec_newisr(void); extern void ipsec_delisr(struct ipsecrequest *); struct tdb_ident; -extern void ipsec_init(void); extern struct secpolicy *ipsec_getpolicy __P((struct tdb_ident*, u_int)); struct inpcb; extern struct secpolicy *ipsec4_checkpolicy __P((struct mbuf *, u_int, u_int, @@ -434,8 +448,6 @@ extern char *ipsec_dump_policy __P((caddr_t, char *)); extern const char *ipsec_strerror __P((void)); -#else -#include <netipsec/vipsec.h> #endif /* ! KERNEL */ #endif /* _NETIPSEC_IPSEC_H_ */ |