diff options
Diffstat (limited to 'src/vnet/vxlan/vxlan.h')
| -rw-r--r-- | src/vnet/vxlan/vxlan.h | 111 |
1 files changed, 58 insertions, 53 deletions
diff --git a/src/vnet/vxlan/vxlan.h b/src/vnet/vxlan/vxlan.h index 0f226aa3e72..21b7650f454 100644 --- a/src/vnet/vxlan/vxlan.h +++ b/src/vnet/vxlan/vxlan.h @@ -17,6 +17,7 @@ #include <vppinfra/error.h> #include <vppinfra/hash.h> +#include <vppinfra/bihash_24_8.h> #include <vnet/vnet.h> #include <vnet/ip/ip.h> #include <vnet/l2/l2_input.h> @@ -30,47 +31,47 @@ #include <vnet/dpo/dpo.h> #include <vnet/adj/adj_types.h> +/* *INDENT-OFF* */ typedef CLIB_PACKED (struct { - ip4_header_t ip4; /* 20 bytes */ - udp_header_t udp; /* 8 bytes */ - vxlan_header_t vxlan; /* 8 bytes */ + ip4_header_t ip4; /* 20 bytes */ + udp_header_t udp; /* 8 bytes */ + vxlan_header_t vxlan; /* 8 bytes */ }) ip4_vxlan_header_t; typedef CLIB_PACKED (struct { - ip6_header_t ip6; /* 40 bytes */ - udp_header_t udp; /* 8 bytes */ - vxlan_header_t vxlan; /* 8 bytes */ + ip6_header_t ip6; /* 40 bytes */ + udp_header_t udp; /* 8 bytes */ + vxlan_header_t vxlan; /* 8 bytes */ }) ip6_vxlan_header_t; -typedef CLIB_PACKED(struct { - /* - * Key fields: ip src and vxlan vni on incoming VXLAN packet - * all fields in NET byte order - */ - union { - struct { +typedef CLIB_PACKED (union { + /* + * Key fields: remote ip, vni on incoming VXLAN packet + * all fields in NET byte order + */ + struct + { u32 src; - u32 vni; /* shifted left 8 bits */ + u32 vni; /* shifted left 8 bits */ }; - u64 as_u64; - }; + u64 as_u64; }) vxlan4_tunnel_key_t; -typedef CLIB_PACKED(struct { - /* - * Key fields: ip src and vxlan vni on incoming VXLAN packet - * all fields in NET byte order - */ - ip6_address_t src; - u32 vni; /* shifted left 8 bits */ -}) vxlan6_tunnel_key_t; - -typedef struct { +/* +* Key fields: remote ip, vni and fib index on incoming VXLAN packet +* ip, vni fields in NET byte order +* fib index field in host byte order +*/ +typedef BVT (clib_bihash_kv) vxlan6_tunnel_key_t; +/* *INDENT-ON* */ + +typedef struct +{ /* Required for pool_get_aligned */ - CLIB_CACHE_LINE_ALIGN_MARK(cacheline0); + CLIB_CACHE_LINE_ALIGN_MARK (cacheline0); /* FIB DPO for IP forwarding of VXLAN encap packet */ - dpo_id_t next_dpo; + dpo_id_t next_dpo; /* vxlan VNI in HOST byte order */ u32 vni; @@ -112,53 +113,56 @@ typedef struct { */ u32 sibling_index; - u32 flow_index; /* infra flow index */ - u32 dev_instance; /* Real device instance in tunnel vector */ - u32 user_instance; /* Instance name being shown to user */ + u32 flow_index; /* infra flow index */ + u32 dev_instance; /* Real device instance in tunnel vector */ + u32 user_instance; /* Instance name being shown to user */ - vnet_declare_rewrite (VLIB_BUFFER_PRE_DATA_SIZE); + vnet_declare_rewrite (VLIB_BUFFER_PRE_DATA_SIZE); } vxlan_tunnel_t; #define foreach_vxlan_input_next \ _(DROP, "error-drop") \ _(L2_INPUT, "l2-input") -typedef enum { +typedef enum +{ #define _(s,n) VXLAN_INPUT_NEXT_##s, foreach_vxlan_input_next #undef _ - VXLAN_INPUT_N_NEXT, + VXLAN_INPUT_N_NEXT, } vxlan_input_next_t; -typedef enum { +typedef enum +{ #define vxlan_error(n,s) VXLAN_ERROR_##n, #include <vnet/vxlan/vxlan_error.def> #undef vxlan_error VXLAN_N_ERROR, } vxlan_input_error_t; -typedef struct { +typedef struct +{ /* vector of encap tunnel instances */ - vxlan_tunnel_t * tunnels; + vxlan_tunnel_t *tunnels; /* lookup tunnel by key */ - uword * vxlan4_tunnel_by_key; /* keyed on ipv4.dst + vni */ - uword * vxlan6_tunnel_by_key; /* keyed on ipv6.dst + vni */ + uword *vxlan4_tunnel_by_key; /* keyed on ipv4.dst + vni */ + BVT (clib_bihash) vxlan6_tunnel_by_key; /* keyed on ipv6.dst + fib + vni */ /* local VTEP IPs ref count used by vxlan-bypass node to check if received VXLAN packet DIP matches any local VTEP address */ - uword * vtep4; /* local ip4 VTEPs keyed on their ip4 addr */ - uword * vtep6; /* local ip6 VTEPs keyed on their ip6 addr */ + uword *vtep4; /* local ip4 VTEPs keyed on their ip4 addr */ + uword *vtep6; /* local ip6 VTEPs keyed on their ip6 addr */ /* mcast shared info */ - uword * mcast_shared; /* keyed on mcast ip46 addr */ + uword *mcast_shared; /* keyed on mcast ip46 addr */ /* Mapping from sw_if_index to tunnel index */ - u32 * tunnel_index_by_sw_if_index; + u32 *tunnel_index_by_sw_if_index; /* convenience */ - vlib_main_t * vlib_main; - vnet_main_t * vnet_main; + vlib_main_t *vlib_main; + vnet_main_t *vnet_main; /* Record used instances */ uword *instance_used; @@ -173,9 +177,10 @@ extern vlib_node_registration_t vxlan4_encap_node; extern vlib_node_registration_t vxlan6_encap_node; extern vlib_node_registration_t vxlan4_flow_input_node; -u8 * format_vxlan_encap_trace (u8 * s, va_list * args); +u8 *format_vxlan_encap_trace (u8 * s, va_list * args); -typedef struct { +typedef struct +{ u8 is_add; /* we normally use is_ip4, but since this adds to the @@ -189,19 +194,19 @@ typedef struct { u32 vni; } vnet_vxlan_add_del_tunnel_args_t; -int vnet_vxlan_add_del_tunnel -(vnet_vxlan_add_del_tunnel_args_t *a, u32 * sw_if_indexp); +int vnet_vxlan_add_del_tunnel + (vnet_vxlan_add_del_tunnel_args_t * a, u32 * sw_if_indexp); -void vnet_int_vxlan_bypass_mode -(u32 sw_if_index, u8 is_ip6, u8 is_enable); +void vnet_int_vxlan_bypass_mode (u32 sw_if_index, u8 is_ip6, u8 is_enable); -int vnet_vxlan_add_del_rx_flow -(u32 hw_if_index, u32 t_imdex, int is_add); +int vnet_vxlan_add_del_rx_flow (u32 hw_if_index, u32 t_imdex, int is_add); u32 vnet_vxlan_get_tunnel_index (u32 sw_if_index); #endif /* included_vnet_vxlan_h */ /* + * fd.io coding-style-patch-verification: ON + * * Local Variables: * eval: (c-set-style "gnu") * End: |