X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fgtpu%2Fgtpu.c;h=dc5c689f5d308773850fbb2e11ff189a6df25bb8;hb=097fa66b986f06281f603767d321ab13ab6c88c3;hp=89868d9b615a082260f9b57555f9129932819969;hpb=77eb3a936adfe455ed1a450560c4f0f5d8a28ea4;p=vpp.git diff --git a/src/plugins/gtpu/gtpu.c b/src/plugins/gtpu/gtpu.c old mode 100755 new mode 100644 index 89868d9b615..dc5c689f5d3 --- a/src/plugins/gtpu/gtpu.c +++ b/src/plugins/gtpu/gtpu.c @@ -48,6 +48,18 @@ VNET_FEATURE_INIT (ip6_gtpu_bypass, static) = { }; /* *INDENT-on* */ +u8 * format_gtpu_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 *); + gtpu_encap_trace_t * t + = va_arg (*args, gtpu_encap_trace_t *); + + s = format (s, "GTPU encap to gtpu_tunnel%d teid %d", + t->tunnel_index, t->teid); + return s; +} + static u8 * format_decap_next (u8 * s, va_list * args) { @@ -75,18 +87,18 @@ format_gtpu_tunnel (u8 * s, va_list * args) gtpu_tunnel_t *t = va_arg (*args, gtpu_tunnel_t *); gtpu_main_t *ngm = >pu_main; - s = format (s, "[%d] src %U dst %U teid %d sw_if_index %d ", + s = format (s, "[%d] src %U dst %U teid %d fib-idx %d sw-if-idx %d ", t - ngm->tunnels, format_ip46_address, &t->src, IP46_TYPE_ANY, format_ip46_address, &t->dst, IP46_TYPE_ANY, - t->teid, t->sw_if_index); + t->teid, t->encap_fib_index, t->sw_if_index); - if (ip46_address_is_multicast (&t->dst)) - 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->dst))) + 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; } @@ -97,14 +109,6 @@ format_gtpu_name (u8 * s, va_list * args) return format (s, "gtpu_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 * gtpu_interface_admin_up_down (vnet_main_t * vnm, u32 hw_if_index, u32 flags) { @@ -120,7 +124,6 @@ VNET_DEVICE_CLASS (gtpu_device_class,static) = { .name = "GTPU", .format_device_name = format_gtpu_name, .format_tx_trace = format_gtpu_encap_trace, - .tx_function = dummy_interface_tx, .admin_up_down_function = gtpu_interface_admin_up_down, }; /* *INDENT-ON* */ @@ -294,25 +297,6 @@ gtpu_decap_next_is_valid (gtpu_main_t * gtm, u32 is_ip6, u32 decap_next_index) 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) { @@ -323,7 +307,7 @@ vtep_addr_ref (ip46_address_t * ip) return ++(*vtep); ip46_address_is_ip4 (ip) ? hash_set (gtpu_main.vtep4, ip->ip4.as_u32, 1) : - hash_set_key_copy (>pu_main.vtep6, &ip->ip6, 1); + hash_set_mem_alloc (>pu_main.vtep6, &ip->ip6, 1); return 1; } @@ -338,7 +322,7 @@ vtep_addr_unref (ip46_address_t * ip) return *vtep; ip46_address_is_ip4 (ip) ? hash_unset (gtpu_main.vtep4, ip->ip4.as_u32) : - hash_unset_key_free (>pu_main.vtep6, &ip->ip6); + hash_unset_mem_free (>pu_main.vtep6, &ip->ip6); return 0; } @@ -370,7 +354,7 @@ mcast_shared_add (ip46_address_t * dst, fib_node_index_t mfei, adj_index_t ai) .mfib_entry_index = mfei, }; - hash_set_key_copy (>pu_main.mcast_shared, dst, new_ep.as_u64); + hash_set_mem_alloc (>pu_main.mcast_shared, dst, new_ep.as_u64); } static inline void @@ -381,13 +365,7 @@ mcast_shared_remove (ip46_address_t * dst) adj_unlock (ep.mcast_adj_index); mfib_table_entry_delete_index (ep.mfib_entry_index, MFIB_SOURCE_GTPU); - hash_unset_key_free (>pu_main.mcast_shared, dst); -} - -static inline fib_protocol_t -fib_ip_proto (bool is_ip6) -{ - return (is_ip6) ? FIB_PROTOCOL_IP6 : FIB_PROTOCOL_IP4; + hash_unset_mem_free (>pu_main.mcast_shared, dst); } int vnet_gtpu_add_del_tunnel @@ -431,7 +409,7 @@ int vnet_gtpu_add_del_tunnel return VNET_API_ERROR_INVALID_DECAP_NEXT; pool_get_aligned (gtm->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; @@ -442,8 +420,8 @@ int vnet_gtpu_add_del_tunnel /* copy the key */ if (is_ip6) - hash_set_key_copy (>m->gtpu6_tunnel_by_key, &key6, - t - gtm->tunnels); + hash_set_mem_alloc (>m->gtpu6_tunnel_by_key, &key6, + t - gtm->tunnels); else hash_set (gtm->gtpu4_tunnel_by_key, key4.as_u64, t - gtm->tunnels); @@ -481,6 +459,11 @@ int vnet_gtpu_add_del_tunnel hi = vnet_get_hw_interface (vnm, hw_if_index); } + /* Set gtpu tunnel output node */ + u32 encap_index = !is_ip6 ? + gtpu4_encap_node.index : gtpu6_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; @@ -500,8 +483,6 @@ int vnet_gtpu_add_del_tunnel fib_node_init (&t->node, gtm->fib_node_type); fib_prefix_t tun_dst_pfx; - u32 encap_index = !is_ip6 ? - gtpu4_encap_node.index : gtpu6_encap_node.index; vnet_flood_class_t flood_class = VNET_FLOOD_CLASS_TUNNEL_NORMAL; fib_prefix_from_ip46_addr (&t->dst, &tun_dst_pfx); @@ -524,8 +505,8 @@ int vnet_gtpu_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 adjacency only if * it does not already exist */ fib_protocol_t fp = fib_ip_proto (is_ip6); @@ -539,8 +520,9 @@ int vnet_gtpu_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, @@ -554,17 +536,14 @@ int vnet_gtpu_add_del_tunnel * - the accepting interface is that from the API */ mfib_table_entry_path_update (t->encap_fib_index, - &mpfx, - MFIB_SOURCE_GTPU, - &path, MFIB_ITF_FLAG_FORWARD); + &mpfx, MFIB_SOURCE_GTPU, &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_GTPU, - &path, - MFIB_ITF_FLAG_ACCEPT); + MFIB_SOURCE_GTPU, &path); /* * Create the mcast adjacency to send traffic to the group @@ -592,9 +571,6 @@ int vnet_gtpu_add_del_tunnel flood_class = VNET_FLOOD_CLASS_TUNNEL_MASTER; } - /* Set gtpu tunnel output node */ - hi->output_node_index = encap_index; - vnet_get_sw_interface (vnet_get_main (), sw_if_index)->flood_class = flood_class; } @@ -612,8 +588,8 @@ int vnet_gtpu_add_del_tunnel si->flags |= VNET_SW_INTERFACE_FLAG_HIDDEN; /* make sure tunnel is removed from l2 bd or xconnect */ - set_int_l2_mode (gtm->vlib_main, vnm, MODE_L3, t->sw_if_index, 0, 0, 0, - 0); + set_int_l2_mode (gtm->vlib_main, vnm, MODE_L3, t->sw_if_index, 0, + L2_BD_PORT_TYPE_NORMAL, 0, 0); vec_add1 (gtm->free_gtpu_tunnel_hw_if_indices, t->hw_if_index); gtm->tunnel_index_by_sw_if_index[t->sw_if_index] = ~0; @@ -621,7 +597,7 @@ int vnet_gtpu_add_del_tunnel if (!is_ip6) hash_unset (gtm->gtpu4_tunnel_by_key, key4.as_u64); else - hash_unset_key_free (>m->gtpu6_tunnel_by_key, &key6); + hash_unset_mem_free (>m->gtpu6_tunnel_by_key, &key6); if (!ip46_address_is_multicast (&t->dst)) { @@ -642,6 +618,17 @@ int vnet_gtpu_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_GTPU, 1)) + udp_register_dst_port (gtm->vlib_main, UDP_DST_PORT_GTPU, + gtpu4_input_node.index, /* is_ip4 */ 1); + if (is_ip6 && !udp_is_valid_dst_port (UDP_DST_PORT_GTPU6, 0)) + udp_register_dst_port (gtm->vlib_main, UDP_DST_PORT_GTPU6, + gtpu6_input_node.index, /* is_ip4 */ 0); + } + return 0; } @@ -706,8 +693,8 @@ gtpu_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 (&src, 0, sizeof src); - memset (&dst, 0, sizeof dst); + clib_memset (&src, 0, sizeof src); + clib_memset (&dst, 0, sizeof dst); /* Get a line of input. */ if (!unformat_user (input, unformat_line_input, line_input)) @@ -830,7 +817,7 @@ gtpu_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; @@ -1028,7 +1015,7 @@ set_ip4_gtpu_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... * ... @@ -1085,7 +1072,7 @@ set_ip6_gtpu_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... * ... @@ -1124,11 +1111,6 @@ gtpu_init (vlib_main_t * vm) sizeof (ip46_address_t), sizeof (mcast_shared_t)); - udp_register_dst_port (vm, UDP_DST_PORT_GTPU, - gtpu4_input_node.index, /* is_ip4 */ 1); - udp_register_dst_port (vm, UDP_DST_PORT_GTPU6, - gtpu6_input_node.index, /* is_ip4 */ 0); - gtm->fib_node_type = fib_node_register_new_type (>pu_vft); return 0; @@ -1139,7 +1121,7 @@ VLIB_INIT_FUNCTION (gtpu_init); /* *INDENT-OFF* */ VLIB_PLUGIN_REGISTER () = { .version = VPP_BUILD_VER, - .description = "GTPv1-U", + .description = "GPRS Tunnelling Protocol, User Data (GTPv1-U)", }; /* *INDENT-ON* */