X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;ds=inline;f=src%2Fvnet%2Fgeneve%2Fgeneve.c;h=1e04c6624311b596b937200828de2aba4e62a761;hb=refs%2Fchanges%2F36%2F26336%2F5;hp=25bf4a49741743d1d73944702736c148b29c3f17;hpb=60d48bbd13649133e51cf56e072c11305c661797;p=vpp.git diff --git a/src/vnet/geneve/geneve.c b/src/vnet/geneve/geneve.c index 25bf4a49741..1e04c662431 100644 --- a/src/vnet/geneve/geneve.c +++ b/src/vnet/geneve/geneve.c @@ -16,6 +16,7 @@ #include #include #include +#include #include #include #include @@ -37,6 +38,18 @@ geneve_main_t geneve_main; +u8 * +format_geneve_encap_trace (u8 * s, va_list * args) +{ + CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *); + CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *); + geneve_encap_trace_t *t = va_arg (*args, geneve_encap_trace_t *); + + s = format (s, "GENEVE encap to geneve_tunnel%d vni %d", + t->tunnel_index, t->vni); + return s; +} + static u8 * format_decap_next (u8 * s, va_list * args) { @@ -60,18 +73,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 +95,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 +110,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 +147,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,69 +292,22 @@ 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) -{ - uword *vtep = ip46_address_is_ip4 (ip) ? - hash_get (geneve_main.vtep4, ip->ip4.as_u32) : - hash_get_mem (geneve_main.vtep6, &ip->ip6); - if (vtep) - 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); - return 1; -} - -static uword -vtep_addr_unref (ip46_address_t * ip) +typedef union { - uword *vtep = ip46_address_is_ip4 (ip) ? - hash_get (geneve_main.vtep4, ip->ip4.as_u32) : - hash_get_mem (geneve_main.vtep6, &ip->ip6); - ASSERT (vtep); - if (--(*vtep) != 0) - 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); - return 0; -} - -typedef CLIB_PACKED (union - { - struct - { - fib_node_index_t mfib_entry_index; - adj_index_t mcast_adj_index; - }; u64 as_u64; - }) mcast_shared_t; + struct + { + fib_node_index_t mfib_entry_index; + adj_index_t mcast_adj_index; + }; + u64 as_u64; +} __clib_packed mcast_shared_t; static inline mcast_shared_t mcast_shared_get (ip46_address_t * ip) { ASSERT (ip46_address_is_multicast (ip)); uword *p = hash_get_mem (geneve_main.mcast_shared, ip); - ASSERT (p); + ALWAYS_ASSERT (p); return (mcast_shared_t) { .as_u64 = *p}; @@ -367,7 +322,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 +333,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 @@ -404,15 +353,13 @@ int vnet_geneve_add_del_tunnel if (!is_ip6) { key4.remote = a->remote.ip4.as_u32; - key4.vni = - clib_host_to_net_u32 ((a->vni << GENEVE_VNI_SHIFT) & GENEVE_VNI_MASK); + key4.vni = clib_host_to_net_u32 (a->vni << GENEVE_VNI_SHIFT); p = hash_get (vxm->geneve4_tunnel_by_key, key4.as_u64); } else { key6.remote = a->remote.ip6; - key6.vni = - clib_host_to_net_u32 ((a->vni << GENEVE_VNI_SHIFT) & GENEVE_VNI_MASK); + key6.vni = clib_host_to_net_u32 (a->vni << GENEVE_VNI_SHIFT); p = hash_get_mem (vxm->geneve6_tunnel_by_key, &key6); } @@ -431,7 +378,7 @@ int vnet_geneve_add_del_tunnel return VNET_API_ERROR_INVALID_DECAP_NEXT; pool_get_aligned (vxm->tunnels, t, CLIB_CACHE_LINE_BYTES); - memset (t, 0, sizeof (*t)); + clib_memset (t, 0, sizeof (*t)); /* copy from arg structure */ #define _(x) t->x = a->x; @@ -447,8 +394,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 +433,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 +457,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); @@ -518,13 +468,12 @@ int vnet_geneve_add_del_tunnel * when the forwarding for the entry updates, and the tunnel can * 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_GENEVE_TUNNEL, - t - vxm->tunnels); + vtep_addr_ref (&vxm->vtep_table, t->encap_fib_index, &t->local); + t->fib_entry_index = fib_entry_track (t->encap_fib_index, + &tun_remote_pfx, + FIB_NODE_TYPE_GENEVE_TUNNEL, + t - vxm->tunnels, + &t->sibling_index); geneve_tunnel_restack_dpo (t); } else @@ -536,7 +485,8 @@ int vnet_geneve_add_del_tunnel */ fib_protocol_t fp = fib_ip_proto (is_ip6); - if (vtep_addr_ref (&t->remote) == 1) + if (vtep_addr_ref (&vxm->vtep_table, + t->encap_fib_index, &t->remote) == 1) { fib_node_index_t mfei; adj_index_t ai; @@ -545,8 +495,9 @@ int vnet_geneve_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, @@ -560,17 +511,14 @@ int vnet_geneve_add_del_tunnel * - the accepting interface is that from the API */ mfib_table_entry_path_update (t->encap_fib_index, - &mpfx, - MFIB_SOURCE_GENEVE, - &path, MFIB_ITF_FLAG_FORWARD); + &mpfx, MFIB_SOURCE_GENEVE, &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_GENEVE, - &path, - MFIB_ITF_FLAG_ACCEPT); + MFIB_SOURCE_GENEVE, &path); /* * Create the mcast adjacency to send traffic to the group @@ -597,9 +545,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 +562,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,15 +571,15 @@ 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)) { - 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); + vtep_addr_unref (&vxm->vtep_table, t->encap_fib_index, &t->local); + fib_entry_untrack (t->fib_entry_index, t->sibling_index); } - else if (vtep_addr_unref (&t->remote) == 0) + else if (vtep_addr_unref (&vxm->vtep_table, + t->encap_fib_index, &t->remote) == 0) { mcast_shared_remove (&t->remote); } @@ -647,6 +592,17 @@ int vnet_geneve_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_geneve, 1)) + udp_register_dst_port (vxm->vlib_main, UDP_DST_PORT_geneve, + geneve4_input_node.index, 1); + if (is_ip6 && !udp_is_valid_dst_port (UDP_DST_PORT_geneve6, 0)) + udp_register_dst_port (vxm->vlib_main, UDP_DST_PORT_geneve6, + geneve6_input_node.index, 0); + } + return 0; } @@ -706,8 +662,8 @@ geneve_add_del_tunnel_command_fn (vlib_main_t * vm, clib_error_t *error = NULL; /* Cant "universally zero init" (={0}) due to GCC bug 53119 */ - memset (&local, 0, sizeof local); - memset (&remote, 0, sizeof remote); + clib_memset (&local, 0, sizeof local); + clib_memset (&remote, 0, sizeof remote); /* Get a line of input. */ if (!unformat_user (input, unformat_line_input, line_input)) @@ -843,7 +799,7 @@ geneve_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; @@ -1118,7 +1074,7 @@ set_ip6_geneve_bypass (vlib_main_t * vm, VLIB_CLI_COMMAND (set_interface_ip6_geneve_bypass_command, static) = { .path = "set interface ip6 geneve-bypass", .function = set_ip6_geneve_bypass, - .short_help = "set interface ip geneve-bypass [del]", + .short_help = "set interface ip6 geneve-bypass [del]", }; /* *INDENT-ON* */ @@ -1134,16 +1090,11 @@ geneve_init (vlib_main_t * vm) vxm->geneve6_tunnel_by_key = hash_create_mem (0, sizeof (geneve6_tunnel_key_t), sizeof (uword)); - vxm->vtep6 = hash_create_mem (0, sizeof (ip6_address_t), sizeof (uword)); + vxm->vtep_table = vtep_table_create (); vxm->mcast_shared = hash_create_mem (0, sizeof (ip46_address_t), sizeof (mcast_shared_t)); - udp_register_dst_port (vm, UDP_DST_PORT_geneve, - geneve4_input_node.index, /* is_ip4 */ 1); - udp_register_dst_port (vm, UDP_DST_PORT_geneve6, - geneve6_input_node.index, /* is_ip4 */ 0); - fib_node_register_type (FIB_NODE_TYPE_GENEVE_TUNNEL, &geneve_vft); return 0;