X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fvxlan-gpe%2Fvxlan_gpe.c;h=dd0e544352f48f060c15a00ce1c07ce26aa1a86a;hb=097fa66b9;hp=939b5fafd7db28c5f885fd140536bc0c8ce5946c;hpb=6f8273aec1fa3f3d597b090871cc7ac301d7e014;p=vpp.git diff --git a/src/vnet/vxlan-gpe/vxlan_gpe.c b/src/vnet/vxlan-gpe/vxlan_gpe.c index 939b5fafd7d..dd0e544352f 100644 --- a/src/vnet/vxlan-gpe/vxlan_gpe.c +++ b/src/vnet/vxlan-gpe/vxlan_gpe.c @@ -44,8 +44,34 @@ vxlan_gpe_main_t vxlan_gpe_main; +static u8 * +format_decap_next (u8 * s, va_list * args) +{ + vxlan_gpe_tunnel_t *t = va_arg (*args, vxlan_gpe_tunnel_t *); + + switch (t->protocol) + { + case VXLAN_GPE_PROTOCOL_IP4: + s = format (s, "protocol ip4 fib-idx %d", t->decap_fib_index); + break; + case VXLAN_GPE_PROTOCOL_IP6: + s = format (s, "protocol ip6 fib-idx %d", t->decap_fib_index); + break; + case VXLAN_GPE_PROTOCOL_ETHERNET: + s = format (s, "protocol ethernet"); + break; + case VXLAN_GPE_PROTOCOL_NSH: + s = format (s, "protocol nsh"); + break; + default: + s = format (s, "protocol unknown %d", t->protocol); + } + + return s; +} + /** - * @brief Tracing function for VXLAN GPE tunnel packets + * @brief Format function for VXLAN GPE tunnel * * @param *s formatting string * @param *args @@ -59,36 +85,21 @@ format_vxlan_gpe_tunnel (u8 * s, va_list * args) vxlan_gpe_tunnel_t *t = va_arg (*args, vxlan_gpe_tunnel_t *); vxlan_gpe_main_t *ngm = &vxlan_gpe_main; - s = format (s, "[%d] local: %U remote: %U ", + s = format (s, "[%d] lcl %U rmt %U vni %d fib-idx %d sw-if-idx %d ", t - ngm->tunnels, format_ip46_address, &t->local, IP46_TYPE_ANY, - format_ip46_address, &t->remote, IP46_TYPE_ANY); - - s = format (s, " vxlan VNI %d ", t->vni); - - switch (t->protocol) - { - case VXLAN_GPE_PROTOCOL_IP4: - s = format (s, "next-protocol ip4"); - break; - case VXLAN_GPE_PROTOCOL_IP6: - s = format (s, "next-protocol ip6"); - break; - case VXLAN_GPE_PROTOCOL_ETHERNET: - s = format (s, "next-protocol ethernet"); - break; - case VXLAN_GPE_PROTOCOL_NSH: - s = format (s, "next-protocol nsh"); - break; - default: - s = format (s, "next-protocol unknown %d", t->protocol); - } + format_ip46_address, &t->remote, IP46_TYPE_ANY, + t->vni, t->encap_fib_index, t->sw_if_index); - if (ip46_address_is_multicast (&t->remote)) - s = format (s, "mcast_sw_if_index %d ", t->mcast_sw_if_index); +#if 0 + /* next_dpo not yet used by vxlan-gpe-encap node */ + s = format (s, "encap-dpo-idx %d ", t->next_dpo.dpoi_index); + */ +#endif + s = format (s, "decap-next-%U ", format_decap_next, t); - s = format (s, " fibs: (encap %d, decap %d)", - t->encap_fib_index, t->decap_fib_index); + if (PREDICT_FALSE (ip46_address_is_multicast (&t->remote))) + s = format (s, "mcast-sw-if-idx %d ", t->mcast_sw_if_index); return s; } @@ -109,14 +120,6 @@ format_vxlan_gpe_name (u8 * s, va_list * args) return format (s, "vxlan_gpe_tunnel%d", dev_instance); } -static uword -dummy_interface_tx (vlib_main_t * vm, - vlib_node_runtime_t * node, vlib_frame_t * frame) -{ - clib_warning ("you shouldn't be here, leaking buffers..."); - return frame->n_vectors; -} - /** * @brief CLI function for VXLAN GPE admin up/down * @@ -143,7 +146,6 @@ VNET_DEVICE_CLASS (vxlan_gpe_device_class,static) = { .name = "VXLAN_GPE", .format_device_name = format_vxlan_gpe_name, .format_tx_trace = format_vxlan_gpe_encap_trace, - .tx_function = dummy_interface_tx, .admin_up_down_function = vxlan_gpe_interface_admin_up_down, }; /* *INDENT-ON* */ @@ -381,25 +383,6 @@ vxlan6_gpe_rewrite (vxlan_gpe_tunnel_t * t, u32 extension_size, return (0); } -static void -hash_set_key_copy (uword ** h, void *key, uword v) -{ - size_t ksz = hash_header (*h)->user; - void *copy = clib_mem_alloc (ksz); - clib_memcpy (copy, key, ksz); - hash_set_mem (*h, copy, v); -} - -static void -hash_unset_key_free (uword ** h, void *key) -{ - hash_pair_t *hp = hash_get_pair_mem (*h, key); - ASSERT (hp); - key = uword_to_pointer (hp->key, void *); - hash_unset_mem (*h, key); - clib_mem_free (key); -} - static uword vtep_addr_ref (ip46_address_t * ip) { @@ -410,7 +393,7 @@ vtep_addr_ref (ip46_address_t * ip) return ++(*vtep); ip46_address_is_ip4 (ip) ? hash_set (vxlan_gpe_main.vtep4, ip->ip4.as_u32, 1) : - hash_set_key_copy (&vxlan_gpe_main.vtep6, &ip->ip6, 1); + hash_set_mem_alloc (&vxlan_gpe_main.vtep6, &ip->ip6, 1); return 1; } @@ -425,7 +408,7 @@ vtep_addr_unref (ip46_address_t * ip) return *vtep; ip46_address_is_ip4 (ip) ? hash_unset (vxlan_gpe_main.vtep4, ip->ip4.as_u32) : - hash_unset_key_free (&vxlan_gpe_main.vtep6, &ip->ip6); + hash_unset_mem_free (&vxlan_gpe_main.vtep6, &ip->ip6); return 0; } @@ -459,7 +442,7 @@ mcast_shared_add (ip46_address_t * remote, .mfib_entry_index = mfei, }; - hash_set_key_copy (&vxlan_gpe_main.mcast_shared, remote, new_ep.as_u64); + hash_set_mem_alloc (&vxlan_gpe_main.mcast_shared, remote, new_ep.as_u64); } static inline void @@ -470,13 +453,7 @@ mcast_shared_remove (ip46_address_t * remote) adj_unlock (ep.mcast_adj_index); mfib_table_entry_delete_index (ep.mfib_entry_index, MFIB_SOURCE_VXLAN_GPE); - hash_unset_key_free (&vxlan_gpe_main.mcast_shared, remote); -} - -static inline fib_protocol_t -fib_ip_proto (bool is_ip6) -{ - return (is_ip6) ? FIB_PROTOCOL_IP6 : FIB_PROTOCOL_IP4; + hash_unset_mem_free (&vxlan_gpe_main.mcast_shared, remote); } /** @@ -532,18 +509,21 @@ int vnet_vxlan_gpe_add_del_tunnel return VNET_API_ERROR_TUNNEL_EXIST; pool_get_aligned (ngm->tunnels, t, CLIB_CACHE_LINE_BYTES); - memset (t, 0, sizeof (*t)); + clib_memset (t, 0, sizeof (*t)); /* copy from arg structure */ +/* *INDENT-OFF* */ #define _(x) t->x = a->x; foreach_gpe_copy_field; if (!a->is_ip6) foreach_copy_ipv4 - else + else foreach_copy_ipv6 #undef _ - if (!a->is_ip6) - t->flags |= VXLAN_GPE_TUNNEL_IS_IPV4; +/* *INDENT-ON* */ + + if (!a->is_ip6) + t->flags |= VXLAN_GPE_TUNNEL_IS_IPV4; if (!a->is_ip6) { @@ -563,14 +543,14 @@ int vnet_vxlan_gpe_add_del_tunnel if (!is_ip6) { key4_copy = clib_mem_alloc (sizeof (*key4_copy)); - clib_memcpy (key4_copy, &key4, sizeof (*key4_copy)); + clib_memcpy_fast (key4_copy, &key4, sizeof (*key4_copy)); hash_set_mem (ngm->vxlan4_gpe_tunnel_by_key, key4_copy, t - ngm->tunnels); } else { key6_copy = clib_mem_alloc (sizeof (*key6_copy)); - clib_memcpy (key6_copy, &key6, sizeof (*key6_copy)); + clib_memcpy_fast (key6_copy, &key6, sizeof (*key6_copy)); hash_set_mem (ngm->vxlan6_gpe_tunnel_by_key, key6_copy, t - ngm->tunnels); } @@ -605,9 +585,12 @@ int vnet_vxlan_gpe_add_del_tunnel (vnm, vxlan_gpe_device_class.index, t - ngm->tunnels, vxlan_gpe_hw_class.index, t - ngm->tunnels); hi = vnet_get_hw_interface (vnm, hw_if_index); - hi->output_node_index = vxlan_gpe_encap_node.index; } + /* Set vxlan-gpe tunnel output node */ + u32 encap_index = vxlan_gpe_encap_node.index; + vnet_set_interface_output_node (vnm, hw_if_index, encap_index); + t->hw_if_index = hw_if_index; t->sw_if_index = sw_if_index = hi->sw_if_index; vec_validate_init_empty (ngm->tunnel_index_by_sw_if_index, sw_if_index, @@ -625,7 +608,6 @@ int vnet_vxlan_gpe_add_del_tunnel VNET_SW_INTERFACE_FLAG_ADMIN_UP); fib_node_init (&t->node, FIB_NODE_TYPE_VXLAN_GPE_TUNNEL); fib_prefix_t tun_remote_pfx; - u32 encap_index = vxlan_gpe_encap_node.index; vnet_flood_class_t flood_class = VNET_FLOOD_CLASS_TUNNEL_NORMAL; fib_prefix_from_ip46_addr (&t->remote, &tun_remote_pfx); @@ -649,8 +631,8 @@ int vnet_vxlan_gpe_add_del_tunnel else { /* Multicast tunnel - - * as the same mcast group can be used for mutiple mcast tunnels - * with different VNIs, create the output fib adjecency only if + * as the same mcast group can be used for multiple mcast tunnels + * with different VNIs, create the output fib adjacency only if * it does not already exist */ fib_protocol_t fp = fib_ip_proto (is_ip6); @@ -664,8 +646,9 @@ int vnet_vxlan_gpe_add_del_tunnel .frp_addr = zero_addr, .frp_sw_if_index = 0xffffffff, .frp_fib_index = ~0, - .frp_weight = 0, + .frp_weight = 1, .frp_flags = FIB_ROUTE_PATH_LOCAL, + .frp_mitf_flags = MFIB_ITF_FLAG_FORWARD, }; const mfib_prefix_t mpfx = { .fp_proto = fp, @@ -680,16 +663,15 @@ int vnet_vxlan_gpe_add_del_tunnel */ mfib_table_entry_path_update (t->encap_fib_index, &mpfx, - MFIB_SOURCE_VXLAN_GPE, - &path, MFIB_ITF_FLAG_FORWARD); + MFIB_SOURCE_VXLAN_GPE, &path); path.frp_sw_if_index = a->mcast_sw_if_index; path.frp_flags = FIB_ROUTE_PATH_FLAG_NONE; + path.frp_mitf_flags = MFIB_ITF_FLAG_ACCEPT; mfei = mfib_table_entry_path_update (t->encap_fib_index, &mpfx, MFIB_SOURCE_VXLAN_GPE, - &path, - MFIB_ITF_FLAG_ACCEPT); + &path); /* * Create the mcast adjacency to send traffic to the group @@ -716,9 +698,6 @@ int vnet_vxlan_gpe_add_del_tunnel flood_class = VNET_FLOOD_CLASS_TUNNEL_MASTER; } - /* Set vxlan tunnel output node */ - hi->output_node_index = encap_index; - vnet_get_sw_interface (vnet_get_main (), sw_if_index)->flood_class = flood_class; } @@ -734,8 +713,8 @@ int vnet_vxlan_gpe_add_del_tunnel vnet_sw_interface_set_flags (vnm, t->sw_if_index, 0 /* down */ ); vnet_sw_interface_t *si = vnet_get_sw_interface (vnm, t->sw_if_index); si->flags |= VNET_SW_INTERFACE_FLAG_HIDDEN; - set_int_l2_mode (ngm->vlib_main, vnm, MODE_L3, t->sw_if_index, 0, 0, 0, - 0); + set_int_l2_mode (ngm->vlib_main, vnm, MODE_L3, t->sw_if_index, 0, + L2_BD_PORT_TYPE_NORMAL, 0, 0); vec_add1 (ngm->free_vxlan_gpe_tunnel_hw_if_indices, t->hw_if_index); ngm->tunnel_index_by_sw_if_index[t->sw_if_index] = ~0; @@ -743,7 +722,7 @@ int vnet_vxlan_gpe_add_del_tunnel if (!is_ip6) hash_unset (ngm->vxlan4_gpe_tunnel_by_key, key4.as_u64); else - hash_unset_key_free (&ngm->vxlan6_gpe_tunnel_by_key, &key6); + hash_unset_mem_free (&ngm->vxlan6_gpe_tunnel_by_key, &key6); if (!ip46_address_is_multicast (&t->remote)) { @@ -764,6 +743,17 @@ int vnet_vxlan_gpe_add_del_tunnel if (sw_if_indexp) *sw_if_indexp = sw_if_index; + if (a->is_add) + { + /* register udp ports */ + if (!is_ip6 && !udp_is_valid_dst_port (UDP_DST_PORT_VXLAN_GPE, 1)) + udp_register_dst_port (ngm->vlib_main, UDP_DST_PORT_VXLAN_GPE, + vxlan4_gpe_input_node.index, 1 /* is_ip4 */ ); + if (is_ip6 && !udp_is_valid_dst_port (UDP_DST_PORT_VXLAN6_GPE, 0)) + udp_register_dst_port (ngm->vlib_main, UDP_DST_PORT_VXLAN6_GPE, + vxlan6_gpe_input_node.index, 0 /* is_ip4 */ ); + } + return 0; } @@ -935,19 +925,22 @@ vxlan_gpe_add_del_tunnel_command_fn (vlib_main_t * vm, goto done; } - memset (a, 0, sizeof (*a)); + clib_memset (a, 0, sizeof (*a)); a->is_add = is_add; a->is_ip6 = ipv6_set; +/* *INDENT-OFF* */ #define _(x) a->x = x; foreach_gpe_copy_field; if (ipv4_set) foreach_copy_ipv4 - else + else foreach_copy_ipv6 #undef _ - rv = vnet_vxlan_gpe_add_del_tunnel (a, &sw_if_index); +/* *INDENT-ON* */ + + rv = vnet_vxlan_gpe_add_del_tunnel (a, &sw_if_index); switch (rv) { @@ -990,13 +983,13 @@ done: * center or be separated geographically as long as they are reachable * through the underlay L3 network. * - * You can refer to this kind of L2 overlay bridge domain as a VXLAN-GPE sengment. + * You can refer to this kind of L2 overlay bridge domain as a VXLAN-GPE segment. * * @cliexpar * Example of how to create a VXLAN-GPE Tunnel: - * @cliexcmd{create vxlan-gpe tunnel local 10.0.3.1 local 10.0.3.3 vni 13 encap-vrf-id 7} - * Example of how to delete a VXLAN Tunnel: - * @cliexcmd{create vxlan tunnel src 10.0.3.1 remote 10.0.3.3 vni 13 del} + * @cliexcmd{create vxlan-gpe tunnel local 10.0.3.1 remote 10.0.3.3 vni 13 encap-vrf-id 7} + * Example of how to delete a VXLAN-GPE Tunnel: + * @cliexcmd{create vxlan-gpe tunnel local 10.0.3.1 remote 10.0.3.3 vni 13 del} ?*/ /* *INDENT-OFF* */ VLIB_CLI_COMMAND (create_vxlan_gpe_tunnel_command, static) = { @@ -1148,7 +1141,7 @@ set_ip4_vxlan_gpe_bypass (vlib_main_t * vm, * ip4-lookup [2] * @cliexend * - * Example of how to display the feature enabed on an interface: + * Example of how to display the feature enabled on an interface: * @cliexstart{show ip interface features GigabitEthernet2/0/0} * IP feature paths configured on GigabitEthernet2/0/0... * ... @@ -1205,7 +1198,7 @@ set_ip6_vxlan_gpe_bypass (vlib_main_t * vm, * ip6-lookup [2] * @cliexend * - * Example of how to display the feature enabed on an interface: + * Example of how to display the feature enabled on an interface: * @cliexstart{show ip interface features GigabitEthernet2/0/0} * IP feature paths configured on GigabitEthernet2/0/0... * ... @@ -1269,11 +1262,7 @@ vxlan_gpe_init (vlib_main_t * vm) ngm->mcast_shared = hash_create_mem (0, sizeof (ip46_address_t), sizeof (mcast_shared_t)); - - udp_register_dst_port (vm, UDP_DST_PORT_VXLAN_GPE, - vxlan4_gpe_input_node.index, 1 /* is_ip4 */ ); - udp_register_dst_port (vm, UDP_DST_PORT_VXLAN6_GPE, - vxlan6_gpe_input_node.index, 0 /* is_ip4 */ ); + ngm->vtep6 = hash_create_mem (0, sizeof (ip6_address_t), sizeof (uword)); /* Register the list of standard decap protocols supported */ vxlan_gpe_register_decap_protocol (VXLAN_GPE_PROTOCOL_IP4, @@ -1281,7 +1270,7 @@ vxlan_gpe_init (vlib_main_t * vm) vxlan_gpe_register_decap_protocol (VXLAN_GPE_PROTOCOL_IP6, VXLAN_GPE_INPUT_NEXT_IP6_INPUT); vxlan_gpe_register_decap_protocol (VXLAN_GPE_PROTOCOL_ETHERNET, - VXLAN_GPE_INPUT_NEXT_ETHERNET_INPUT); + VXLAN_GPE_INPUT_NEXT_L2_INPUT); fib_node_register_type (FIB_NODE_TYPE_VXLAN_GPE_TUNNEL, &vxlan_gpe_vft);