X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fudp%2Fudp.c;h=7dd0d2a10ff1d5848327d5eb5d870ba7205bc596;hb=1f50bf8fc57ebf78f9056185a342493be460a847;hp=888a6cb844b889bd2fc51c810c2613ed62e57cee;hpb=40903ac34f89d9e2ad775e98b7bcec5b7feb0207;p=vpp.git diff --git a/src/vnet/udp/udp.c b/src/vnet/udp/udp.c index 888a6cb844b..7dd0d2a10ff 100644 --- a/src/vnet/udp/udp.c +++ b/src/vnet/udp/udp.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016 Cisco and/or its affiliates. + * Copyright (c) 2016-2019 Cisco and/or its affiliates. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at: @@ -22,6 +22,8 @@ #include #include +udp_main_t udp_main; + udp_connection_t * udp_connection_alloc (u32 thread_index) { @@ -45,7 +47,7 @@ udp_connection_alloc (u32 thread_index) pool_get_aligned (um->connections[thread_index], uc, CLIB_CACHE_LINE_BYTES); } - memset (uc, 0, sizeof (*uc)); + clib_memset (uc, 0, sizeof (*uc)); uc->c_c_index = uc - um->connections[thread_index]; uc->c_thread_index = thread_index; uc->c_proto = TRANSPORT_PROTO_UDP; @@ -58,7 +60,7 @@ udp_connection_free (udp_connection_t * uc) { pool_put (udp_main.connections[uc->c_thread_index], uc); if (CLIB_DEBUG) - memset (uc, 0xFA, sizeof (*uc)); + clib_memset (uc, 0xFA, sizeof (*uc)); } u32 @@ -76,7 +78,7 @@ udp_session_bind (u32 session_index, transport_endpoint_t * lcl) return -1; pool_get (um->listener_pool, listener); - memset (listener, 0, sizeof (udp_connection_t)); + clib_memset (listener, 0, sizeof (udp_connection_t)); listener->c_lcl_port = lcl->port; listener->c_c_index = listener - um->listener_pool; @@ -93,6 +95,7 @@ udp_session_bind (u32 session_index, transport_endpoint_t * lcl) listener->c_proto = TRANSPORT_PROTO_UDP; listener->c_s_index = session_index; listener->c_fib_index = lcl->fib_index; + listener->owns_port = 1; clib_spinlock_init (&listener->rx_lock); node_index = lcl->is_ip4 ? udp4_input_node.index : udp6_input_node.index; @@ -166,9 +169,10 @@ udp_session_close (u32 connection_index, u32 thread_index) uc = udp_connection_get (connection_index, thread_index); if (uc) { - udp_unregister_dst_port (vm, clib_net_to_host_u16 (uc->c_lcl_port), - uc->c_is_ip4); - stream_session_delete_notify (&uc->connection); + if (uc->owns_port || !uc->is_connected) + udp_unregister_dst_port (vm, clib_net_to_host_u16 (uc->c_lcl_port), + uc->c_is_ip4); + session_transport_delete_notify (&uc->connection); udp_connection_free (uc); } } @@ -212,7 +216,7 @@ format_udp_connection (u8 * s, va_list * args) if (verbose) { if (verbose == 1) - s = format (s, "%-15s\n", "-"); + s = format (s, "%-15s", "-"); else s = format (s, "\n"); } @@ -234,6 +238,8 @@ format_udp_session (u8 * s, va_list * args) u8 * format_udp_half_open_session (u8 * s, va_list * args) { + u32 __clib_unused tci = va_arg (*args, u32); + u32 __clib_unused thread_index = va_arg (*args, u32); clib_warning ("BUG"); return 0; } @@ -242,8 +248,10 @@ u8 * format_udp_listener_session (u8 * s, va_list * args) { u32 tci = va_arg (*args, u32); + u32 __clib_unused thread_index = va_arg (*args, u32); + u32 verbose = va_arg (*args, u32); udp_connection_t *uc = udp_listener_get (tci); - return format (s, "%U", format_udp_connection, uc); + return format (s, "%U", format_udp_connection, uc, verbose); } u16 @@ -261,11 +269,11 @@ udp_send_space (transport_connection_t * t) } int -udp_open_connection (transport_endpoint_t * rmt) +udp_open_connection (transport_endpoint_cfg_t * rmt) { udp_main_t *um = vnet_get_udp_main (); vlib_main_t *vm = vlib_get_main (); - u32 thread_index = vlib_get_thread_index (); + u32 thread_index = vm->thread_index; udp_connection_t *uc; ip46_address_t lcl_addr; u32 node_index; @@ -300,6 +308,7 @@ udp_open_connection (transport_endpoint_t * rmt) uc->c_is_ip4 = rmt->is_ip4; uc->c_proto = TRANSPORT_PROTO_UDP; uc->c_fib_index = rmt->fib_index; + uc->owns_port = 1; return uc->c_c_index; } @@ -313,14 +322,16 @@ udp_session_get_half_open (u32 conn_index) /* We don't poll main thread if we have workers */ thread_index = vlib_num_workers ()? 1 : 0; uc = udp_connection_get (conn_index, thread_index); + if (!uc) + return 0; return &uc->connection; } /* *INDENT-OFF* */ -const static transport_proto_vft_t udp_proto = { - .bind = udp_session_bind, - .open = udp_open_connection, - .unbind = udp_session_unbind, +static const transport_proto_vft_t udp_proto = { + .start_listen = udp_session_bind, + .connect = udp_open_connection, + .stop_listen = udp_session_unbind, .push_header = udp_push_header, .get_connection = udp_session_get, .get_listener = udp_session_get_listener, @@ -332,19 +343,25 @@ const static transport_proto_vft_t udp_proto = { .format_connection = format_udp_session, .format_half_open = format_udp_half_open_session, .format_listener = format_udp_listener_session, - .tx_type = TRANSPORT_TX_DGRAM, - .service_type = TRANSPORT_SERVICE_CL, + .transport_options = { + .tx_type = TRANSPORT_TX_DGRAM, + .service_type = TRANSPORT_SERVICE_CL, + }, }; /* *INDENT-ON* */ int -udpc_connection_open (transport_endpoint_t * rmt) +udpc_connection_open (transport_endpoint_cfg_t * rmt) { udp_connection_t *uc; + /* Reproduce the logic of udp_open_connection to find the correct thread */ + u32 thread_index = vlib_num_workers ()? 1 : vlib_get_main ()->thread_index; u32 uc_index; uc_index = udp_open_connection (rmt); - uc = udp_connection_get (uc_index, vlib_get_thread_index ()); + if (uc_index == (u32) ~ 0) + return -1; + uc = udp_connection_get (uc_index, thread_index); uc->is_connected = 1; return uc_index; } @@ -353,18 +370,20 @@ u32 udpc_connection_listen (u32 session_index, transport_endpoint_t * lcl) { udp_connection_t *listener; - u32 li; - li = udp_session_bind (session_index, lcl); - listener = udp_listener_get (li); + u32 li_index; + li_index = udp_session_bind (session_index, lcl); + if (li_index == (u32) ~ 0) + return -1; + listener = udp_listener_get (li_index); listener->is_connected = 1; - return li; + return li_index; } /* *INDENT-OFF* */ -const static transport_proto_vft_t udpc_proto = { - .bind = udpc_connection_listen, - .open = udpc_connection_open, - .unbind = udp_session_unbind, +static const transport_proto_vft_t udpc_proto = { + .start_listen = udpc_connection_listen, + .stop_listen = udp_session_unbind, + .connect = udpc_connection_open, .push_header = udp_push_header, .get_connection = udp_session_get, .get_listener = udp_session_get_listener, @@ -376,8 +395,11 @@ const static transport_proto_vft_t udpc_proto = { .format_connection = format_udp_session, .format_half_open = format_udp_half_open_session, .format_listener = format_udp_listener_session, - .tx_type = TRANSPORT_TX_DEQUEUE, - .service_type = TRANSPORT_SERVICE_CL, + .transport_options = { + .tx_type = TRANSPORT_TX_DGRAM, + .service_type = TRANSPORT_SERVICE_VC, + .half_open_has_fifos = 1 + }, }; /* *INDENT-ON* */ @@ -388,17 +410,9 @@ udp_init (vlib_main_t * vm) ip_main_t *im = &ip_main; vlib_thread_main_t *tm = vlib_get_thread_main (); u32 num_threads; - clib_error_t *error = 0; ip_protocol_info_t *pi; int i; - if ((error = vlib_call_init_function (vm, ip_main_init))) - return error; - if ((error = vlib_call_init_function (vm, ip4_lookup_init))) - return error; - if ((error = vlib_call_init_function (vm, ip6_lookup_init))) - return error; - /* * Registrations */ @@ -436,10 +450,77 @@ udp_init (vlib_main_t * vm) clib_spinlock_init (&um->peekers_readers_locks[i]); clib_spinlock_init (&um->peekers_write_locks[i]); } - return error; + return 0; } -VLIB_INIT_FUNCTION (udp_init); +/* *INDENT-OFF* */ +VLIB_INIT_FUNCTION (udp_init) = +{ + .runs_after = VLIB_INITS("ip_main_init", "ip4_lookup_init", + "ip6_lookup_init"), +}; +/* *INDENT-ON* */ + + +static clib_error_t * +show_udp_punt_fn (vlib_main_t * vm, unformat_input_t * input, + vlib_cli_command_t * cmd_arg) +{ + udp_main_t *um = vnet_get_udp_main (); + + clib_error_t *error = NULL; + + if (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + return clib_error_return (0, "unknown input `%U'", format_unformat_error, + input); + + udp_dst_port_info_t *port_info; + if (um->punt_unknown4) + { + vlib_cli_output (vm, "IPv4 UDP punt: enabled"); + } + else + { + u8 *s = NULL; + vec_foreach (port_info, um->dst_port_infos[UDP_IP4]) + { + if (udp_is_valid_dst_port (port_info->dst_port, 1)) + { + s = format (s, (!s) ? "%d" : ", %d", port_info->dst_port); + } + } + s = format (s, "%c", 0); + vlib_cli_output (vm, "IPV4 UDP ports punt : %s", s); + } + + if (um->punt_unknown6) + { + vlib_cli_output (vm, "IPv6 UDP punt: enabled"); + } + else + { + u8 *s = NULL; + vec_foreach (port_info, um->dst_port_infos[UDP_IP6]) + { + if (udp_is_valid_dst_port (port_info->dst_port, 01)) + { + s = format (s, (!s) ? "%d" : ", %d", port_info->dst_port); + } + } + s = format (s, "%c", 0); + vlib_cli_output (vm, "IPV6 UDP ports punt : %s", s); + } + + return (error); +} +/* *INDENT-OFF* */ +VLIB_CLI_COMMAND (show_tcp_punt_command, static) = +{ + .path = "show udp punt", + .short_help = "show udp punt [ipv4|ipv6]", + .function = show_udp_punt_fn, +}; +/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON