X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fvnet%2Fudp%2Fudp_input.c;h=95595c394e48f491a5ab8a09ea03d2df18591e8f;hb=refs%2Fchanges%2F55%2F26455%2F2;hp=8170cfbe49af9e7b5a4954baacba77bcb2b735dd;hpb=3cbc04bea02fc60471dfe0c671ede3ca42c118c3;p=vpp.git diff --git a/src/vnet/udp/udp_input.c b/src/vnet/udp/udp_input.c index 8170cfbe49a..95595c394e4 100644 --- a/src/vnet/udp/udp_input.c +++ b/src/vnet/udp/udp_input.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: @@ -13,20 +13,19 @@ * limitations under the License. */ +#include #include -#include -#include -#include -#include #include #include #include +#include +#include +#include +#include #include - -#include -#include "../session/application_interface.h" +#include static char *udp_error_strings[] = { #define udp_error(n,s) s, @@ -68,184 +67,274 @@ typedef enum always_inline void udp_input_inc_counter (vlib_main_t * vm, u8 is_ip4, u8 evt, u8 val) { - if (PREDICT_TRUE (!val)) - return; - if (is_ip4) vlib_node_increment_counter (vm, udp4_input_node.index, evt, val); else vlib_node_increment_counter (vm, udp6_input_node.index, evt, val); } +#define udp_store_err_counters(vm, is_ip4, cnts) \ +{ \ + int i; \ + for (i = 0; i < UDP_N_ERROR; i++) \ + if (cnts[i]) \ + udp_input_inc_counter(vm, is_ip4, i, cnts[i]); \ +} + +#define udp_inc_err_counter(cnts, err, val) \ +{ \ + cnts[err] += val; \ +} + +static void +udp_trace_buffer (vlib_main_t * vm, vlib_node_runtime_t * node, + vlib_buffer_t * b, session_t * s, u16 error0) +{ + udp_input_trace_t *t; + + if (PREDICT_TRUE (!(b->flags & VLIB_BUFFER_IS_TRACED))) + return; + + t = vlib_add_trace (vm, node, b, sizeof (*t)); + t->connection = s ? s->connection_index : ~0; + t->disposition = error0; + t->thread_index = s ? s->thread_index : vm->thread_index; +} + +static udp_connection_t * +udp_connection_accept (udp_connection_t * listener, session_dgram_hdr_t * hdr, + u32 thread_index) +{ + udp_connection_t *uc; + + uc = udp_connection_alloc (thread_index); + ip_copy (&uc->c_lcl_ip, &hdr->lcl_ip, hdr->is_ip4); + ip_copy (&uc->c_rmt_ip, &hdr->rmt_ip, hdr->is_ip4); + uc->c_lcl_port = hdr->lcl_port; + uc->c_rmt_port = hdr->rmt_port; + uc->c_is_ip4 = hdr->is_ip4; + uc->c_fib_index = listener->c_fib_index; + uc->mss = listener->mss; + uc->flags |= UDP_CONN_F_CONNECTED; + + if (session_dgram_accept (&uc->connection, listener->c_s_index, + listener->c_thread_index)) + { + udp_connection_free (uc); + return 0; + } + udp_connection_share_port (clib_net_to_host_u16 + (uc->c_lcl_port), uc->c_is_ip4); + return uc; +} + +static void +udp_connection_enqueue (udp_connection_t * uc0, session_t * s0, + session_dgram_hdr_t * hdr0, u32 thread_index, + vlib_buffer_t * b, u8 queue_event, u32 * error0) +{ + int wrote0; + + clib_spinlock_lock (&uc0->rx_lock); + + if (svm_fifo_max_enqueue_prod (s0->rx_fifo) + < hdr0->data_length + sizeof (session_dgram_hdr_t)) + { + *error0 = UDP_ERROR_FIFO_FULL; + goto unlock_rx_lock; + } + + /* If session is owned by another thread and rx event needed, + * enqueue event now while we still have the peeker lock */ + if (s0->thread_index != thread_index) + { + wrote0 = session_enqueue_dgram_connection (s0, hdr0, b, + TRANSPORT_PROTO_UDP, + /* queue event */ 0); + if (queue_event && !svm_fifo_has_event (s0->rx_fifo)) + session_enqueue_notify (s0); + } + else + { + wrote0 = session_enqueue_dgram_connection (s0, hdr0, b, + TRANSPORT_PROTO_UDP, + queue_event); + } + ASSERT (wrote0 > 0); + +unlock_rx_lock: + + clib_spinlock_unlock (&uc0->rx_lock); +} + +always_inline session_t * +udp_parse_and_lookup_buffer (vlib_buffer_t * b, session_dgram_hdr_t * hdr, + u8 is_ip4) +{ + udp_header_t *udp; + u32 fib_index; + session_t *s; + + /* udp_local hands us a pointer to the udp data */ + udp = (udp_header_t *) (vlib_buffer_get_current (b) - sizeof (*udp)); + fib_index = vnet_buffer (b)->ip.fib_index; + + hdr->data_offset = 0; + hdr->lcl_port = udp->dst_port; + hdr->rmt_port = udp->src_port; + hdr->is_ip4 = is_ip4; + + if (is_ip4) + { + ip4_header_t *ip4; + + /* TODO: must fix once udp_local does ip options correctly */ + ip4 = (ip4_header_t *) (((u8 *) udp) - sizeof (*ip4)); + ip_set (&hdr->lcl_ip, &ip4->dst_address, 1); + ip_set (&hdr->rmt_ip, &ip4->src_address, 1); + hdr->data_length = clib_net_to_host_u16 (ip4->length); + hdr->data_length -= sizeof (ip4_header_t) + sizeof (udp_header_t); + s = session_lookup_safe4 (fib_index, &ip4->dst_address, + &ip4->src_address, udp->dst_port, + udp->src_port, TRANSPORT_PROTO_UDP); + } + else + { + ip6_header_t *ip60; + + ip60 = (ip6_header_t *) (((u8 *) udp) - sizeof (*ip60)); + ip_set (&hdr->lcl_ip, &ip60->dst_address, 0); + ip_set (&hdr->rmt_ip, &ip60->src_address, 0); + hdr->data_length = clib_net_to_host_u16 (ip60->payload_length); + hdr->data_length -= sizeof (udp_header_t); + s = session_lookup_safe6 (fib_index, &ip60->dst_address, + &ip60->src_address, udp->dst_port, + udp->src_port, TRANSPORT_PROTO_UDP); + } + + if (PREDICT_TRUE (!(b->flags & VLIB_BUFFER_NEXT_PRESENT))) + b->current_length = hdr->data_length; + else + b->total_length_not_including_first_buffer = hdr->data_length + - b->current_length; + + return s; +} + always_inline uword udp46_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame, u8 is_ip4) { - u32 n_left_from, *from, *to_next; - u32 next_index, errors; - u32 my_thread_index = vm->thread_index; + u32 n_left_from, *from, errors, *first_buffer; + vlib_buffer_t *bufs[VLIB_FRAME_SIZE], **b; + u16 err_counters[UDP_N_ERROR] = { 0 }; + u32 thread_index = vm->thread_index; - from = vlib_frame_vector_args (frame); + from = first_buffer = vlib_frame_vector_args (frame); n_left_from = frame->n_vectors; - next_index = node->cached_next_index; + vlib_get_buffers (vm, from, bufs, n_left_from); + + b = bufs; while (n_left_from > 0) { - u32 n_left_to_next; + u32 error0 = UDP_ERROR_ENQUEUED; + session_dgram_hdr_t hdr0; + udp_connection_t *uc0; + session_t *s0; - vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next); - - while (n_left_from > 0 && n_left_to_next > 0) + s0 = udp_parse_and_lookup_buffer (b[0], &hdr0, is_ip4); + if (PREDICT_FALSE (!s0)) { - u32 bi0, fib_index0; - vlib_buffer_t *b0; - u32 next0 = UDP_INPUT_NEXT_DROP; - u32 error0 = UDP_ERROR_ENQUEUED; - udp_header_t *udp0; - ip4_header_t *ip40; - ip6_header_t *ip60; - u8 *data0; - stream_session_t *s0; - transport_connection_t *tc0 = 0; - udp_connection_t *child0, *new_uc0; - int written0; - - /* speculatively enqueue b0 to the current next frame */ - bi0 = from[0]; - to_next[0] = bi0; - from += 1; - to_next += 1; - n_left_from -= 1; - n_left_to_next -= 1; - - b0 = vlib_get_buffer (vm, bi0); - - /* udp_local hands us a pointer to the udp data */ - data0 = vlib_buffer_get_current (b0); - udp0 = (udp_header_t *) (data0 - sizeof (*udp0)); - fib_index0 = vnet_buffer (b0)->ip.fib_index; - - if (is_ip4) - { - /* $$$$ fixme: udp_local doesn't do ip options correctly anyhow */ - ip40 = (ip4_header_t *) (((u8 *) udp0) - sizeof (*ip40)); - s0 = session_lookup_safe4 (fib_index0, &ip40->dst_address, - &ip40->src_address, udp0->dst_port, - udp0->src_port, TRANSPORT_PROTO_UDP); - } - else - { - ip60 = (ip6_header_t *) (((u8 *) udp0) - sizeof (*ip60)); - s0 = session_lookup_safe6 (fib_index0, &ip60->dst_address, - &ip60->src_address, udp0->dst_port, - udp0->src_port, TRANSPORT_PROTO_UDP); - } + error0 = UDP_ERROR_NO_LISTENER; + goto done; + } - if (PREDICT_FALSE (s0 == 0)) - { - error0 = UDP_ERROR_NO_LISTENER; - goto trace0; - } + /* + * If session exists pool peeker lock is taken at this point unless + * the session is already on the right thread or is a listener + */ - if (PREDICT_TRUE (s0->session_state == SESSION_STATE_READY)) - { - tc0 = session_get_transport (s0); - } - else if (s0->session_state == SESSION_STATE_CONNECTING_READY) - { - /* - * Clone the transport. It will be cleaned up with the - * session once we notify the session layer. - */ - new_uc0 = udp_conenction_clone_safe (s0->connection_index, - s0->thread_index); - ASSERT (s0->session_index == new_uc0->c_s_index); - - /* - * Drop the 'lock' on pool resize - */ - session_pool_remove_peeker (s0->thread_index); - session_dgram_connect_notify (&new_uc0->connection, - s0->thread_index, &s0); - tc0 = &new_uc0->connection; - } - else if (s0->session_state == SESSION_STATE_LISTENING) + if (s0->session_state == SESSION_STATE_OPENED) + { + u8 queue_event = 1; + uc0 = udp_connection_from_transport (session_get_transport (s0)); + if (uc0->flags & UDP_CONN_F_CONNECTED) { - tc0 = listen_session_get_transport (s0); - - child0 = udp_connection_alloc (my_thread_index); - if (is_ip4) + if (s0->thread_index != thread_index) { - ip_set (&child0->c_lcl_ip, &ip40->dst_address, 1); - ip_set (&child0->c_rmt_ip, &ip40->src_address, 1); + /* + * Clone the transport. It will be cleaned up with the + * session once we notify the session layer. + */ + uc0 = udp_connection_clone_safe (s0->connection_index, + s0->thread_index); + ASSERT (s0->session_index == uc0->c_s_index); + + /* + * Drop the peeker lock on pool resize and ask session + * layer for a new session. + */ + session_pool_remove_peeker (s0->thread_index); + session_dgram_connect_notify (&uc0->connection, + s0->thread_index, &s0); + queue_event = 0; } else - { - ip_set (&child0->c_lcl_ip, &ip60->dst_address, 0); - ip_set (&child0->c_rmt_ip, &ip60->src_address, 0); - } - child0->c_lcl_port = udp0->dst_port; - child0->c_rmt_port = udp0->src_port; - child0->c_is_ip4 = is_ip4; - child0->mtu = 1460; /* $$$$ policy */ - - if (stream_session_accept - (&child0->connection, tc0->s_index, 1)) + s0->session_state = SESSION_STATE_READY; + } + udp_connection_enqueue (uc0, s0, &hdr0, thread_index, b[0], + queue_event, &error0); + session_pool_remove_peeker (s0->thread_index); + } + else if (s0->session_state == SESSION_STATE_READY) + { + uc0 = udp_connection_from_transport (session_get_transport (s0)); + udp_connection_enqueue (uc0, s0, &hdr0, thread_index, b[0], 1, + &error0); + } + else if (s0->session_state == SESSION_STATE_LISTENING) + { + uc0 = udp_connection_from_transport (session_get_transport (s0)); + if (uc0->flags & UDP_CONN_F_CONNECTED) + { + uc0 = udp_connection_accept (uc0, &hdr0, thread_index); + if (!uc0) { error0 = UDP_ERROR_CREATE_SESSION; - goto trace0; + goto done; } - s0 = session_get (child0->c_s_index, child0->c_thread_index); - s0->session_state = SESSION_STATE_READY; - tc0 = &child0->connection; - - error0 = UDP_ERROR_LISTENER; - } - else - { - error0 = UDP_ERROR_NOT_READY; - goto trace0; - } - - written0 = session_enqueue_dgram_connection (s0, b0, tc0->proto, - 1 /* queue evt */ ); - if (PREDICT_FALSE (written0 < 0)) - { - error0 = UDP_ERROR_FIFO_FULL; - goto trace0; + s0 = session_get (uc0->c_s_index, uc0->c_thread_index); + error0 = UDP_ERROR_ACCEPT; } + udp_connection_enqueue (uc0, s0, &hdr0, thread_index, b[0], 1, + &error0); + } + else + { + error0 = UDP_ERROR_NOT_READY; + session_pool_remove_peeker (s0->thread_index); + } - trace0: - b0->error = node->errors[error0]; - - if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE) - && (b0->flags & VLIB_BUFFER_IS_TRACED))) - { - udp_input_trace_t *t = vlib_add_trace (vm, node, b0, - sizeof (*t)); + done: - t->connection = tc0 ? tc0->c_index : ~0; - t->disposition = error0; - t->thread_index = my_thread_index; - } + b += 1; + n_left_from -= 1; - vlib_validate_buffer_enqueue_x1 (vm, node, next_index, - to_next, n_left_to_next, - bi0, next0); - } + udp_inc_err_counter (err_counters, error0, 1); - vlib_put_next_frame (vm, node, next_index, n_left_to_next); + if (PREDICT_FALSE (node->flags & VLIB_NODE_FLAG_TRACE)) + udp_trace_buffer (vm, node, b[0], s0, error0); } - errors = session_manager_flush_enqueue_events (TRANSPORT_PROTO_UDP, - my_thread_index); - udp_input_inc_counter (vm, is_ip4, UDP_ERROR_EVENT_FIFO_FULL, errors); + vlib_buffer_free (vm, first_buffer, frame->n_vectors); + errors = session_main_flush_enqueue_events (TRANSPORT_PROTO_UDP, + thread_index); + err_counters[UDP_ERROR_MQ_FULL] = errors; + udp_store_err_counters (vm, is_ip4, err_counters); return frame->n_vectors; } -vlib_node_registration_t udp4_input_node; -vlib_node_registration_t udp6_input_node; - static uword udp4_input (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_frame_t * frame)