X-Git-Url: https://gerrit.fd.io/r/gitweb?p=vpp.git;a=blobdiff_plain;f=src%2Fvnet%2Fip%2Fip6.h;h=5e16f9905344869d6ba6faaef3d99e7ca183b752;hp=d623c95f52fce8c1cc6dda868797b467f5bd4dbc;hb=59f71132e;hpb=227038a444b98f922b4a4f44b85ae60f9ee86e1c diff --git a/src/vnet/ip/ip6.h b/src/vnet/ip/ip6.h index d623c95f52f..5e16f990534 100644 --- a/src/vnet/ip/ip6.h +++ b/src/vnet/ip/ip6.h @@ -40,16 +40,20 @@ #ifndef included_ip_ip6_h #define included_ip_ip6_h -#include #include #include +#include #include +#include #include #include +#include #include #include +#include #include #include +#include /* * Default size of the ip6 fib hash table @@ -66,6 +70,9 @@ typedef struct typedef struct { + /* required for pool_get_aligned. */ + CLIB_CACHE_LINE_ALIGN_MARK (cacheline0); + /* Table ID (hash key) for this FIB. */ u32 table_id; @@ -75,17 +82,14 @@ typedef struct typedef struct ip6_mfib_t { + /* required for pool_get_aligned. */ + CLIB_CACHE_LINE_ALIGN_MARK (cacheline0); + /* Table ID (hash key) for this FIB. */ u32 table_id; /* Index into FIB vector. */ u32 index; - - /* - * Pointer to the top of a radix tree. - * This cannot be realloc'd, hence it cannot be inlined with this table - */ - struct radix_node_head *rhead; } ip6_mfib_t; struct ip6_main_t; @@ -103,6 +107,16 @@ typedef struct uword function_opaque; } ip6_add_del_interface_address_callback_t; +typedef void (ip6_table_bind_function_t) + (struct ip6_main_t * im, + uword opaque, u32 sw_if_index, u32 new_fib_index, u32 old_fib_index); + +typedef struct +{ + ip6_table_bind_function_t *function; + uword function_opaque; +} ip6_table_bind_callback_t; + /** * Enumeration of the FIB table instance types */ @@ -110,7 +124,7 @@ typedef enum ip6_fib_table_instance_type_t_ { /** * This table stores the routes that are used to forward traffic. - * The key is the prefix, the result the adjacnecy to forward on. + * The key is the prefix, the result the adjacency to forward on. */ IP6_FIB_TABLE_FWDING, /** @@ -125,12 +139,12 @@ typedef enum ip6_fib_table_instance_type_t_ #define IP6_FIB_NUM_TABLES (IP6_FIB_TABLE_NON_FWDING+1) /** - * A represenation of a single IP6 table + * A representation of a single IP6 table */ typedef struct ip6_fib_table_instance_t_ { /* The hash table */ - BVT (clib_bihash) ip6_hash; + clib_bihash_24_8_t ip6_hash; /* bitmap / refcounts / vector of mask widths to search */ uword *non_empty_dst_address_length_bitmap; @@ -138,6 +152,20 @@ typedef struct ip6_fib_table_instance_t_ i32 dst_address_length_refcounts[129]; } ip6_fib_table_instance_t; +/** + * A representation of a single IP6 mfib table + */ +typedef struct ip6_mfib_table_instance_t_ +{ + /* The hash table */ + clib_bihash_40_8_t ip6_mhash; + + /* bitmap / refcounts / vector of mask widths to search */ + uword *non_empty_dst_address_length_bitmap; + u16 *prefix_lengths_in_search_order; + i32 dst_address_length_refcounts[257]; +} ip6_mfib_table_instance_t; + typedef struct ip6_main_t { /** @@ -145,6 +173,11 @@ typedef struct ip6_main_t */ ip6_fib_table_instance_t ip6_table[IP6_FIB_NUM_TABLES]; + /** + * the single MFIB table + */ + ip6_mfib_table_instance_t ip6_mtable; + ip_lookup_main_t lookup_main; /* Pool of FIBs. */ @@ -183,8 +216,8 @@ typedef struct ip6_main_t ip6_add_del_interface_address_callback_t * add_del_interface_address_callbacks; - /* Template used to generate IP6 neighbor solicitation packets. */ - vlib_packet_template_t discover_neighbor_packet_template; + /** Functions to call when interface to table biding changes. */ + ip6_table_bind_callback_t *table_bind_callbacks; /* ip6 lookup table config parameters */ u32 lookup_table_nbuckets; @@ -203,8 +236,13 @@ typedef struct ip6_main_t /* HBH processing enabled? */ u8 hbh_enabled; + + /** ND throttling */ + throttle_t nd_throttle; } ip6_main_t; +#define ND_THROTTLE_BITS 512 + /* Global ip6 main structure. */ extern ip6_main_t ip6_main; @@ -216,6 +254,12 @@ extern vlib_node_registration_t ip6_rewrite_local_node; extern vlib_node_registration_t ip6_discover_neighbor_node; extern vlib_node_registration_t ip6_glean_node; extern vlib_node_registration_t ip6_midchain_node; +extern vlib_node_registration_t ip6_punt_node; + +extern void ip6_forward_next_trace (vlib_main_t * vm, + vlib_node_runtime_t * node, + vlib_frame_t * frame, + vlib_rx_or_tx_t which_adj_index); always_inline uword ip6_destination_matches_route (const ip6_main_t * im, @@ -258,31 +302,10 @@ ip6_unaligned_destination_matches_route (ip6_main_t * im, return 1; } -always_inline int -ip6_src_address_for_packet (ip_lookup_main_t * lm, - u32 sw_if_index, ip6_address_t * src) -{ - u32 if_add_index = lm->if_address_pool_index_by_sw_if_index[sw_if_index]; - if (PREDICT_TRUE (if_add_index != ~0)) - { - ip_interface_address_t *if_add = - pool_elt_at_index (lm->if_address_pool, if_add_index); - ip6_address_t *if_ip = ip_interface_address_get_address (lm, if_add); - *src = *if_ip; - return (0); - } - else - { - src->as_u64[0] = 0; - src->as_u64[1] = 0; - } - return (!0); -} - /* Find interface address which matches destination. */ always_inline ip6_address_t * ip6_interface_address_matching_destination (ip6_main_t * im, - ip6_address_t * dst, + const ip6_address_t * dst, u32 sw_if_index, ip_interface_address_t ** result_ia) @@ -321,9 +344,6 @@ ip6_address_t *ip6_interface_first_address (ip6_main_t * im, u32 sw_if_index); int ip6_address_compare (ip6_address_t * a1, ip6_address_t * a2); -clib_error_t *ip6_probe_neighbor (vlib_main_t * vm, ip6_address_t * dst, - u32 sw_if_index); - uword ip6_udp_register_listener (vlib_main_t * vm, u16 dst_port, u32 next_node_index); @@ -333,52 +353,25 @@ u16 ip6_tcp_udp_icmp_compute_checksum (vlib_main_t * vm, vlib_buffer_t * p0, int *bogus_lengthp); void ip6_register_protocol (u32 protocol, u32 node_index); +void ip6_unregister_protocol (u32 protocol); +void ip6_local_hop_by_hop_register_protocol (u32 protocol, u32 node_index); serialize_function_t serialize_vnet_ip6_main, unserialize_vnet_ip6_main; -void ip6_ethernet_update_adjacency (vnet_main_t * vnm, - u32 sw_if_index, u32 ai); - - -void -ip6_link_local_address_from_ethernet_mac_address (ip6_address_t * ip, - u8 * mac); - -void -ip6_ethernet_mac_address_from_link_local_address (u8 * mac, - ip6_address_t * ip); - int vnet_set_ip6_flow_hash (u32 table_id, flow_hash_config_t flow_hash_config); -clib_error_t *enable_ip6_interface (vlib_main_t * vm, u32 sw_if_index); - -clib_error_t *disable_ip6_interface (vlib_main_t * vm, u32 sw_if_index); - -int ip6_interface_enabled (vlib_main_t * vm, u32 sw_if_index); - -clib_error_t *set_ip6_link_local_address (vlib_main_t * vm, - u32 sw_if_index, - ip6_address_t * address); - -int vnet_add_del_ip6_nd_change_event (vnet_main_t * vnm, - void *data_callback, - u32 pid, - void *address_arg, - uword node_index, - uword type_opaque, - uword data, int is_add); - -int vnet_ip6_nd_term (vlib_main_t * vm, - vlib_node_runtime_t * node, - vlib_buffer_t * p0, - ethernet_header_t * eth, - ip6_header_t * ip, u32 sw_if_index, u16 bd_index); - u8 *format_ip6_forward_next_trace (u8 * s, va_list * args); u32 ip6_tcp_udp_icmp_validate_checksum (vlib_main_t * vm, vlib_buffer_t * p0); +void ip6_punt_policer_add_del (u8 is_add, u32 policer_index); +void ip6_punt_redirect_add (u32 rx_sw_if_index, + u32 tx_sw_if_index, ip46_address_t * nh); +void ip6_punt_redirect_add_paths (u32 rx_sw_if_index, + fib_route_path_t * paths); +void ip6_punt_redirect_del (u32 rx_sw_if_index); + int vnet_set_ip6_classify_intfc (vlib_main_t * vm, u32 sw_if_index, u32 table_index); extern vlib_node_registration_t ip6_lookup_node; @@ -422,7 +415,6 @@ ip6_compute_flow_hash (const ip6_header_t * ip, a = (flow_hash_config & IP_FLOW_HASH_REVERSE_SRC_DST) ? t2 : t1; b = (flow_hash_config & IP_FLOW_HASH_REVERSE_SRC_DST) ? t1 : t2; - b ^= (flow_hash_config & IP_FLOW_HASH_PROTO) ? protocol : 0; t1 = is_tcp_udp ? tcp->src : 0; t2 = is_tcp_udp ? tcp->dst : 0; @@ -430,6 +422,23 @@ ip6_compute_flow_hash (const ip6_header_t * ip, t1 = (flow_hash_config & IP_FLOW_HASH_SRC_PORT) ? t1 : 0; t2 = (flow_hash_config & IP_FLOW_HASH_DST_PORT) ? t2 : 0; + if (flow_hash_config & IP_FLOW_HASH_SYMMETRIC) + { + if (b < a) + { + c = a; + a = b; + b = c; + } + if (t2 < t1) + { + t2 += t1; + t1 = t2 - t1; + t2 = t2 - t1; + } + } + + b ^= (flow_hash_config & IP_FLOW_HASH_PROTO) ? protocol : 0; c = (flow_hash_config & IP_FLOW_HASH_REVERSE_SRC_DST) ? ((t1 << 16) | t2) : ((t2 << 16) | t1); @@ -546,21 +555,23 @@ void ip6_hbh_set_next_override (uword next); * @param src - source IP * @param dst - destination IP * @param prot - payload proto + * @param flow_label - flow label * * @return - pointer to start of IP header */ always_inline void * -vlib_buffer_push_ip6 (vlib_main_t * vm, vlib_buffer_t * b, - ip6_address_t * src, ip6_address_t * dst, int proto) +vlib_buffer_push_ip6_custom (vlib_main_t * vm, vlib_buffer_t * b, + ip6_address_t * src, ip6_address_t * dst, + int proto, u32 flow_label) { ip6_header_t *ip6h; u16 payload_length; /* make some room */ ip6h = vlib_buffer_push_uninit (b, sizeof (ip6_header_t)); - + ASSERT (flow_label < 1 << 20); ip6h->ip_version_traffic_class_and_flow_label = - clib_host_to_net_u32 (0x6 << 28); + clib_host_to_net_u32 ((0x6 << 28) | flow_label); /* calculate ip6 payload length */ payload_length = vlib_buffer_length_in_chain (vm, b); @@ -570,14 +581,45 @@ vlib_buffer_push_ip6 (vlib_main_t * vm, vlib_buffer_t * b, ip6h->hop_limit = 0xff; ip6h->protocol = proto; - clib_memcpy (ip6h->src_address.as_u8, src->as_u8, - sizeof (ip6h->src_address)); - clib_memcpy (ip6h->dst_address.as_u8, dst->as_u8, - sizeof (ip6h->src_address)); + clib_memcpy_fast (ip6h->src_address.as_u8, src->as_u8, + sizeof (ip6h->src_address)); + clib_memcpy_fast (ip6h->dst_address.as_u8, dst->as_u8, + sizeof (ip6h->src_address)); + vnet_buffer (b)->l3_hdr_offset = (u8 *) ip6h - b->data; + b->flags |= VNET_BUFFER_F_IS_IP6 | VNET_BUFFER_F_L3_HDR_OFFSET_VALID; return ip6h; } +/** + * Push IPv6 header to buffer + * + * @param vm - vlib_main + * @param b - buffer to write the header to + * @param src - source IP + * @param dst - destination IP + * @param prot - payload proto + * + * @return - pointer to start of IP header + */ +always_inline void * +vlib_buffer_push_ip6 (vlib_main_t * vm, vlib_buffer_t * b, + ip6_address_t * src, ip6_address_t * dst, int proto) +{ + return vlib_buffer_push_ip6_custom (vm, b, src, dst, proto, + 0 /* flow label */ ); + +} + +always_inline u32 +vlib_buffer_get_ip6_fib_index (vlib_buffer_t * b) +{ + u32 fib_index, sw_if_index; + sw_if_index = vnet_buffer (b)->sw_if_index[VLIB_RX]; + fib_index = vnet_buffer (b)->sw_if_index[VLIB_TX]; + return (fib_index == (u32) ~ 0) ? + vec_elt (ip6_main.fib_index_by_sw_if_index, sw_if_index) : fib_index; +} #endif /* included_ip_ip6_h */ /*