X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fudp%2Fudp.c;h=3f36ce759f345a0cd541446188273f5101392a4b;hb=a039620c2eec19a6c2e525645eeb0728a1c18c8d;hp=46a26e484edd32a09c5ec327fa8008450f7098fa;hpb=c5df8c71cc867d8120a25e4bd6d065aa63d9011c;p=vpp.git diff --git a/src/vnet/udp/udp.c b/src/vnet/udp/udp.c index 46a26e484ed..3f36ce759f3 100644 --- a/src/vnet/udp/udp.c +++ b/src/vnet/udp/udp.c @@ -21,9 +21,77 @@ #include #include #include +#include udp_main_t udp_main; +static void +udp_connection_register_port (vlib_main_t * vm, u16 lcl_port, u8 is_ip4) +{ + udp_main_t *um = &udp_main; + udp_dst_port_info_t *pi; + u16 *n; + + pi = udp_get_dst_port_info (um, lcl_port, is_ip4); + if (!pi) + { + udp_add_dst_port (um, lcl_port, 0, is_ip4); + pi = udp_get_dst_port_info (um, lcl_port, is_ip4); + pi->n_connections = 1; + } + else + { + pi->n_connections += 1; + /* Do not return. The fact that the pi is valid does not mean + * it's up to date */ + } + + pi->node_index = is_ip4 ? udp4_input_node.index : udp6_input_node.index; + pi->next_index = um->local_to_input_edge[is_ip4]; + + /* Setup udp protocol -> next index sparse vector mapping. */ + if (is_ip4) + n = sparse_vec_validate (um->next_by_dst_port4, + clib_host_to_net_u16 (lcl_port)); + else + n = sparse_vec_validate (um->next_by_dst_port6, + clib_host_to_net_u16 (lcl_port)); + + n[0] = pi->next_index; +} + +static void +udp_connection_unregister_port (u16 lcl_port, u8 is_ip4) +{ + udp_main_t *um = &udp_main; + udp_dst_port_info_t *pi; + + pi = udp_get_dst_port_info (um, lcl_port, is_ip4); + if (!pi) + return; + + if (!pi->n_connections) + { + clib_warning ("no connections using port %u", lcl_port); + return; + } + + if (!clib_atomic_sub_fetch (&pi->n_connections, 1)) + udp_unregister_dst_port (0, lcl_port, is_ip4); +} + +void +udp_connection_share_port (u16 lcl_port, u8 is_ip4) +{ + udp_main_t *um = &udp_main; + udp_dst_port_info_t *pi; + + /* Done without a lock but the operation is atomic. Writers to pi hash + * table and vector should be guarded by a barrier sync */ + pi = udp_get_dst_port_info (um, lcl_port, is_ip4); + clib_atomic_fetch_add_rel (&pi->n_connections, 1); +} + udp_connection_t * udp_connection_alloc (u32 thread_index) { @@ -58,9 +126,19 @@ udp_connection_alloc (u32 thread_index) void udp_connection_free (udp_connection_t * uc) { - pool_put (udp_main.connections[uc->c_thread_index], uc); + u32 thread_index = uc->c_thread_index; if (CLIB_DEBUG) clib_memset (uc, 0xFA, sizeof (*uc)); + pool_put (udp_main.connections[thread_index], uc); +} + +void +udp_connection_delete (udp_connection_t * uc) +{ + udp_connection_unregister_port (clib_net_to_host_u16 (uc->c_lcl_port), + uc->c_is_ip4); + session_transport_delete_notify (&uc->connection); + udp_connection_free (uc); } u32 @@ -68,14 +146,19 @@ udp_session_bind (u32 session_index, transport_endpoint_t * lcl) { udp_main_t *um = vnet_get_udp_main (); vlib_main_t *vm = vlib_get_main (); + transport_endpoint_cfg_t *lcl_ext; udp_connection_t *listener; - u32 node_index; - void *iface_ip; udp_dst_port_info_t *pi; + void *iface_ip; - pi = udp_get_dst_port_info (um, lcl->port, lcl->is_ip4); - if (pi) - return -1; + pi = udp_get_dst_port_info (um, clib_net_to_host_u16 (lcl->port), + lcl->is_ip4); + + if (pi && !pi->n_connections) + { + clib_warning ("port already used"); + return -1; + } pool_get (um->listener_pool, listener); clib_memset (listener, 0, sizeof (udp_connection_t)); @@ -95,23 +178,29 @@ 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->flags |= UDP_CONN_F_OWNS_PORT; + lcl_ext = (transport_endpoint_cfg_t *) lcl; + if (lcl_ext->transport_flags & TRANSPORT_CFG_F_CONNECTED) + listener->flags |= UDP_CONN_F_CONNECTED; + else + listener->c_flags |= TRANSPORT_CONNECTION_F_CLESS; clib_spinlock_init (&listener->rx_lock); - node_index = lcl->is_ip4 ? udp4_input_node.index : udp6_input_node.index; - udp_register_dst_port (vm, clib_net_to_host_u16 (lcl->port), node_index, - 1 /* is_ipv4 */ ); + udp_connection_register_port (vm, clib_net_to_host_u16 (lcl->port), + lcl->is_ip4); return listener->c_c_index; } u32 udp_session_unbind (u32 listener_index) { - vlib_main_t *vm = vlib_get_main (); - + udp_main_t *um = &udp_main; udp_connection_t *listener; + listener = udp_listener_get (listener_index); - udp_unregister_dst_port (vm, clib_net_to_host_u16 (listener->c_lcl_port), - listener->c_is_ip4); + udp_connection_unregister_port (clib_net_to_host_u16 (listener->c_lcl_port), + listener->c_is_ip4); + pool_put (um->listener_pool, listener); return 0; } @@ -147,6 +236,12 @@ udp_push_header (transport_connection_t * tc, vlib_buffer_t * b) vnet_buffer (b)->sw_if_index[VLIB_TX] = uc->c_fib_index; b->flags |= VNET_BUFFER_F_LOCALLY_ORIGINATED; + if (PREDICT_FALSE (uc->flags & UDP_CONN_F_CLOSING)) + { + if (!transport_max_tx_dequeue (&uc->connection)) + udp_connection_delete (uc); + } + return 0; } @@ -163,16 +258,16 @@ udp_session_get (u32 connection_index, u32 thread_index) void udp_session_close (u32 connection_index, u32 thread_index) { - vlib_main_t *vm = vlib_get_main (); udp_connection_t *uc; + 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); - session_transport_delete_notify (&uc->connection); - udp_connection_free (uc); - } + if (!uc) + return; + + if (!transport_max_tx_dequeue (&uc->connection)) + udp_connection_delete (uc); + else + uc->flags |= UDP_CONN_F_CLOSING; } void @@ -214,7 +309,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"); } @@ -236,6 +331,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; } @@ -244,51 +341,58 @@ 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); -} - -u16 -udp_send_mss (transport_connection_t * t) -{ - /* TODO figure out MTU of output interface */ - return 1460; + return format (s, "%U", format_udp_connection, uc, verbose); } -u32 -udp_send_space (transport_connection_t * t) +static int +udp_session_send_params (transport_connection_t * tconn, + transport_send_params_t * sp) { /* No constraint on TX window */ - return ~0; + sp->snd_space = ~0; + /* TODO figure out MTU of output interface */ + sp->snd_mss = 1460; + sp->tx_offset = 0; + sp->flags = 0; + return 0; } int 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 = vm->thread_index; udp_connection_t *uc; ip46_address_t lcl_addr; - u32 node_index; u16 lcl_port; if (transport_alloc_local_endpoint (TRANSPORT_PROTO_UDP, rmt, &lcl_addr, &lcl_port)) return -1; - while (udp_get_dst_port_info (um, lcl_port, rmt->is_ip4)) + if (udp_is_valid_dst_port (lcl_port, rmt->is_ip4)) { - lcl_port = transport_alloc_local_port (TRANSPORT_PROTO_UDP, &lcl_addr); - if (lcl_port < 1) + /* If specific source port was requested abort */ + if (rmt->peer.port) + return -1; + + /* Try to find a port that's not used */ + while (udp_is_valid_dst_port (lcl_port, rmt->is_ip4)) { - clib_warning ("Failed to allocate src port"); - return -1; + lcl_port = transport_alloc_local_port (TRANSPORT_PROTO_UDP, + &lcl_addr); + if (lcl_port < 1) + { + clib_warning ("Failed to allocate src port"); + return -1; + } } } - node_index = rmt->is_ip4 ? udp4_input_node.index : udp6_input_node.index; - udp_register_dst_port (vm, lcl_port, node_index, 1 /* is_ipv4 */ ); + udp_connection_register_port (vm, lcl_port, rmt->is_ip4); /* We don't poll main thread if we have workers */ if (vlib_num_workers ()) @@ -302,6 +406,11 @@ udp_open_connection (transport_endpoint_cfg_t * rmt) uc->c_is_ip4 = rmt->is_ip4; uc->c_proto = TRANSPORT_PROTO_UDP; uc->c_fib_index = rmt->fib_index; + uc->flags |= UDP_CONN_F_OWNS_PORT; + if (rmt->transport_flags & TRANSPORT_CFG_F_CONNECTED) + uc->flags |= UDP_CONN_F_CONNECTED; + else + uc->c_flags |= TRANSPORT_CONNECTION_F_CLESS; return uc->c_c_index; } @@ -315,11 +424,13 @@ 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 = { +static const transport_proto_vft_t udp_proto = { .start_listen = udp_session_bind, .connect = udp_open_connection, .stop_listen = udp_session_unbind, @@ -329,13 +440,16 @@ const static transport_proto_vft_t udp_proto = { .get_half_open = udp_session_get_half_open, .close = udp_session_close, .cleanup = udp_session_cleanup, - .send_mss = udp_send_mss, - .send_space = udp_send_space, + .send_params = udp_session_send_params, .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 = { + .name = "udp", + .short_name = "U", + .tx_type = TRANSPORT_TX_DGRAM, + .service_type = TRANSPORT_SERVICE_CL, + }, }; /* *INDENT-ON* */ @@ -344,10 +458,14 @@ int 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 ()); - uc->is_connected = 1; + if (uc_index == (u32) ~ 0) + return -1; + uc = udp_connection_get (uc_index, thread_index); + uc->flags |= UDP_CONN_F_CONNECTED; return uc_index; } @@ -355,15 +473,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); - listener->is_connected = 1; - return 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->flags |= UDP_CONN_F_CONNECTED; + /* Fake udp listener, i.e., make sure session layer adds a udp instead of + * udpc listener to the lookup table */ + ((session_endpoint_cfg_t *) lcl)->transport_proto = TRANSPORT_PROTO_UDP; + return li_index; } /* *INDENT-OFF* */ -const static transport_proto_vft_t udpc_proto = { +static const transport_proto_vft_t udpc_proto = { .start_listen = udpc_connection_listen, .stop_listen = udp_session_unbind, .connect = udpc_connection_open, @@ -373,13 +496,17 @@ const static transport_proto_vft_t udpc_proto = { .get_half_open = udp_session_get_half_open, .close = udp_session_close, .cleanup = udp_session_cleanup, - .send_mss = udp_send_mss, - .send_space = udp_send_space, + .send_params = udp_session_send_params, .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 = { + .name = "udpc", + .short_name = "U", + .tx_type = TRANSPORT_TX_DGRAM, + .service_type = TRANSPORT_SERVICE_VC, + .half_open_has_fifos = 1 + }, }; /* *INDENT-ON* */ @@ -390,17 +517,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 */ @@ -438,10 +557,22 @@ udp_init (vlib_main_t * vm) clib_spinlock_init (&um->peekers_readers_locks[i]); clib_spinlock_init (&um->peekers_write_locks[i]); } - return error; + + um->local_to_input_edge[UDP_IP4] = + vlib_node_add_next (vm, udp4_local_node.index, udp4_input_node.index); + um->local_to_input_edge[UDP_IP6] = + vlib_node_add_next (vm, udp6_local_node.index, udp6_input_node.index); + 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,