diff options
Diffstat (limited to 'src/vnet/ipip')
| -rw-r--r-- | src/vnet/ipip/ipip.api | 1 | ||||
| -rw-r--r-- | src/vnet/ipip/ipip.c | 322 | ||||
| -rw-r--r-- | src/vnet/ipip/ipip.h | 36 | ||||
| -rw-r--r-- | src/vnet/ipip/ipip_api.c | 9 | ||||
| -rw-r--r-- | src/vnet/ipip/ipip_cli.c | 57 | ||||
| -rw-r--r-- | src/vnet/ipip/node.c | 26 | ||||
| -rw-r--r-- | src/vnet/ipip/sixrd.c | 14 |
7 files changed, 386 insertions, 79 deletions
diff --git a/src/vnet/ipip/ipip.api b/src/vnet/ipip/ipip.api index 8ba31363b17..4fbfa1d584e 100644 --- a/src/vnet/ipip/ipip.api +++ b/src/vnet/ipip/ipip.api @@ -67,6 +67,7 @@ typedef ipip_tunnel details/dump */ u32 table_id; vl_api_tunnel_encap_decap_flags_t flags; + vl_api_tunnel_mode_t mode; vl_api_ip_dscp_t dscp; /* DSCP value for the tunnel encap, ignored if ECNAP_COPY_DSCP flag is set */ }; diff --git a/src/vnet/ipip/ipip.c b/src/vnet/ipip/ipip.c index 05460fbbe34..aa8d8daca4b 100644 --- a/src/vnet/ipip/ipip.c +++ b/src/vnet/ipip/ipip.c @@ -25,6 +25,7 @@ #include <vnet/fib/ip6_fib.h> #include <vnet/ip/format.h> #include <vnet/ipip/ipip.h> +#include <vnet/nhrp/nhrp.h> ipip_main_t ipip_main; @@ -55,10 +56,14 @@ static u8 * ipip_build_rewrite (vnet_main_t * vnm, u32 sw_if_index, vnet_link_t link_type, const void *dst_address) { + const ip46_address_t *dst; ip4_header_t *ip4; ip6_header_t *ip6; u8 *rewrite = NULL; - ipip_tunnel_t *t = ipip_tunnel_db_find_by_sw_if_index (sw_if_index); + ipip_tunnel_t *t; + + dst = dst_address; + t = ipip_tunnel_db_find_by_sw_if_index (sw_if_index); if (!t) /* not one of ours */ @@ -73,12 +78,12 @@ ipip_build_rewrite (vnet_main_t * vnm, u32 sw_if_index, ip4->ttl = 64; /* fixup ip4 header length, protocol and checksum after-the-fact */ ip4->src_address.as_u32 = t->tunnel_src.ip4.as_u32; - ip4->dst_address.as_u32 = t->tunnel_dst.ip4.as_u32; - ip4->checksum = ip4_header_checksum (ip4); + ip4->dst_address.as_u32 = dst->ip4.as_u32; if (!(t->flags & TUNNEL_ENCAP_DECAP_FLAG_ENCAP_COPY_DSCP)) ip4_header_set_dscp (ip4, t->dscp); if (t->flags & TUNNEL_ENCAP_DECAP_FLAG_ENCAP_SET_DF) ip4_header_set_df (ip4); + ip4->checksum = ip4_header_checksum (ip4); break; case IPIP_TRANSPORT_IP6: @@ -90,15 +95,11 @@ ipip_build_rewrite (vnet_main_t * vnm, u32 sw_if_index, /* fixup ip6 header length and protocol after-the-fact */ ip6->src_address.as_u64[0] = t->tunnel_src.ip6.as_u64[0]; ip6->src_address.as_u64[1] = t->tunnel_src.ip6.as_u64[1]; - ip6->dst_address.as_u64[0] = t->tunnel_dst.ip6.as_u64[0]; - ip6->dst_address.as_u64[1] = t->tunnel_dst.ip6.as_u64[1]; + ip6->dst_address.as_u64[0] = dst->ip6.as_u64[0]; + ip6->dst_address.as_u64[1] = dst->ip6.as_u64[1]; if (!(t->flags & TUNNEL_ENCAP_DECAP_FLAG_ENCAP_COPY_DSCP)) ip6_set_dscp_network_order (ip6, t->dscp); break; - - default: - /* pass through */ - ; } return (rewrite); } @@ -107,8 +108,10 @@ static void ipip4_fixup (vlib_main_t * vm, const ip_adjacency_t * adj, vlib_buffer_t * b, const void *data) { + tunnel_encap_decap_flags_t flags; ip4_header_t *ip4; - const ipip_tunnel_t *t = data; + + flags = pointer_to_uword (data); ip4 = vlib_buffer_get_current (b); ip4->length = clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, b)); @@ -116,11 +119,11 @@ ipip4_fixup (vlib_main_t * vm, const ip_adjacency_t * adj, vlib_buffer_t * b, { case VNET_LINK_IP6: ip4->protocol = IP_PROTOCOL_IPV6; - if (t->flags & TUNNEL_ENCAP_DECAP_FLAG_ENCAP_COPY_DSCP) + if (flags & TUNNEL_ENCAP_DECAP_FLAG_ENCAP_COPY_DSCP) ip4_header_set_dscp (ip4, ip6_dscp_network_order ((ip6_header_t *) (ip4 + 1))); - if (t->flags & TUNNEL_ENCAP_DECAP_FLAG_ENCAP_COPY_ECN) + if (flags & TUNNEL_ENCAP_DECAP_FLAG_ENCAP_COPY_ECN) ip4_header_set_ecn (ip4, ip6_ecn_network_order ((ip6_header_t *) (ip4 + 1))); @@ -128,11 +131,11 @@ ipip4_fixup (vlib_main_t * vm, const ip_adjacency_t * adj, vlib_buffer_t * b, case VNET_LINK_IP4: ip4->protocol = IP_PROTOCOL_IP_IN_IP; - if (t->flags & TUNNEL_ENCAP_DECAP_FLAG_ENCAP_COPY_DSCP) + if (flags & TUNNEL_ENCAP_DECAP_FLAG_ENCAP_COPY_DSCP) ip4_header_set_dscp (ip4, ip4_header_get_dscp (ip4 + 1)); - if (t->flags & TUNNEL_ENCAP_DECAP_FLAG_ENCAP_COPY_ECN) + if (flags & TUNNEL_ENCAP_DECAP_FLAG_ENCAP_COPY_ECN) ip4_header_set_ecn (ip4, ip4_header_get_ecn (ip4 + 1)); - if ((t->flags & TUNNEL_ENCAP_DECAP_FLAG_ENCAP_COPY_DF) && + if ((flags & TUNNEL_ENCAP_DECAP_FLAG_ENCAP_COPY_DF) && ip4_header_get_df (ip4 + 1)) ip4_header_set_df (ip4); break; @@ -148,8 +151,10 @@ static void ipip6_fixup (vlib_main_t * vm, const ip_adjacency_t * adj, vlib_buffer_t * b, const void *data) { + tunnel_encap_decap_flags_t flags; ip6_header_t *ip6; - const ipip_tunnel_t *t = data; + + flags = pointer_to_uword (data); /* Must set locally originated otherwise we're not allowed to fragment the packet later */ @@ -163,18 +168,18 @@ ipip6_fixup (vlib_main_t * vm, const ip_adjacency_t * adj, vlib_buffer_t * b, { case VNET_LINK_IP6: ip6->protocol = IP_PROTOCOL_IPV6; - if (t->flags & TUNNEL_ENCAP_DECAP_FLAG_ENCAP_COPY_DSCP) + if (flags & TUNNEL_ENCAP_DECAP_FLAG_ENCAP_COPY_DSCP) ip6_set_dscp_network_order (ip6, ip6_dscp_network_order (ip6 + 1)); - if (t->flags & TUNNEL_ENCAP_DECAP_FLAG_ENCAP_COPY_ECN) + if (flags & TUNNEL_ENCAP_DECAP_FLAG_ENCAP_COPY_ECN) ip6_set_ecn_network_order (ip6, ip6_ecn_network_order (ip6 + 1)); break; case VNET_LINK_IP4: ip6->protocol = IP_PROTOCOL_IP_IN_IP; - if (t->flags & TUNNEL_ENCAP_DECAP_FLAG_ENCAP_COPY_DSCP) + if (flags & TUNNEL_ENCAP_DECAP_FLAG_ENCAP_COPY_DSCP) ip6_set_dscp_network_order (ip6, ip4_header_get_dscp ((ip4_header_t *) (ip6 + 1))); - if (t->flags & TUNNEL_ENCAP_DECAP_FLAG_ENCAP_COPY_ECN) + if (flags & TUNNEL_ENCAP_DECAP_FLAG_ENCAP_COPY_ECN) ip6_set_ecn_network_order (ip6, ip4_header_get_ecn ((ip4_header_t *) (ip6 + 1))); break; @@ -257,14 +262,89 @@ ipip_update_adj (vnet_main_t * vnm, u32 sw_if_index, adj_index_t ai) if (VNET_LINK_ETHERNET == adj_get_link_type (ai)) af |= ADJ_FLAG_MIDCHAIN_NO_COUNT; - adj_nbr_midchain_update_rewrite (ai, f, t, af, - ipip_build_rewrite (vnm, - sw_if_index, - adj_get_link_type - (ai), NULL)); + adj_nbr_midchain_update_rewrite + (ai, f, uword_to_pointer (t->flags, void *), af, + ipip_build_rewrite (vnm, sw_if_index, + adj_get_link_type (ai), &t->tunnel_dst)); ipip_tunnel_stack (ai); } +typedef struct mipip_walk_ctx_t_ +{ + const ipip_tunnel_t *t; + const nhrp_entry_t *ne; +} mipip_walk_ctx_t; + +static adj_walk_rc_t +mipip_mk_complete_walk (adj_index_t ai, void *data) +{ + mipip_walk_ctx_t *ctx = data; + adj_midchain_fixup_t f; + + f = ctx->t->transport == IPIP_TRANSPORT_IP6 ? ipip6_fixup : ipip4_fixup; + + adj_nbr_midchain_update_rewrite + (ai, f, uword_to_pointer (ctx->t->flags, void *), + ADJ_FLAG_MIDCHAIN_IP_STACK, ipip_build_rewrite (vnet_get_main (), + ctx->t->sw_if_index, + adj_get_link_type (ai), + &nhrp_entry_get_nh + (ctx->ne)->fp_addr)); + + nhrp_entry_adj_stack (ctx->ne, ai); + + return (ADJ_WALK_RC_CONTINUE); +} + +static adj_walk_rc_t +mipip_mk_incomplete_walk (adj_index_t ai, void *data) +{ + ipip_tunnel_t *t = data; + adj_midchain_fixup_t f; + + f = t->transport == IPIP_TRANSPORT_IP6 ? ipip6_fixup : ipip4_fixup; + + adj_nbr_midchain_update_rewrite (ai, f, NULL, ADJ_FLAG_NONE, NULL); + + adj_midchain_delegate_unstack (ai); + + return (ADJ_WALK_RC_CONTINUE); +} + +void +mipip_update_adj (vnet_main_t * vnm, u32 sw_if_index, adj_index_t ai) +{ + ipip_main_t *gm = &ipip_main; + adj_midchain_fixup_t f; + ip_adjacency_t *adj; + nhrp_entry_t *ne; + ipip_tunnel_t *t; + u32 ti; + + adj = adj_get (ai); + ti = gm->tunnel_index_by_sw_if_index[sw_if_index]; + t = pool_elt_at_index (gm->tunnels, ti); + f = t->transport == IPIP_TRANSPORT_IP6 ? ipip6_fixup : ipip4_fixup; + + ne = nhrp_entry_find (sw_if_index, &adj->sub_type.nbr.next_hop); + + if (NULL == ne) + { + // no NHRP entry to provide the next-hop + adj_nbr_midchain_update_rewrite + (ai, f, uword_to_pointer (t->flags, void *), ADJ_FLAG_NONE, NULL); + return; + } + + mipip_walk_ctx_t ctx = { + .t = t, + .ne = ne + }; + adj_nbr_walk_nh (sw_if_index, + adj->ia_nh_proto, + &adj->sub_type.nbr.next_hop, mipip_mk_complete_walk, &ctx); +} + static u8 * format_ipip_tunnel_name (u8 * s, va_list * args) { @@ -350,10 +430,19 @@ VNET_HW_INTERFACE_CLASS(ipip_hw_interface_class) = { .update_adjacency = ipip_update_adj, .flags = VNET_HW_INTERFACE_CLASS_FLAG_P2P, }; + +VNET_HW_INTERFACE_CLASS(mipip_hw_interface_class) = { + .name = "mIPIP", + //.format_header = format_ipip_header_with_length, + //.unformat_header = unformat_ipip_header, + .build_rewrite = ipip_build_rewrite, + .update_adjacency = mipip_update_adj, + .flags = VNET_HW_INTERFACE_CLASS_FLAG_NBMA, +}; /* *INDENT-ON* */ ipip_tunnel_t * -ipip_tunnel_db_find (ipip_tunnel_key_t * key) +ipip_tunnel_db_find (const ipip_tunnel_key_t * key) { ipip_main_t *gm = &ipip_main; uword *p; @@ -377,30 +466,155 @@ ipip_tunnel_db_find_by_sw_if_index (u32 sw_if_index) } void -ipip_tunnel_db_add (ipip_tunnel_t * t, ipip_tunnel_key_t * key) +ipip_tunnel_db_add (ipip_tunnel_t * t, const ipip_tunnel_key_t * key) { ipip_main_t *gm = &ipip_main; - t->key = clib_mem_alloc (sizeof (*t->key)); - clib_memcpy (t->key, key, sizeof (*key)); - hash_set_mem (gm->tunnel_by_key, t->key, t->dev_instance); + hash_set_mem_alloc (&gm->tunnel_by_key, key, t->dev_instance); } void -ipip_tunnel_db_remove (ipip_tunnel_t * t) +ipip_tunnel_db_remove (ipip_tunnel_t * t, const ipip_tunnel_key_t * key) { ipip_main_t *gm = &ipip_main; - hash_unset_mem (gm->tunnel_by_key, t->key); - clib_mem_free (t->key); - t->key = NULL; + hash_unset_mem_free (&gm->tunnel_by_key, key); +} + +void +ipip_mk_key_i (ipip_transport_t transport, + ipip_mode_t mode, + const ip46_address_t * src, + const ip46_address_t * dst, + u32 fib_index, ipip_tunnel_key_t * key) +{ + key->transport = transport; + key->mode = mode; + key->src = *src; + key->dst = *dst; + key->fib_index = fib_index; + key->__pad = 0;; +} + +void +ipip_mk_key (const ipip_tunnel_t * t, ipip_tunnel_key_t * key) +{ + ipip_mk_key_i (t->transport, t->mode, + &t->tunnel_src, &t->tunnel_dst, t->fib_index, key); +} + +static void +ipip_nhrp_mk_key (const ipip_tunnel_t * t, + const nhrp_entry_t * ne, ipip_tunnel_key_t * key) +{ + const fib_prefix_t *nh; + + nh = nhrp_entry_get_nh (ne); + + /* construct the key using mode P2P so it can be found in the DP */ + ipip_mk_key_i (t->transport, IPIP_MODE_P2P, + &t->tunnel_src, &nh->fp_addr, + nhrp_entry_get_fib_index (ne), key); +} + +static void +ipip_nhrp_entry_added (const nhrp_entry_t * ne) +{ + ipip_main_t *gm = &ipip_main; + const ip46_address_t *nh; + ipip_tunnel_key_t key; + ipip_tunnel_t *t; + u32 sw_if_index; + u32 t_idx; + + sw_if_index = nhrp_entry_get_sw_if_index (ne); + if (vec_len (gm->tunnel_index_by_sw_if_index) < sw_if_index) + return; + + t_idx = gm->tunnel_index_by_sw_if_index[sw_if_index]; + + if (INDEX_INVALID == t_idx) + return; + + t = pool_elt_at_index (gm->tunnels, t_idx); + + ipip_nhrp_mk_key (t, ne, &key); + ipip_tunnel_db_add (t, &key); + + // update the rewrites for each of the adjacencies for this next-hop + mipip_walk_ctx_t ctx = { + .t = t, + .ne = ne + }; + nh = nhrp_entry_get_peer (ne); + adj_nbr_walk_nh (nhrp_entry_get_sw_if_index (ne), + (ip46_address_is_ip4 (nh) ? + FIB_PROTOCOL_IP4 : + FIB_PROTOCOL_IP6), nh, mipip_mk_complete_walk, &ctx); +} + +static void +ipip_nhrp_entry_deleted (const nhrp_entry_t * ne) +{ + ipip_main_t *gm = &ipip_main; + const ip46_address_t *nh; + ipip_tunnel_key_t key; + ipip_tunnel_t *t; + u32 sw_if_index; + u32 t_idx; + + sw_if_index = nhrp_entry_get_sw_if_index (ne); + if (vec_len (gm->tunnel_index_by_sw_if_index) < sw_if_index) + return; + + t_idx = gm->tunnel_index_by_sw_if_index[sw_if_index]; + + if (INDEX_INVALID == t_idx) + return; + + t = pool_elt_at_index (gm->tunnels, t_idx); + + ipip_nhrp_mk_key (t, ne, &key); + ipip_tunnel_db_remove (t, &key); + + nh = nhrp_entry_get_peer (ne); + + /* make all the adjacencies incomplete */ + adj_nbr_walk_nh (nhrp_entry_get_sw_if_index (ne), + (ip46_address_is_ip4 (nh) ? + FIB_PROTOCOL_IP4 : + FIB_PROTOCOL_IP6), nh, mipip_mk_incomplete_walk, t); +} + +static walk_rc_t +ipip_tunnel_delete_nhrp_walk (index_t nei, void *ctx) +{ + ipip_tunnel_t *t = ctx; + ipip_tunnel_key_t key; + + ipip_nhrp_mk_key (t, nhrp_entry_get (nei), &key); + ipip_tunnel_db_remove (t, &key); + + return (WALK_CONTINUE); +} + +static walk_rc_t +ipip_tunnel_add_nhrp_walk (index_t nei, void *ctx) +{ + ipip_tunnel_t *t = ctx; + ipip_tunnel_key_t key; + + ipip_nhrp_mk_key (t, nhrp_entry_get (nei), &key); + ipip_tunnel_db_add (t, &key); + + return (WALK_CONTINUE); } int ipip_add_tunnel (ipip_transport_t transport, u32 instance, ip46_address_t * src, ip46_address_t * dst, u32 fib_index, tunnel_encap_decap_flags_t flags, - ip_dscp_t dscp, u32 * sw_if_indexp) + ip_dscp_t dscp, tunnel_mode_t tmode, u32 * sw_if_indexp) { ipip_main_t *gm = &ipip_main; vnet_main_t *vnm = gm->vnet_main; @@ -409,11 +623,15 @@ ipip_add_tunnel (ipip_transport_t transport, ipip_tunnel_t *t; vnet_hw_interface_t *hi; u32 hw_if_index, sw_if_index; - ipip_tunnel_key_t key = {.transport = transport, - .fib_index = fib_index, - .src = *src, - .dst = *dst - }; + ipip_tunnel_key_t key; + ipip_mode_t mode; + + if (tmode == TUNNEL_MODE_MP && !ip46_address_is_zero (dst)) + return (VNET_API_ERROR_INVALID_DST_ADDRESS); + + mode = (tmode == TUNNEL_MODE_P2P ? IPIP_MODE_P2P : IPIP_MODE_P2MP); + ipip_mk_key_i (transport, mode, src, dst, fib_index, &key); + t = ipip_tunnel_db_find (&key); if (t) { @@ -441,12 +659,15 @@ ipip_add_tunnel (ipip_transport_t transport, t->user_instance = u_idx; /* name */ hw_if_index = vnet_register_interface (vnm, ipip_device_class.index, t_idx, - ipip_hw_interface_class.index, + (mode == IPIP_MODE_P2P ? + ipip_hw_interface_class.index : + mipip_hw_interface_class.index), t_idx); hi = vnet_get_hw_interface (vnm, hw_if_index); sw_if_index = hi->sw_if_index; + t->mode = mode; t->hw_if_index = hw_if_index; t->fib_index = fib_index; t->sw_if_index = sw_if_index; @@ -476,6 +697,9 @@ ipip_add_tunnel (ipip_transport_t transport, ipip_tunnel_db_add (t, &key); + if (t->mode == IPIP_MODE_P2MP) + nhrp_walk_itf (t->sw_if_index, ipip_tunnel_add_nhrp_walk, t); + if (sw_if_indexp) *sw_if_indexp = sw_if_index; @@ -500,22 +724,32 @@ ipip_del_tunnel (u32 sw_if_index) ipip_main_t *gm = &ipip_main; vnet_main_t *vnm = gm->vnet_main; ipip_tunnel_t *t; - + ipip_tunnel_key_t key; t = ipip_tunnel_db_find_by_sw_if_index (sw_if_index); if (t == NULL) return VNET_API_ERROR_NO_SUCH_ENTRY; + if (t->mode == IPIP_MODE_P2MP) + nhrp_walk_itf (t->sw_if_index, ipip_tunnel_delete_nhrp_walk, t); + vnet_sw_interface_set_flags (vnm, sw_if_index, 0 /* down */ ); gm->tunnel_index_by_sw_if_index[sw_if_index] = ~0; vnet_delete_hw_interface (vnm, t->hw_if_index); hash_unset (gm->instance_used, t->user_instance); - ipip_tunnel_db_remove (t); + + ipip_mk_key (t, &key); + ipip_tunnel_db_remove (t, &key); pool_put (gm->tunnels, t); return 0; } +const static nhrp_vft_t ipip_nhrp_vft = { + .nv_added = ipip_nhrp_entry_added, + .nv_deleted = ipip_nhrp_entry_deleted, +}; + static clib_error_t * ipip_init (vlib_main_t * vm) { @@ -527,6 +761,8 @@ ipip_init (vlib_main_t * vm) gm->tunnel_by_key = hash_create_mem (0, sizeof (ipip_tunnel_key_t), sizeof (uword)); + nhrp_register (&ipip_nhrp_vft); + return 0; } diff --git a/src/vnet/ipip/ipip.h b/src/vnet/ipip/ipip.h index a3732f75128..fef5aab0490 100644 --- a/src/vnet/ipip/ipip.h +++ b/src/vnet/ipip/ipip.h @@ -48,21 +48,26 @@ typedef enum { IPIP_TRANSPORT_IP4, IPIP_TRANSPORT_IP6, -} ipip_transport_t; +} __clib_packed ipip_transport_t; + +typedef enum +{ + IPIP_MODE_P2P = 0, + IPIP_MODE_P2MP, + IPIP_MODE_6RD, +} __clib_packed ipip_mode_t; typedef struct { ip46_address_t src; ip46_address_t dst; - ipip_transport_t transport; u32 fib_index; -} __attribute__ ((packed)) ipip_tunnel_key_t; + ipip_transport_t transport; + ipip_mode_t mode; + u16 __pad; +} __clib_packed ipip_tunnel_key_t; -typedef enum -{ - IPIP_MODE_P2P = 0, - IPIP_MODE_6RD, -} ipip_mode_t; +STATIC_ASSERT_SIZEOF (ipip_tunnel_key_t, 5 * sizeof (u64)); /** * @brief A representation of a IPIP tunnel @@ -74,7 +79,6 @@ typedef struct ipip_mode_t mode; ipip_transport_t transport; - ipip_tunnel_key_t *key; ip46_address_t tunnel_src; ip46_address_t tunnel_dst; u32 fib_index; @@ -145,7 +149,7 @@ sixrd_get_addr_net (const ipip_tunnel_t * t, u64 dal) int ipip_add_tunnel (ipip_transport_t transport, u32 instance, ip46_address_t * src, ip46_address_t * dst, u32 fib_index, tunnel_encap_decap_flags_t flags, - ip_dscp_t dscp, u32 * sw_if_indexp); + ip_dscp_t dscp, tunnel_mode_t mode, u32 * sw_if_indexp); int ipip_del_tunnel (u32 sw_if_index); int sixrd_add_tunnel (ip6_address_t * ip6_prefix, u8 ip6_prefix_len, ip4_address_t * ip4_prefix, u8 ip4_prefix_len, @@ -153,10 +157,16 @@ int sixrd_add_tunnel (ip6_address_t * ip6_prefix, u8 ip6_prefix_len, u32 ip4_fib_index, u32 ip6_fib_index, u32 * sw_if_index); int sixrd_del_tunnel (u32 sw_if_index); -void ipip_tunnel_db_add (ipip_tunnel_t * t, ipip_tunnel_key_t * key); -void ipip_tunnel_db_remove (ipip_tunnel_t * t); -ipip_tunnel_t *ipip_tunnel_db_find (ipip_tunnel_key_t * key); +void ipip_tunnel_db_add (ipip_tunnel_t * t, const ipip_tunnel_key_t * key); +void ipip_tunnel_db_remove (ipip_tunnel_t * t, const ipip_tunnel_key_t * key); +ipip_tunnel_t *ipip_tunnel_db_find (const ipip_tunnel_key_t * key); ipip_tunnel_t *ipip_tunnel_db_find_by_sw_if_index (u32 sw_if_index); +void ipip_mk_key (const ipip_tunnel_t * t, ipip_tunnel_key_t * key); +void ipip_mk_key_i (ipip_transport_t transport, + ipip_mode_t mode, + const ip46_address_t * src, + const ip46_address_t * dst, + u32 fib_index, ipip_tunnel_key_t * key); #endif diff --git a/src/vnet/ipip/ipip_api.c b/src/vnet/ipip/ipip_api.c index 4f6aa7f3dbe..97fff156d35 100644 --- a/src/vnet/ipip/ipip_api.c +++ b/src/vnet/ipip/ipip_api.c @@ -40,6 +40,7 @@ vl_api_ipip_add_tunnel_t_handler (vl_api_ipip_add_tunnel_t * mp) tunnel_encap_decap_flags_t flags; ip46_address_t src, dst; ip46_type_t itype[2]; + tunnel_mode_t mode; itype[0] = ip_address_decode (&mp->tunnel.src, &src); itype[1] = ip_address_decode (&mp->tunnel.dst, &dst); @@ -61,6 +62,11 @@ vl_api_ipip_add_tunnel_t_handler (vl_api_ipip_add_tunnel_t * mp) if (rv) goto out; + rv = tunnel_mode_decode (mp->tunnel.mode, &mode); + + if (rv) + goto out; + fib_index = fib_table_find (fib_proto_from_ip46 (itype[0]), ntohl (mp->tunnel.table_id)); @@ -75,7 +81,8 @@ vl_api_ipip_add_tunnel_t_handler (vl_api_ipip_add_tunnel_t * mp) IPIP_TRANSPORT_IP4), ntohl (mp->tunnel.instance), &src, &dst, fib_index, flags, - ip_dscp_decode (mp->tunnel.dscp), &sw_if_index); + ip_dscp_decode (mp->tunnel.dscp), mode, + &sw_if_index); } out: diff --git a/src/vnet/ipip/ipip_cli.c b/src/vnet/ipip/ipip_cli.c index 09f2ebae228..d3410558271 100644 --- a/src/vnet/ipip/ipip_cli.c +++ b/src/vnet/ipip/ipip_cli.c @@ -31,6 +31,7 @@ static clib_error_t *create_ipip_tunnel_command_fn(vlib_main_t *vm, u32 sw_if_index; clib_error_t *error = NULL; bool ip4_set = false, ip6_set = false; + tunnel_mode_t mode = TUNNEL_MODE_P2P; /* Get a line of input. */ if (!unformat_user(input, unformat_line_input, line_input)) @@ -51,6 +52,8 @@ static clib_error_t *create_ipip_tunnel_command_fn(vlib_main_t *vm, } else if (unformat(line_input, "dst %U", unformat_ip6_address, &dst.ip6)) { num_m_args++; ip6_set = true; + } else if (unformat(line_input, "%U", unformat_tunnel_mode, &mode)) { + num_m_args++; } else if (unformat(line_input, "outer-table-id %d", &table_id)) ; else { @@ -84,6 +87,7 @@ static clib_error_t *create_ipip_tunnel_command_fn(vlib_main_t *vm, fib_index, TUNNEL_ENCAP_DECAP_FLAG_NONE, IP_DSCP_CS0, + mode, &sw_if_index); } @@ -104,6 +108,9 @@ static clib_error_t *create_ipip_tunnel_command_fn(vlib_main_t *vm, case VNET_API_ERROR_INSTANCE_IN_USE: error = clib_error_return(0, "Instance is in use"); goto done; + case VNET_API_ERROR_INVALID_DST_ADDRESS: + error = clib_error_return(0, "destination IP address when mode is multi-point"); + goto done; default: error = clib_error_return(0, "vnet_ipip_add_del_tunnel returned %d", rv); goto done; @@ -182,12 +189,16 @@ static u8 *format_ipip_tunnel(u8 *s, va_list *args) { format_ip6_address, &t->sixrd.ip6_prefix, t->sixrd.ip6_prefix_len); break; case IPIP_MODE_P2P: - default: s = format(s, "[%d] instance %d src %U dst %U ", t->dev_instance, t->user_instance, format_ip46_address, &t->tunnel_src, type, format_ip46_address, &t->tunnel_dst, type); break; + case IPIP_MODE_P2MP: + s = format(s, "[%d] instance %d p2mp src %U ", + t->dev_instance, t->user_instance, + format_ip46_address, &t->tunnel_src, type); + break; } s = format(s, "table-ID %d sw-if-idx %d flags [%U] dscp %U", @@ -235,6 +246,50 @@ VLIB_CLI_COMMAND(show_ipip_tunnel_command, static) = { }; /* *INDENT-ON* */ +static u8 * +format_ipip_tunnel_key (u8 *s, va_list *args) +{ + ipip_tunnel_key_t *t = va_arg(*args, ipip_tunnel_key_t *); + + s = format (s, "src:%U dst:%U fib:%d transport:%d mode:%d", + format_ip46_address, &t->src, IP46_TYPE_ANY, + format_ip46_address, &t->dst, IP46_TYPE_ANY, + t->fib_index, t->transport, t->mode); + + return (s); +} + +static clib_error_t * +ipip_tunnel_hash_show (vlib_main_t * vm, + unformat_input_t * input, + vlib_cli_command_t * cmd) +{ + ipip_main_t *im = &ipip_main; + ipip_tunnel_key_t *key; + u32 index; + + /* *INDENT-OFF* */ + hash_foreach(key, index, im->tunnel_by_key, + ({ + vlib_cli_output (vm, " %U -> %d", format_ipip_tunnel_key, key, index); + })); + /* *INDENT-ON* */ + + return NULL; +} + +/** + * show IPSEC tunnel protection hash tables + */ +/* *INDENT-OFF* */ +VLIB_CLI_COMMAND (ipip_tunnel_hash_show_node, static) = +{ + .path = "show ipip tunnel-hash", + .function = ipip_tunnel_hash_show, + .short_help = "show ipip tunnel-hash", +}; +/* *INDENT-ON* */ + static clib_error_t *create_sixrd_tunnel_command_fn(vlib_main_t *vm, unformat_input_t *input, vlib_cli_command_t *cmd) { diff --git a/src/vnet/ipip/node.c b/src/vnet/ipip/node.c index bc0250ad6ef..0f47f2636db 100644 --- a/src/vnet/ipip/node.c +++ b/src/vnet/ipip/node.c @@ -83,9 +83,6 @@ ipip_input (vlib_main_t * vm, vlib_node_runtime_t * node, ip4_header_t *ip40; ip6_header_t *ip60; u32 next0 = IPIP_INPUT_NEXT_DROP; - ip46_address_t src0 = ip46_address_initializer, dst0 = - ip46_address_initializer; - ipip_transport_t transport0; u8 inner_protocol0; bi0 = to_next[0] = from[0]; @@ -96,6 +93,11 @@ ipip_input (vlib_main_t * vm, vlib_node_runtime_t * node, b0 = vlib_get_buffer (vm, bi0); + ipip_tunnel_key_t key0 = { + .fib_index = vnet_buffer (b0)->ip.fib_index, + .mode = IPIP_MODE_P2P, + }; + if (is_ipv6) { ip60 = vlib_buffer_get_current (b0); @@ -108,10 +110,10 @@ ipip_input (vlib_main_t * vm, vlib_node_runtime_t * node, } vlib_buffer_advance (b0, sizeof (*ip60)); - ip_set (&src0, &ip60->src_address, false); - ip_set (&dst0, &ip60->dst_address, false); + ip_set (&key0.dst, &ip60->src_address, false); + ip_set (&key0.src, &ip60->dst_address, false); inner_protocol0 = ip60->protocol; - transport0 = IPIP_TRANSPORT_IP6; + key0.transport = IPIP_TRANSPORT_IP6; } else { @@ -125,25 +127,21 @@ ipip_input (vlib_main_t * vm, vlib_node_runtime_t * node, goto drop; } vlib_buffer_advance (b0, sizeof (*ip40)); - ip_set (&src0, &ip40->src_address, true); - ip_set (&dst0, &ip40->dst_address, true); + ip_set (&key0.dst, &ip40->src_address, true); + ip_set (&key0.src, &ip40->dst_address, true); inner_protocol0 = ip40->protocol; - transport0 = IPIP_TRANSPORT_IP4; + key0.transport = IPIP_TRANSPORT_IP4; } /* * Find tunnel. First a lookup for P2P tunnels, then a lookup * for multipoint tunnels */ - ipip_tunnel_key_t key0 = {.transport = transport0, - .fib_index = vnet_buffer (b0)->ip.fib_index, - .src = dst0, - .dst = src0 - }; ipip_tunnel_t *t0 = ipip_tunnel_db_find (&key0); if (!t0) { ip46_address_reset (&key0.dst); + key0.mode = IPIP_MODE_6RD; t0 = ipip_tunnel_db_find (&key0); if (!t0) { diff --git a/src/vnet/ipip/sixrd.c b/src/vnet/ipip/sixrd.c index 04df0eeabe5..492b4f83260 100644 --- a/src/vnet/ipip/sixrd.c +++ b/src/vnet/ipip/sixrd.c @@ -283,12 +283,10 @@ sixrd_add_tunnel (ip6_address_t * ip6_prefix, u8 ip6_prefix_len, ip46_address_t src = ip46_address_initializer, dst = ip46_address_initializer; ip_set (&src, ip4_src, true); - ipip_tunnel_key_t key = { - .transport = IPIP_TRANSPORT_IP4, - .fib_index = ip4_fib_index, - .src = src, - .dst = dst - }; + ipip_tunnel_key_t key; + + ipip_mk_key_i (IPIP_TRANSPORT_IP4, IPIP_MODE_6RD, &src, &dst, ip4_fib_index, + &key); t = ipip_tunnel_db_find (&key); if (t) @@ -377,6 +375,7 @@ sixrd_del_tunnel (u32 sw_if_index) { ipip_main_t *gm = &ipip_main; ipip_tunnel_t *t = ipip_tunnel_db_find_by_sw_if_index (sw_if_index); + ipip_tunnel_key_t key; if (!t) { @@ -408,7 +407,8 @@ sixrd_del_tunnel (u32 sw_if_index) gm->tunnel_index_by_sw_if_index[t->sw_if_index] = ~0; vnet_delete_hw_interface (vnet_get_main (), t->hw_if_index); - ipip_tunnel_db_remove (t); + ipip_mk_key (t, &key); + ipip_tunnel_db_remove (t, &key); pool_put (gm->tunnels, t); return 0; |