X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fgeneve%2Fgeneve.c;h=ac097f915cb48e9eccb0a823ddd534d32620cf9d;hb=b474380f;hp=25bf4a49741743d1d73944702736c148b29c3f17;hpb=60d48bbd13649133e51cf56e072c11305c661797;p=vpp.git diff --git a/src/vnet/geneve/geneve.c b/src/vnet/geneve/geneve.c index 25bf4a49741..ac097f915cb 100644 --- a/src/vnet/geneve/geneve.c +++ b/src/vnet/geneve/geneve.c @@ -60,18 +60,18 @@ format_geneve_tunnel (u8 * s, va_list * args) geneve_tunnel_t *t = va_arg (*args, geneve_tunnel_t *); geneve_main_t *ngm = &geneve_main; - s = format (s, "[%d] local %U remote %U vni %d sw_if_index %d ", + 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, - t->vni, t->sw_if_index); + 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); + s = format (s, "encap-dpo-idx %d ", t->next_dpo.dpoi_index); + s = format (s, "decap-next-%U ", format_decap_next, t->decap_next_index); + + if (PREDICT_FALSE (ip46_address_is_multicast (&t->remote))) + s = format (s, "mcast-sw-if-idx %d ", t->mcast_sw_if_index); - s = format (s, "encap_fib_index %d fib_entry_index %d decap_next %U\n", - t->encap_fib_index, t->fib_entry_index, - format_decap_next, t->decap_next_index); return s; } @@ -82,14 +82,6 @@ format_geneve_name (u8 * s, va_list * args) return format (s, "geneve_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; -} - static clib_error_t * geneve_interface_admin_up_down (vnet_main_t * vnm, u32 hw_if_index, u32 flags) { @@ -105,7 +97,6 @@ VNET_DEVICE_CLASS (geneve_device_class, static) = { .name = "GENEVE", .format_device_name = format_geneve_name, .format_tx_trace = format_geneve_encap_trace, - .tx_function = dummy_interface_tx, .admin_up_down_function = geneve_interface_admin_up_down, }; /* *INDENT-ON* */ @@ -143,9 +134,7 @@ geneve_tunnel_restack_dpo (geneve_tunnel_t * t) static geneve_tunnel_t * geneve_tunnel_from_fib_node (fib_node_t * node) { -#if (CLIB_DEBUG > 0) ASSERT (FIB_NODE_TYPE_GENEVE_TUNNEL == node->fn_type); -#endif return ((geneve_tunnel_t *) (((char *) node) - STRUCT_OFFSET_OF (geneve_tunnel_t, node))); } @@ -290,25 +279,6 @@ geneve_decap_next_is_valid (geneve_main_t * vxm, u32 is_ip6, return decap_next_index < r->n_next_nodes; } -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) { @@ -319,7 +289,7 @@ vtep_addr_ref (ip46_address_t * ip) return ++(*vtep); ip46_address_is_ip4 (ip) ? hash_set (geneve_main.vtep4, ip->ip4.as_u32, 1) : - hash_set_key_copy (&geneve_main.vtep6, &ip->ip6, 1); + hash_set_mem_alloc (&geneve_main.vtep6, &ip->ip6, 1); return 1; } @@ -334,7 +304,7 @@ vtep_addr_unref (ip46_address_t * ip) return *vtep; ip46_address_is_ip4 (ip) ? hash_unset (geneve_main.vtep4, ip->ip4.as_u32) : - hash_unset_key_free (&geneve_main.vtep6, &ip->ip6); + hash_unset_mem_free (&geneve_main.vtep6, &ip->ip6); return 0; } @@ -367,7 +337,7 @@ mcast_shared_add (ip46_address_t * remote, .mfib_entry_index = mfei, }; - hash_set_key_copy (&geneve_main.mcast_shared, remote, new_ep.as_u64); + hash_set_mem_alloc (&geneve_main.mcast_shared, remote, new_ep.as_u64); } static inline void @@ -378,13 +348,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_GENEVE); - hash_unset_key_free (&geneve_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 (&geneve_main.mcast_shared, remote); } int vnet_geneve_add_del_tunnel @@ -447,8 +411,8 @@ int vnet_geneve_add_del_tunnel /* copy the key */ if (is_ip6) - hash_set_key_copy (&vxm->geneve6_tunnel_by_key, &key6, - t - vxm->tunnels); + hash_set_mem_alloc (&vxm->geneve6_tunnel_by_key, &key6, + t - vxm->tunnels); else hash_set (vxm->geneve4_tunnel_by_key, key4.as_u64, t - vxm->tunnels); @@ -486,6 +450,11 @@ int vnet_geneve_add_del_tunnel hi = vnet_get_hw_interface (vnm, hw_if_index); } + /* Set geneve tunnel output node */ + u32 encap_index = !is_ip6 ? + geneve4_encap_node.index : geneve6_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; @@ -505,8 +474,6 @@ int vnet_geneve_add_del_tunnel fib_node_init (&t->node, FIB_NODE_TYPE_GENEVE_TUNNEL); fib_prefix_t tun_remote_pfx; - u32 encap_index = !is_ip6 ? - geneve4_encap_node.index : geneve6_encap_node.index; vnet_flood_class_t flood_class = VNET_FLOOD_CLASS_TUNNEL_NORMAL; fib_prefix_from_ip46_addr (&t->remote, &tun_remote_pfx); @@ -597,9 +564,6 @@ int vnet_geneve_add_del_tunnel flood_class = VNET_FLOOD_CLASS_TUNNEL_MASTER; } - /* Set geneve tunnel output node */ - hi->output_node_index = encap_index; - vnet_get_sw_interface (vnet_get_main (), sw_if_index)->flood_class = flood_class; } @@ -617,8 +581,8 @@ int vnet_geneve_add_del_tunnel si->flags |= VNET_SW_INTERFACE_FLAG_HIDDEN; /* make sure tunnel is removed from l2 bd or xconnect */ - set_int_l2_mode (vxm->vlib_main, vnm, MODE_L3, t->sw_if_index, 0, 0, 0, - 0); + set_int_l2_mode (vxm->vlib_main, vnm, MODE_L3, t->sw_if_index, 0, + L2_BD_PORT_TYPE_NORMAL, 0, 0); vec_add1 (vxm->free_geneve_tunnel_hw_if_indices, t->hw_if_index); vxm->tunnel_index_by_sw_if_index[t->sw_if_index] = ~0; @@ -626,7 +590,7 @@ int vnet_geneve_add_del_tunnel if (!is_ip6) hash_unset (vxm->geneve4_tunnel_by_key, key4.as_u64); else - hash_unset_key_free (&vxm->geneve6_tunnel_by_key, &key6); + hash_unset_mem_free (&vxm->geneve6_tunnel_by_key, &key6); if (!ip46_address_is_multicast (&t->remote)) {