X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fipip%2Fipip.c;h=d43bcd1cb5399cc90001032a8f53e46936f849ef;hb=a91cb4590;hp=aa8d8daca4bca2fb5aa3ba00d7e1f3976f41c807;hpb=14053c9dbd75182f5302f7388d17508f3930f7ce;p=vpp.git diff --git a/src/vnet/ipip/ipip.c b/src/vnet/ipip/ipip.c index aa8d8daca4b..d43bcd1cb53 100644 --- a/src/vnet/ipip/ipip.c +++ b/src/vnet/ipip/ipip.c @@ -25,7 +25,8 @@ #include #include #include -#include +#include +#include ipip_main_t ipip_main; @@ -83,6 +84,21 @@ ipip_build_rewrite (vnet_main_t * vnm, u32 sw_if_index, ip4_header_set_dscp (ip4, t->dscp); if (t->flags & TUNNEL_ENCAP_DECAP_FLAG_ENCAP_SET_DF) ip4_header_set_df (ip4); + + switch (link_type) + { + case VNET_LINK_IP6: + ip4->protocol = IP_PROTOCOL_IPV6; + break; + case VNET_LINK_IP4: + ip4->protocol = IP_PROTOCOL_IP_IN_IP; + break; + case VNET_LINK_MPLS: + ip4->protocol = IP_PROTOCOL_MPLS_IN_IP; + break; + default: + break; + } ip4->checksum = ip4_header_checksum (ip4); break; @@ -99,14 +115,29 @@ ipip_build_rewrite (vnet_main_t * vnm, u32 sw_if_index, 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); + + switch (link_type) + { + case VNET_LINK_IP6: + ip6->protocol = IP_PROTOCOL_IPV6; + break; + case VNET_LINK_IP4: + ip6->protocol = IP_PROTOCOL_IP_IN_IP; + break; + case VNET_LINK_MPLS: + ip6->protocol = IP_PROTOCOL_MPLS_IN_IP; + break; + default: + break; + } break; } return (rewrite); } static void -ipip4_fixup (vlib_main_t * vm, const ip_adjacency_t * adj, vlib_buffer_t * b, - const void *data) +ipip64_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; @@ -115,41 +146,30 @@ ipip4_fixup (vlib_main_t * vm, const ip_adjacency_t * adj, vlib_buffer_t * b, ip4 = vlib_buffer_get_current (b); ip4->length = clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, b)); - switch (adj->ia_link) - { - case VNET_LINK_IP6: - ip4->protocol = IP_PROTOCOL_IPV6; - if (flags & TUNNEL_ENCAP_DECAP_FLAG_ENCAP_COPY_DSCP) - ip4_header_set_dscp (ip4, - ip6_dscp_network_order ((ip6_header_t *) (ip4 + - 1))); - if (flags & TUNNEL_ENCAP_DECAP_FLAG_ENCAP_COPY_ECN) - ip4_header_set_ecn (ip4, - ip6_ecn_network_order ((ip6_header_t *) (ip4 + - 1))); - break; + tunnel_encap_fixup_6o4 (flags, ((ip6_header_t *) (ip4 + 1)), ip4); - case VNET_LINK_IP4: - ip4->protocol = IP_PROTOCOL_IP_IN_IP; - if (flags & TUNNEL_ENCAP_DECAP_FLAG_ENCAP_COPY_DSCP) - ip4_header_set_dscp (ip4, ip4_header_get_dscp (ip4 + 1)); - if (flags & TUNNEL_ENCAP_DECAP_FLAG_ENCAP_COPY_ECN) - ip4_header_set_ecn (ip4, ip4_header_get_ecn (ip4 + 1)); - if ((flags & TUNNEL_ENCAP_DECAP_FLAG_ENCAP_COPY_DF) && - ip4_header_get_df (ip4 + 1)) - ip4_header_set_df (ip4); - break; + ip4->checksum = ip4_header_checksum (ip4); +} - default: - break; - } +static void +ipip44_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; + + 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)); + tunnel_encap_fixup_4o4 (flags, ip4 + 1, ip4); ip4->checksum = ip4_header_checksum (ip4); } static void -ipip6_fixup (vlib_main_t * vm, const ip_adjacency_t * adj, vlib_buffer_t * b, - const void *data) +ipip46_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; @@ -164,29 +184,68 @@ ipip6_fixup (vlib_main_t * vm, const ip_adjacency_t * adj, vlib_buffer_t * b, ip6->payload_length = clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, b) - sizeof (*ip6)); - switch (adj->ia_link) - { - case VNET_LINK_IP6: - ip6->protocol = IP_PROTOCOL_IPV6; - if (flags & TUNNEL_ENCAP_DECAP_FLAG_ENCAP_COPY_DSCP) - ip6_set_dscp_network_order (ip6, ip6_dscp_network_order (ip6 + 1)); - if (flags & TUNNEL_ENCAP_DECAP_FLAG_ENCAP_COPY_ECN) - ip6_set_ecn_network_order (ip6, ip6_ecn_network_order (ip6 + 1)); - break; + tunnel_encap_fixup_4o6 (flags, b, ((ip4_header_t *) (ip6 + 1)), ip6); +} - case VNET_LINK_IP4: - ip6->protocol = IP_PROTOCOL_IP_IN_IP; - 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 (flags & TUNNEL_ENCAP_DECAP_FLAG_ENCAP_COPY_ECN) - ip6_set_ecn_network_order - (ip6, ip4_header_get_ecn ((ip4_header_t *) (ip6 + 1))); - break; +static void +ipip66_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; - default: - break; - } + flags = pointer_to_uword (data); + + /* Must set locally originated otherwise we're not allowed to + fragment the packet later */ + b->flags |= VNET_BUFFER_F_LOCALLY_ORIGINATED; + + ip6 = vlib_buffer_get_current (b); + ip6->payload_length = + clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, b) - + sizeof (*ip6)); + tunnel_encap_fixup_6o6 (flags, ip6 + 1, ip6); +} + +static void +ipipm6_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; + + flags = pointer_to_uword (data); + + /* Must set locally originated otherwise we're not allowed to + fragment the packet later and we'll get an unwanted hop-limt + decrement */ + b->flags |= VNET_BUFFER_F_LOCALLY_ORIGINATED; + + ip6 = vlib_buffer_get_current (b); + ip6->payload_length = + clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, b) - sizeof (*ip6)); + tunnel_encap_fixup_mplso6 (flags, b, (mpls_unicast_header_t *) (ip6 + 1), + ip6); +} + +static void +ipipm4_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; + + flags = pointer_to_uword (data); + + /* Must set locally originated otherwise we'll do a TTL decrement + * during ip4-rewrite */ + b->flags |= VNET_BUFFER_F_LOCALLY_ORIGINATED; + + ip4 = vlib_buffer_get_current (b); + ip4->length = + clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, b) - sizeof (*ip4)); + tunnel_encap_fixup_mplso4 (flags, (mpls_unicast_header_t *) (ip4 + 1), ip4); + ip4->checksum = ip4_header_checksum (ip4); } static void @@ -246,10 +305,33 @@ ipip_tunnel_restack (ipip_tunnel_t * gt) } } +static adj_midchain_fixup_t +ipip_get_fixup (const ipip_tunnel_t * t, vnet_link_t lt, adj_flags_t * aflags) +{ + if (t->transport == IPIP_TRANSPORT_IP6 && lt == VNET_LINK_IP6) + return (ipip66_fixup); + if (t->transport == IPIP_TRANSPORT_IP6 && lt == VNET_LINK_IP4) + return (ipip46_fixup); + if (t->transport == IPIP_TRANSPORT_IP6 && lt == VNET_LINK_MPLS) + return (ipipm6_fixup); + if (t->transport == IPIP_TRANSPORT_IP4 && lt == VNET_LINK_IP6) + return (ipip64_fixup); + if (t->transport == IPIP_TRANSPORT_IP4 && lt == VNET_LINK_MPLS) + return (ipipm4_fixup); + if (t->transport == IPIP_TRANSPORT_IP4 && lt == VNET_LINK_IP4) + { + *aflags = *aflags | ADJ_FLAG_MIDCHAIN_FIXUP_IP4O4_HDR; + return (ipip44_fixup); + } + + ASSERT (0); + return (ipip44_fixup); +} + void ipip_update_adj (vnet_main_t * vnm, u32 sw_if_index, adj_index_t ai) { - adj_midchain_fixup_t f; + adj_midchain_fixup_t fixup; ipip_tunnel_t *t; adj_flags_t af; @@ -257,13 +339,18 @@ ipip_update_adj (vnet_main_t * vnm, u32 sw_if_index, adj_index_t ai) if (!t) return; - f = t->transport == IPIP_TRANSPORT_IP6 ? ipip6_fixup : ipip4_fixup; - af = ADJ_FLAG_MIDCHAIN_IP_STACK; + if (t->flags & TUNNEL_ENCAP_DECAP_FLAG_ENCAP_INNER_HASH) + af = ADJ_FLAG_MIDCHAIN_FIXUP_FLOW_HASH; + else + af = ADJ_FLAG_MIDCHAIN_IP_STACK; + if (VNET_LINK_ETHERNET == adj_get_link_type (ai)) af |= ADJ_FLAG_MIDCHAIN_NO_COUNT; + fixup = ipip_get_fixup (t, adj_get_link_type (ai), &af); adj_nbr_midchain_update_rewrite - (ai, f, uword_to_pointer (t->flags, void *), af, + (ai, fixup, + 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); @@ -272,26 +359,33 @@ ipip_update_adj (vnet_main_t * vnm, u32 sw_if_index, adj_index_t ai) typedef struct mipip_walk_ctx_t_ { const ipip_tunnel_t *t; - const nhrp_entry_t *ne; + const teib_entry_t *ne; } mipip_walk_ctx_t; static adj_walk_rc_t mipip_mk_complete_walk (adj_index_t ai, void *data) { + adj_midchain_fixup_t fixup; mipip_walk_ctx_t *ctx = data; - adj_midchain_fixup_t f; + adj_flags_t af; - f = ctx->t->transport == IPIP_TRANSPORT_IP6 ? ipip6_fixup : ipip4_fixup; + af = ADJ_FLAG_NONE; + fixup = ipip_get_fixup (ctx->t, adj_get_link_type (ai), &af); + + if (ctx->t->flags & TUNNEL_ENCAP_DECAP_FLAG_ENCAP_INNER_HASH) + af = ADJ_FLAG_MIDCHAIN_FIXUP_FLOW_HASH; + else + af = ADJ_FLAG_MIDCHAIN_IP_STACK; 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)); + (ai, fixup, + uword_to_pointer (ctx->t->flags, void *), + af, ipip_build_rewrite (vnet_get_main (), + ctx->t->sw_if_index, + adj_get_link_type (ai), + &teib_entry_get_nh (ctx->ne)->fp_addr)); - nhrp_entry_adj_stack (ctx->ne, ai); + teib_entry_adj_stack (ctx->ne, ai); return (ADJ_WALK_RC_CONTINUE); } @@ -299,12 +393,14 @@ mipip_mk_complete_walk (adj_index_t ai, void *data) static adj_walk_rc_t mipip_mk_incomplete_walk (adj_index_t ai, void *data) { + adj_midchain_fixup_t fixup; ipip_tunnel_t *t = data; - adj_midchain_fixup_t f; + adj_flags_t af; - f = t->transport == IPIP_TRANSPORT_IP6 ? ipip6_fixup : ipip4_fixup; + af = ADJ_FLAG_NONE; + fixup = ipip_get_fixup (t, adj_get_link_type (ai), &af); - adj_nbr_midchain_update_rewrite (ai, f, NULL, ADJ_FLAG_NONE, NULL); + adj_nbr_midchain_update_rewrite (ai, fixup, NULL, ADJ_FLAG_NONE, NULL); adj_midchain_delegate_unstack (ai); @@ -315,24 +411,27 @@ 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; + adj_midchain_fixup_t fixup; ip_adjacency_t *adj; - nhrp_entry_t *ne; + teib_entry_t *ne; ipip_tunnel_t *t; + adj_flags_t af; u32 ti; + af = ADJ_FLAG_NONE; 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); + ne = teib_entry_find_46 (sw_if_index, + adj->ia_nh_proto, &adj->sub_type.nbr.next_hop); if (NULL == ne) { - // no NHRP entry to provide the next-hop + // no TEIB entry to provide the next-hop + fixup = ipip_get_fixup (t, adj_get_link_type (ai), &af); adj_nbr_midchain_update_rewrite - (ai, f, uword_to_pointer (t->flags, void *), ADJ_FLAG_NONE, NULL); + (ai, fixup, uword_to_pointer (t->flags, void *), ADJ_FLAG_NONE, NULL); return; } @@ -504,30 +603,30 @@ ipip_mk_key (const ipip_tunnel_t * t, ipip_tunnel_key_t * key) } static void -ipip_nhrp_mk_key (const ipip_tunnel_t * t, - const nhrp_entry_t * ne, ipip_tunnel_key_t * key) +ipip_teib_mk_key (const ipip_tunnel_t * t, + const teib_entry_t * ne, ipip_tunnel_key_t * key) { const fib_prefix_t *nh; - nh = nhrp_entry_get_nh (ne); + nh = teib_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); + teib_entry_get_fib_index (ne), key); } static void -ipip_nhrp_entry_added (const nhrp_entry_t * ne) +ipip_teib_entry_added (const teib_entry_t * ne) { ipip_main_t *gm = &ipip_main; - const ip46_address_t *nh; + const ip_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); + sw_if_index = teib_entry_get_sw_if_index (ne); if (vec_len (gm->tunnel_index_by_sw_if_index) < sw_if_index) return; @@ -538,7 +637,7 @@ ipip_nhrp_entry_added (const nhrp_entry_t * ne) t = pool_elt_at_index (gm->tunnels, t_idx); - ipip_nhrp_mk_key (t, ne, &key); + ipip_teib_mk_key (t, ne, &key); ipip_tunnel_db_add (t, &key); // update the rewrites for each of the adjacencies for this next-hop @@ -546,24 +645,25 @@ ipip_nhrp_entry_added (const nhrp_entry_t * ne) .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) ? + nh = teib_entry_get_peer (ne); + adj_nbr_walk_nh (teib_entry_get_sw_if_index (ne), + (AF_IP4 == ip_addr_version (nh) ? FIB_PROTOCOL_IP4 : - FIB_PROTOCOL_IP6), nh, mipip_mk_complete_walk, &ctx); + FIB_PROTOCOL_IP6), + &ip_addr_46 (nh), mipip_mk_complete_walk, &ctx); } static void -ipip_nhrp_entry_deleted (const nhrp_entry_t * ne) +ipip_teib_entry_deleted (const teib_entry_t * ne) { ipip_main_t *gm = &ipip_main; - const ip46_address_t *nh; + const ip_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); + sw_if_index = teib_entry_get_sw_if_index (ne); if (vec_len (gm->tunnel_index_by_sw_if_index) < sw_if_index) return; @@ -574,37 +674,38 @@ ipip_nhrp_entry_deleted (const nhrp_entry_t * ne) t = pool_elt_at_index (gm->tunnels, t_idx); - ipip_nhrp_mk_key (t, ne, &key); + ipip_teib_mk_key (t, ne, &key); ipip_tunnel_db_remove (t, &key); - nh = nhrp_entry_get_peer (ne); + nh = teib_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) ? + adj_nbr_walk_nh (teib_entry_get_sw_if_index (ne), + (AF_IP4 == ip_addr_version (nh) ? FIB_PROTOCOL_IP4 : - FIB_PROTOCOL_IP6), nh, mipip_mk_incomplete_walk, t); + FIB_PROTOCOL_IP6), + &ip_addr_46 (nh), mipip_mk_incomplete_walk, t); } static walk_rc_t -ipip_tunnel_delete_nhrp_walk (index_t nei, void *ctx) +ipip_tunnel_delete_teib_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_teib_mk_key (t, teib_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_add_teib_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_teib_mk_key (t, teib_entry_get (nei), &key); ipip_tunnel_db_add (t, &key); return (WALK_CONTINUE); @@ -698,7 +799,7 @@ 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); + teib_walk_itf (t->sw_if_index, ipip_tunnel_add_teib_walk, t); if (sw_if_indexp) *sw_if_indexp = sw_if_index; @@ -706,12 +807,14 @@ ipip_add_tunnel (ipip_transport_t transport, if (t->transport == IPIP_TRANSPORT_IP6 && !gm->ip6_protocol_registered) { ip6_register_protocol (IP_PROTOCOL_IP_IN_IP, ipip6_input_node.index); + ip6_register_protocol (IP_PROTOCOL_MPLS_IN_IP, ipip6_input_node.index); ip6_register_protocol (IP_PROTOCOL_IPV6, ipip6_input_node.index); gm->ip6_protocol_registered = true; } else if (t->transport == IPIP_TRANSPORT_IP4 && !gm->ip4_protocol_registered) { ip4_register_protocol (IP_PROTOCOL_IP_IN_IP, ipip4_input_node.index); + ip4_register_protocol (IP_PROTOCOL_MPLS_IN_IP, ipip4_input_node.index); ip4_register_protocol (IP_PROTOCOL_IPV6, ipip4_input_node.index); gm->ip4_protocol_registered = true; } @@ -731,7 +834,7 @@ ipip_del_tunnel (u32 sw_if_index) 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); + teib_walk_itf (t->sw_if_index, ipip_tunnel_delete_teib_walk, t); vnet_sw_interface_set_flags (vnm, sw_if_index, 0 /* down */ ); gm->tunnel_index_by_sw_if_index[sw_if_index] = ~0; @@ -745,9 +848,9 @@ ipip_del_tunnel (u32 sw_if_index) return 0; } -const static nhrp_vft_t ipip_nhrp_vft = { - .nv_added = ipip_nhrp_entry_added, - .nv_deleted = ipip_nhrp_entry_deleted, +const static teib_vft_t ipip_teib_vft = { + .nv_added = ipip_teib_entry_added, + .nv_deleted = ipip_teib_entry_deleted, }; static clib_error_t * @@ -761,7 +864,7 @@ 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); + teib_register (&ipip_teib_vft); return 0; }