X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fvxlan-gpe%2Fvxlan_gpe.c;h=86157c0b519e3764a92ec6512663f11a225a1ff5;hb=5fb2278cb8badbbfe727acbdcaeda008a7fd2833;hp=918a982d70de1b0351973882a590b4a2d9bc08b9;hpb=4478d8edc35757c1da66e1c3c108af24940fbdd3;p=vpp.git diff --git a/src/vnet/vxlan-gpe/vxlan_gpe.c b/src/vnet/vxlan-gpe/vxlan_gpe.c index 918a982d70d..86157c0b519 100644 --- a/src/vnet/vxlan-gpe/vxlan_gpe.c +++ b/src/vnet/vxlan-gpe/vxlan_gpe.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include @@ -120,14 +121,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 * @@ -154,7 +147,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* */ @@ -465,12 +457,6 @@ mcast_shared_remove (ip46_address_t * remote) hash_unset_mem_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; -} - /** * @brief Add or Del a VXLAN GPE tunnel * @@ -524,7 +510,7 @@ 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* */ @@ -558,14 +544,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); } @@ -600,9 +586,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, @@ -620,7 +609,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); @@ -633,19 +621,18 @@ int vnet_vxlan_gpe_add_del_tunnel * re-stack accordingly */ vtep_addr_ref (&t->local); - t->fib_entry_index = fib_table_entry_special_add - (t->encap_fib_index, &tun_remote_pfx, FIB_SOURCE_RR, - FIB_ENTRY_FLAG_NONE); - t->sibling_index = fib_entry_child_add - (t->fib_entry_index, FIB_NODE_TYPE_VXLAN_GPE_TUNNEL, - t - ngm->tunnels); + t->fib_entry_index = fib_entry_track (t->encap_fib_index, + &tun_remote_pfx, + FIB_NODE_TYPE_VXLAN_GPE_TUNNEL, + t - ngm->tunnels, + &t->sibling_index); vxlan_gpe_tunnel_restack_dpo (t); } 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); @@ -659,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, @@ -675,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 @@ -711,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; } @@ -729,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,8 +727,7 @@ int vnet_vxlan_gpe_add_del_tunnel if (!ip46_address_is_multicast (&t->remote)) { vtep_addr_unref (&t->local); - fib_entry_child_remove (t->fib_entry_index, t->sibling_index); - fib_table_entry_delete_index (t->fib_entry_index, FIB_SOURCE_RR); + fib_entry_untrack (t->fib_entry_index, t->sibling_index); } else if (vtep_addr_unref (&t->remote) == 0) { @@ -759,6 +742,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; } @@ -930,7 +924,7 @@ 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; @@ -988,13 +982,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) = { @@ -1146,7 +1140,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... * ... @@ -1203,7 +1197,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... * ... @@ -1221,7 +1215,7 @@ set_ip6_vxlan_gpe_bypass (vlib_main_t * vm, VLIB_CLI_COMMAND (set_interface_ip6_vxlan_gpe_bypass_command, static) = { .path = "set interface ip6 vxlan-gpe-bypass", .function = set_ip6_vxlan_gpe_bypass, - .short_help = "set interface ip vxlan-gpe-bypass [del]", + .short_help = "set interface ip6 vxlan-gpe-bypass [del]", }; /* *INDENT-ON* */ @@ -1269,11 +1263,6 @@ vxlan_gpe_init (vlib_main_t * vm) sizeof (mcast_shared_t)); ngm->vtep6 = hash_create_mem (0, sizeof (ip6_address_t), sizeof (uword)); - 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 */ ); - /* Register the list of standard decap protocols supported */ vxlan_gpe_register_decap_protocol (VXLAN_GPE_PROTOCOL_IP4, VXLAN_GPE_INPUT_NEXT_IP4_INPUT);