X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fquic%2Fquic.c;h=e9df9ff50253d8a023a124f03f3132777b8a1c4c;hb=8095b602c79c411999f04ded541db918cf1fabe0;hp=8abb850084de2dfd7c4a44af34669cac3141d3ed;hpb=f85770c4a190babdb47cb1cdc87467eaccac1f0b;p=vpp.git diff --git a/src/plugins/quic/quic.c b/src/plugins/quic/quic.c index 8abb850084d..e9df9ff5025 100644 --- a/src/plugins/quic/quic.c +++ b/src/plugins/quic/quic.c @@ -30,9 +30,17 @@ #include +static char *quic_error_strings[] = { +#define quic_error(n,s) s, +#include "quic_error.def" +#undef quic_error +}; static quic_main_t quic_main; static void quic_update_timer (quic_ctx_t * ctx); +static int quic_check_quic_session_connected (quic_ctx_t * ctx); + +/* Helper functions */ static u32 quic_ctx_alloc (u32 thread_index) @@ -42,7 +50,7 @@ quic_ctx_alloc (u32 thread_index) pool_get (qm->ctx_pool[thread_index], ctx); - memset (ctx, 0, sizeof (quic_ctx_t)); + clib_memset (ctx, 0, sizeof (quic_ctx_t)); ctx->c_thread_index = thread_index; QUIC_DBG (3, "Allocated quic_ctx %u on thread %u", ctx - qm->ctx_pool[thread_index], thread_index); @@ -52,10 +60,10 @@ quic_ctx_alloc (u32 thread_index) static void quic_ctx_free (quic_ctx_t * ctx) { - QUIC_DBG (2, "Free ctx %u", ctx->c_c_index); + QUIC_DBG (2, "Free ctx %u %x", ctx->c_thread_index, ctx->c_c_index); u32 thread_index = ctx->c_thread_index; if (CLIB_DEBUG) - memset (ctx, 0xfb, sizeof (*ctx)); + clib_memset (ctx, 0xfb, sizeof (*ctx)); pool_put (quic_main.ctx_pool[thread_index], ctx); } @@ -131,25 +139,31 @@ quic_sendable_packet_count (session_t * udp_session) static quicly_context_t * quic_get_quicly_ctx_from_ctx (quic_ctx_t * ctx) { - app_worker_t *app_wrk; - application_t *app; - app_wrk = app_worker_get_if_valid (ctx->parent_app_wrk_id); - if (!app_wrk) - return 0; - app = application_get (app_wrk->app_index); - return (quicly_context_t *) app->quicly_ctx; + return ctx->quicly_ctx; } static quicly_context_t * quic_get_quicly_ctx_from_udp (u64 udp_session_handle) { - session_t *udp_session; - application_t *app; - udp_session = session_get_from_handle (udp_session_handle); - app = application_get (udp_session->opaque); - return (quicly_context_t *) app->quicly_ctx; + session_t *udp_session = session_get_from_handle (udp_session_handle); + quic_ctx_t *ctx = + quic_ctx_get (udp_session->opaque, udp_session->thread_index); + return ctx->quicly_ctx; } +static inline void +quic_set_udp_tx_evt (session_t * udp_session) +{ + int rv = 0; + if (svm_fifo_set_event (udp_session->tx_fifo)) + rv = session_send_io_evt_to_thread (udp_session->tx_fifo, + SESSION_IO_EVT_TX); + if (PREDICT_FALSE (rv)) + clib_warning ("Event enqueue errored %d", rv); +} + +/* QUIC protocol actions */ + static void quic_ack_rx_data (session_t * stream_session) { @@ -159,9 +173,8 @@ quic_ack_rx_data (session_t * stream_session) quicly_stream_t *stream; quic_stream_data_t *stream_data; - sctx = - quic_ctx_get (stream_session->connection_index, - stream_session->thread_index); + sctx = quic_ctx_get (stream_session->connection_index, + stream_session->thread_index); ASSERT (quic_ctx_is_stream (sctx)); stream = sctx->stream; stream_data = (quic_stream_data_t *) stream->data; @@ -224,6 +237,15 @@ quic_connection_delete (quic_ctx_t * ctx) quic_ctx_free (ctx); } +void +quic_increment_counter (u8 evt, u8 val) +{ + vlib_main_t *vm = vlib_get_main (); + vlib_node_increment_counter (vm, quic_input_node.index, evt, val); +} + + + /** * Called when quicly return an error * This function interacts tightly with quic_proto_on_close @@ -265,7 +287,7 @@ quic_connection_closed (quic_ctx_t * ctx) quic_connection_delete (ctx); break; default: - QUIC_DBG (0, "BUG"); + QUIC_DBG (0, "BUG %d", ctx->conn_state); break; } } @@ -300,15 +322,15 @@ quic_send_datagram (session_t * udp_session, quicly_datagram_t * packet) /* Read dest address from quicly-provided sockaddr */ if (hdr.is_ip4) { - ASSERT (packet->sa.sa_family == AF_INET); - struct sockaddr_in *sa4 = (struct sockaddr_in *) &packet->sa; + ASSERT (packet->dest.sa.sa_family == AF_INET); + struct sockaddr_in *sa4 = (struct sockaddr_in *) &packet->dest.sa; hdr.rmt_port = sa4->sin_port; hdr.rmt_ip.ip4.as_u32 = sa4->sin_addr.s_addr; } else { - ASSERT (packet->sa.sa_family == AF_INET6); - struct sockaddr_in6 *sa6 = (struct sockaddr_in6 *) &packet->sa; + ASSERT (packet->dest.sa.sa_family == AF_INET6); + struct sockaddr_in6 *sa6 = (struct sockaddr_in6 *) &packet->dest.sa; hdr.rmt_port = sa6->sin6_port; clib_memcpy (&hdr.rmt_ip.ip6, &sa6->sin6_addr, 16); } @@ -325,6 +347,9 @@ quic_send_datagram (session_t * udp_session, quicly_datagram_t * packet) QUIC_DBG (1, "Not enough space to enqueue payload"); return QUIC_ERROR_FULL_FIFO; } + + quic_increment_counter (QUIC_ERROR_TX_PACKETS, 1); + return 0; } @@ -387,11 +412,7 @@ quic_send_packets (quic_ctx_t * ctx) while (num_packets > 0 && num_packets == max_packets); stop_sending: - if (svm_fifo_set_event (udp_session->tx_fifo)) - if ((err = - session_send_io_evt_to_thread (udp_session->tx_fifo, - SESSION_IO_EVT_TX))) - clib_warning ("Event enqueue errored %d", err); + quic_set_udp_tx_evt (udp_session); QUIC_DBG (3, "%u[TX] %u[RX]", svm_fifo_max_dequeue (udp_session->tx_fifo), svm_fifo_max_dequeue (udp_session->rx_fifo)); @@ -406,21 +427,16 @@ quicly_error: return 1; } -/***************************************************************************** - * - * START QUICLY CALLBACKS - * Called from QUIC lib - * - *****************************************************************************/ +/* Quicly callbacks */ static void quic_on_stream_destroy (quicly_stream_t * stream, int err) { quic_stream_data_t *stream_data = (quic_stream_data_t *) stream->data; - quic_ctx_t *sctx = - quic_ctx_get (stream_data->ctx_id, stream_data->thread_index); - session_t *stream_session = - session_get (sctx->c_s_index, sctx->c_thread_index); + quic_ctx_t *sctx = quic_ctx_get (stream_data->ctx_id, + stream_data->thread_index); + session_t *stream_session = session_get (sctx->c_s_index, + sctx->c_thread_index); QUIC_DBG (2, "DESTROYED_STREAM: session 0x%lx (%U)", session_handle (stream_session), quic_format_err, err); @@ -428,7 +444,7 @@ quic_on_stream_destroy (quicly_stream_t * stream, int err) session_transport_delete_notify (&sctx->connection); quic_ctx_free (sctx); - free (stream->data); + clib_mem_free (stream->data); } static int @@ -436,10 +452,10 @@ quic_on_stop_sending (quicly_stream_t * stream, int err) { #if QUIC_DEBUG >= 2 quic_stream_data_t *stream_data = (quic_stream_data_t *) stream->data; - quic_ctx_t *sctx = - quic_ctx_get (stream_data->ctx_id, stream_data->thread_index); - session_t *stream_session = - session_get (sctx->c_s_index, sctx->c_thread_index); + quic_ctx_t *sctx = quic_ctx_get (stream_data->ctx_id, + stream_data->thread_index); + session_t *stream_session = session_get (sctx->c_s_index, + sctx->c_thread_index); clib_warning ("(NOT IMPLEMENTD) STOP_SENDING: session 0x%lx (%U)", session_handle (stream_session), quic_format_err, err); #endif @@ -451,11 +467,11 @@ static int quic_on_receive_reset (quicly_stream_t * stream, int err) { quic_stream_data_t *stream_data = (quic_stream_data_t *) stream->data; - quic_ctx_t *sctx = - quic_ctx_get (stream_data->ctx_id, stream_data->thread_index); + quic_ctx_t *sctx = quic_ctx_get (stream_data->ctx_id, + stream_data->thread_index); #if QUIC_DEBUG >= 2 - session_t *stream_session = - session_get (sctx->c_s_index, sctx->c_thread_index); + session_t *stream_session = session_get (sctx->c_s_index, + sctx->c_thread_index); clib_warning ("RESET_STREAM: session 0x%lx (%U)", session_handle (stream_session), quic_format_err, err); #endif @@ -502,9 +518,9 @@ quic_on_receive (quicly_stream_t * stream, size_t off, const void *src, } else { - rlen = - svm_fifo_enqueue_with_offset (f, off - stream_data->app_rx_data_len, - len, (u8 *) src); + rlen = svm_fifo_enqueue_with_offset (f, + off - stream_data->app_rx_data_len, + len, (u8 *) src); ASSERT (rlen == 0); } return 0; @@ -580,10 +596,9 @@ static const quicly_stream_callbacks_t quic_stream_callbacks = { .on_receive_reset = quic_on_receive_reset }; -static void -quic_accept_stream (void *s) +static int +quic_on_stream_open (quicly_stream_open_t * self, quicly_stream_t * stream) { - quicly_stream_t *stream = (quicly_stream_t *) s; session_t *stream_session, *quic_session; quic_stream_data_t *stream_data; app_worker_t *app_wrk; @@ -591,8 +606,21 @@ quic_accept_stream (void *s) u32 sctx_id; int rv; + QUIC_DBG (2, "on_stream_open called"); + stream->data = clib_mem_alloc (sizeof (quic_stream_data_t)); + stream->callbacks = &quic_stream_callbacks; + /* Notify accept on parent qsession, but only if this is not a locally + * initiated stream */ + if (quicly_stream_is_self_initiated (stream)) + return 0; + sctx_id = quic_ctx_alloc (vlib_get_thread_index ()); + qctx = quic_get_conn_ctx (stream->conn); + /* Might need to signal that the connection is ready if the first thing the + * server does is open a stream */ + quic_check_quic_session_connected (qctx); + /* ctx might be invalidated */ qctx = quic_get_conn_ctx (stream->conn); stream_session = session_alloc (qctx->c_thread_index); @@ -628,7 +656,7 @@ quic_accept_stream (void *s) QUIC_DBG (1, "failed to allocate fifos"); session_free (stream_session); quicly_reset_stream (stream, QUIC_APP_ALLOCATION_ERROR); - return; + return 0; /* Frame is still valid */ } svm_fifo_add_want_deq_ntf (stream_session->rx_fifo, SVM_FIFO_WANT_DEQ_NOTIF_IF_FULL | @@ -639,22 +667,9 @@ quic_accept_stream (void *s) QUIC_DBG (1, "failed to notify accept worker app"); session_free_w_fifos (stream_session); quicly_reset_stream (stream, QUIC_APP_ACCEPT_NOTIFY_ERROR); - return; + return 0; /* Frame is still valid */ } -} -static int -quic_on_stream_open (quicly_stream_open_t * self, quicly_stream_t * stream) -{ - QUIC_DBG (2, "on_stream_open called"); - stream->data = malloc (sizeof (quic_stream_data_t)); - stream->callbacks = &quic_stream_callbacks; - /* Notify accept on parent qsession, but only if this is not a locally - * initiated stream */ - if (!quicly_stream_is_self_initiated (stream)) - { - quic_accept_stream (stream); - } return 0; } @@ -674,22 +689,10 @@ quic_on_closed_by_peer (quicly_closed_by_peer_t * self, quicly_conn_t * conn, session_transport_closing_notify (&ctx->connection); } -static quicly_stream_open_t on_stream_open = { &quic_on_stream_open }; -static quicly_closed_by_peer_t on_closed_by_peer = - { &quic_on_closed_by_peer }; +static quicly_stream_open_t on_stream_open = { quic_on_stream_open }; +static quicly_closed_by_peer_t on_closed_by_peer = { quic_on_closed_by_peer }; - -/***************************************************************************** - * - * END QUICLY CALLBACKS - * - *****************************************************************************/ - -/***************************************************************************** - * - * BEGIN TIMERS HANDLING - * - *****************************************************************************/ +/* Timer handling */ static int64_t quic_get_thread_time (u8 thread_index) @@ -777,8 +780,8 @@ quic_update_timer (quic_ctx_t * ctx) QUIC_DBG (4, "timer for ctx %u already stopped", ctx->c_c_index); return; } - ctx->timer_handle = - tw_timer_start_1t_3w_1024sl_ov (tw, ctx->c_c_index, 0, next_interval); + ctx->timer_handle = tw_timer_start_1t_3w_1024sl_ov (tw, ctx->c_c_index, + 0, next_interval); } else { @@ -806,12 +809,6 @@ quic_expired_timers_dispatch (u32 * expired_timers) } } -/***************************************************************************** - * - * END TIMERS HANDLING - * - *****************************************************************************/ - static int quic_encrypt_ticket_cb (ptls_encrypt_ticket_t * _self, ptls_t * tls, int is_encrypt, ptls_buffer_t * dst, ptls_iovec_t src) @@ -823,18 +820,18 @@ quic_encrypt_ticket_cb (ptls_encrypt_ticket_t * _self, ptls_t * tls, { /* replace the cached entry along with a newly generated session id */ - free (self->data.base); - if ((self->data.base = malloc (src.len)) == NULL) + clib_mem_free (self->data.base); + if ((self->data.base = clib_mem_alloc (src.len)) == NULL) return PTLS_ERROR_NO_MEMORY; ptls_get_context (tls)->random_bytes (self->id, sizeof (self->id)); - memcpy (self->data.base, src.base, src.len); + clib_memcpy (self->data.base, src.base, src.len); self->data.len = src.len; /* store the session id in buffer */ if ((ret = ptls_buffer_reserve (dst, sizeof (self->id))) != 0) return ret; - memcpy (dst->base + dst->off, self->id, sizeof (self->id)); + clib_memcpy (dst->base + dst->off, self->id, sizeof (self->id)); dst->off += sizeof (self->id); } @@ -844,26 +841,19 @@ quic_encrypt_ticket_cb (ptls_encrypt_ticket_t * _self, ptls_t * tls, /* check if session id is the one stored in cache */ if (src.len != sizeof (self->id)) return PTLS_ERROR_SESSION_NOT_FOUND; - if (memcmp (self->id, src.base, sizeof (self->id)) != 0) + if (clib_memcmp (self->id, src.base, sizeof (self->id)) != 0) return PTLS_ERROR_SESSION_NOT_FOUND; /* return the cached value */ if ((ret = ptls_buffer_reserve (dst, self->data.len)) != 0) return ret; - memcpy (dst->base + dst->off, self->data.base, self->data.len); + clib_memcpy (dst->base + dst->off, self->data.base, self->data.len); dst->off += self->data.len; } return 0; } -typedef struct quicly_ctx_data_ -{ - quicly_context_t quicly_ctx; - char cid_key[17]; - ptls_context_t ptls_ctx; -} quicly_ctx_data_t; - static void quic_store_quicly_ctx (application_t * app, u8 is_client) { @@ -896,7 +886,7 @@ quic_store_quicly_ctx (application_t * app, u8 is_client) ptls_ctx->encrypt_ticket = &qm->session_cache.super; app->quicly_ctx = (u64 *) quicly_ctx; - memcpy (quicly_ctx, &quicly_spec_context, sizeof (quicly_context_t)); + clib_memcpy (quicly_ctx, &quicly_spec_context, sizeof (quicly_context_t)); quicly_ctx->max_packet_size = QUIC_MAX_PACKET_SIZE; quicly_ctx->tls = ptls_ctx; @@ -905,23 +895,20 @@ quic_store_quicly_ctx (application_t * app, u8 is_client) quicly_ctx->now = &quicly_vpp_now_cb; quicly_amend_ptls_context (quicly_ctx->tls); - quicly_ctx->event_log.mask = 0; /* logs */ - quicly_ctx->event_log.cb = quicly_new_default_event_logger (stderr); - quicly_ctx->transport_params.max_data = QUIC_INT_MAX; quicly_ctx->transport_params.max_streams_uni = (uint64_t) 1 << 60; quicly_ctx->transport_params.max_streams_bidi = (uint64_t) 1 << 60; - quicly_ctx->transport_params.max_stream_data.bidi_local = (QUIC_FIFO_SIZE - 1); /* max_enq is SIZE - 1 */ - quicly_ctx->transport_params.max_stream_data.bidi_remote = (QUIC_FIFO_SIZE - 1); /* max_enq is SIZE - 1 */ + quicly_ctx->transport_params.max_stream_data.bidi_local = (qm->udp_fifo_size - 1); /* max_enq is SIZE - 1 */ + quicly_ctx->transport_params.max_stream_data.bidi_remote = (qm->udp_fifo_size - 1); /* max_enq is SIZE - 1 */ quicly_ctx->transport_params.max_stream_data.uni = QUIC_INT_MAX; quicly_ctx->tls->random_bytes (quicly_ctx_data->cid_key, 16); quicly_ctx_data->cid_key[16] = 0; - key_vec = - ptls_iovec_init (quicly_ctx_data->cid_key, - strlen (quicly_ctx_data->cid_key)); + key_vec = ptls_iovec_init (quicly_ctx_data->cid_key, + strlen (quicly_ctx_data->cid_key)); quicly_ctx->cid_encryptor = quicly_new_default_cid_encryptor (&ptls_openssl_bfecb, + &ptls_openssl_aes128ecb, &ptls_openssl_sha256, key_vec); if (is_client) return; @@ -939,14 +926,10 @@ quic_store_quicly_ctx (application_t * app, u8 is_client) } } -/***************************************************************************** - * - * BEGIN TRANSPORT PROTO FUNCTIONS - * - *****************************************************************************/ +/* Transport proto functions */ static int -quic_connect_new_stream (session_t * quic_session, u32 opaque) +quic_connect_stream (session_t * quic_session, u32 opaque) { uint64_t quic_session_handle; session_t *stream_session; @@ -978,8 +961,8 @@ quic_connect_new_stream (session_t * quic_session, u32 opaque) sctx_index = quic_ctx_alloc (quic_session->thread_index); /* Allocate before we get pointers */ sctx = quic_ctx_get (sctx_index, quic_session->thread_index); - qctx = - quic_ctx_get (quic_session->connection_index, quic_session->thread_index); + qctx = quic_ctx_get (quic_session->connection_index, + quic_session->thread_index); if (quic_ctx_is_stream (qctx)) { QUIC_DBG (1, "session is a stream"); @@ -1049,9 +1032,9 @@ quic_connect_new_stream (session_t * quic_session, u32 opaque) } static int -quic_connect_new_connection (session_endpoint_cfg_t * sep) +quic_connect_connection (session_endpoint_cfg_t * sep) { - vnet_connect_args_t _cargs = { {}, }, *cargs = &_cargs; + vnet_connect_args_t _cargs, *cargs = &_cargs; quic_main_t *qm = &quic_main; quic_ctx_t *ctx; app_worker_t *app_wrk; @@ -1059,6 +1042,7 @@ quic_connect_new_connection (session_endpoint_cfg_t * sep) u32 ctx_index; int error; + clib_memset (cargs, 0, sizeof (*cargs)); ctx_index = quic_ctx_alloc (vlib_get_thread_index ()); ctx = quic_ctx_get (ctx_index, vlib_get_thread_index ()); ctx->parent_app_wrk_id = sep->app_wrk_index; @@ -1070,16 +1054,12 @@ quic_connect_new_connection (session_endpoint_cfg_t * sep) ctx->client_opaque = sep->opaque; ctx->c_flags |= TRANSPORT_CONNECTION_F_NO_LOOKUP; if (sep->hostname) - { - ctx->srv_hostname = format (0, "%v", sep->hostname); - vec_terminate_c_string (ctx->srv_hostname); - } + ctx->srv_hostname = format (0, "%v", sep->hostname); else - { - /* needed by quic for crypto + determining client / server */ - ctx->srv_hostname = - format (0, "%U", format_ip46_address, &sep->ip, sep->is_ip4); - } + /* needed by quic for crypto + determining client / server */ + ctx->srv_hostname = format (0, "%U", format_ip46_address, + &sep->ip, sep->is_ip4); + vec_terminate_c_string (ctx->srv_hostname); clib_memcpy (&cargs->sep, sep, sizeof (session_endpoint_cfg_t)); cargs->sep.transport_proto = TRANSPORT_PROTO_UDPC; @@ -1092,6 +1072,9 @@ quic_connect_new_connection (session_endpoint_cfg_t * sep) cargs->sep_ext.ns_index = app->ns_index; quic_store_quicly_ctx (app, 1 /* is client */ ); + /* Also store it in ctx for convenience + * Waiting for crypto_ctx logic */ + ctx->quicly_ctx = (quicly_context_t *) app->quicly_ctx; if ((error = vnet_connect (cargs))) return error; @@ -1109,9 +1092,9 @@ quic_connect (transport_endpoint_cfg_t * tep) quic_session = session_get_from_handle_if_valid (sep->parent_handle); if (quic_session) - return quic_connect_new_stream (quic_session, sep->opaque); + return quic_connect_stream (quic_session, sep->opaque); else - return quic_connect_new_connection (sep); + return quic_connect_connection (sep); } static void @@ -1121,8 +1104,8 @@ quic_proto_on_close (u32 ctx_index, u32 thread_index) if (!ctx) return; #if QUIC_DEBUG >= 2 - session_t *stream_session = - session_get (ctx->c_s_index, ctx->c_thread_index); + session_t *stream_session = session_get (ctx->c_s_index, + ctx->c_thread_index); clib_warning ("Closing session 0x%lx", session_handle (stream_session)); #endif if (quic_ctx_is_stream (ctx)) @@ -1183,7 +1166,7 @@ quic_start_listen (u32 quic_listen_session_index, transport_endpoint_t * tep) quic_store_quicly_ctx (app, 0 /* is_client */ ); sep->transport_proto = TRANSPORT_PROTO_UDPC; - memset (args, 0, sizeof (*args)); + clib_memset (args, 0, sizeof (*args)); args->app_index = qm->app_index; args->sep_ext = *sep; args->sep_ext.ns_index = app->ns_index; @@ -1198,6 +1181,9 @@ quic_start_listen (u32 quic_listen_session_index, transport_endpoint_t * tep) lctx = quic_ctx_get (lctx_index, 0); lctx->flags |= QUIC_F_IS_LISTENER; + /* Also store it in ctx for convenience + * Waiting for crypto_ctx logic */ + lctx->quicly_ctx = (quicly_context_t *) app->quicly_ctx; clib_memcpy (&lctx->c_rmt_ip, &args->sep.peer.ip, sizeof (ip46_address_t)); clib_memcpy (&lctx->c_lcl_ip, &args->sep.ip, sizeof (ip46_address_t)); @@ -1303,8 +1289,8 @@ format_quic_half_open (u8 * s, va_list * args) u32 qc_index = va_arg (*args, u32); u32 thread_index = va_arg (*args, u32); quic_ctx_t *ctx = quic_ctx_get (qc_index, thread_index); - s = - format (s, "[#%d][Q] half-open app %u", thread_index, ctx->parent_app_id); + s = format (s, "[#%d][Q] half-open app %u", thread_index, + ctx->parent_app_id); return s; } @@ -1320,12 +1306,7 @@ format_quic_listener (u8 * s, va_list * args) return s; } -/***************************************************************************** - * END TRANSPORT PROTO FUNCTIONS - * - * START SESSION CALLBACKS - * Called from UDP layer - *****************************************************************************/ +/* Session layer callbacks */ static inline void quic_build_sockaddr (struct sockaddr *sa, socklen_t * salen, @@ -1350,7 +1331,7 @@ quic_build_sockaddr (struct sockaddr *sa, socklen_t * salen, } static int -quic_on_client_connected (quic_ctx_t * ctx) +quic_on_quic_session_connected (quic_ctx_t * ctx) { session_t *quic_session; app_worker_t *app_wrk; @@ -1362,7 +1343,7 @@ quic_on_client_connected (quic_ctx_t * ctx) if (!app_wrk) { quic_disconnect_transport (ctx); - return -1; + return 0; } quic_session = session_alloc (thread_index); @@ -1393,11 +1374,34 @@ quic_on_client_connected (quic_ctx_t * ctx) /* If the app opens a stream in its callback it may invalidate ctx */ ctx = quic_ctx_get (ctx_id, thread_index); + /* + * app_worker_connect_notify() might have reallocated pool, reload + * quic_session pointer + */ + quic_session = session_get (ctx->c_s_index, thread_index); quic_session->session_state = SESSION_STATE_LISTENING; return 0; } +static int +quic_check_quic_session_connected (quic_ctx_t * ctx) +{ + /* Called when we need to trigger quic session connected + * we may call this function on the server side / at + * stream opening */ + + /* Conn may be set to null if the connection is terminated */ + if (!ctx->conn || ctx->conn_state != QUIC_CONN_STATE_HANDSHAKE) + return 0; + if (!quicly_connection_is_ready (ctx->conn)) + return 0; + ctx->conn_state = QUIC_CONN_STATE_READY; + if (!quicly_is_client (ctx->conn)) + return 0; + return quic_on_quic_session_connected (ctx); +} + static void quic_receive_connection (void *arg) { @@ -1415,7 +1419,7 @@ quic_receive_connection (void *arg) new_ctx_id); - memcpy (new_ctx, temp_ctx, sizeof (quic_ctx_t)); + clib_memcpy (new_ctx, temp_ctx, sizeof (quic_ctx_t)); clib_mem_free (temp_ctx); new_ctx->c_thread_index = thread_index; @@ -1432,10 +1436,10 @@ quic_receive_connection (void *arg) /* Trigger write on this connection if necessary */ udp_session = session_get_from_handle (new_ctx->udp_session_handle); + udp_session->opaque = new_ctx_id; + udp_session->flags &= ~SESSION_F_IS_MIGRATING; if (svm_fifo_max_dequeue (udp_session->tx_fifo)) - if (session_send_io_evt_to_thread (udp_session->tx_fifo, - SESSION_IO_EVT_TX)) - QUIC_DBG (4, "Cannot send TX event"); + quic_set_udp_tx_evt (udp_session); } static void @@ -1451,7 +1455,7 @@ quic_transfer_connection (u32 ctx_index, u32 dest_thread) ASSERT (temp_ctx); ctx = quic_ctx_get (ctx_index, thread_index); - memcpy (temp_ctx, ctx, sizeof (quic_ctx_t)); + clib_memcpy (temp_ctx, ctx, sizeof (quic_ctx_t)); /* Remove from timer wheel and thread-local pool */ if (ctx->timer_handle != QUIC_TIMER_HANDLE_INVALID) @@ -1467,8 +1471,8 @@ quic_transfer_connection (u32 ctx_index, u32 dest_thread) } static int -quic_session_connected_callback (u32 quic_app_index, u32 ctx_index, - session_t * udp_session, u8 is_fail) +quic_udp_session_connected_callback (u32 quic_app_index, u32 ctx_index, + session_t * udp_session, u8 is_fail) { QUIC_DBG (2, "QSession is now connected (id %u)", udp_session->session_index); @@ -1507,7 +1511,7 @@ quic_session_connected_callback (u32 quic_app_index, u32 ctx_index, is_fail, thread_index, (ctx) ? ctx_index : ~0); ctx->udp_session_handle = session_handle (udp_session); - udp_session->opaque = ctx->parent_app_id; + udp_session->opaque = ctx_index; /* Init QUIC lib connection * Generate required sockaddr & salen */ @@ -1516,7 +1520,8 @@ quic_session_connected_callback (u32 quic_app_index, u32 ctx_index, quicly_ctx = quic_get_quicly_ctx_from_ctx (ctx); ret = quicly_connect (&ctx->conn, quicly_ctx, (char *) ctx->srv_hostname, - sa, salen, &quic_main.next_cid, + sa, NULL, &quic_main.next_cid, ptls_iovec_init (NULL, + 0), &quic_main.hs_properties, NULL); ++quic_main.next_cid.master_id; /* Save context handle in quicly connection */ @@ -1540,49 +1545,37 @@ quic_session_connected_callback (u32 quic_app_index, u32 ctx_index, } static void -quic_session_disconnect_callback (session_t * s) +quic_udp_session_disconnect_callback (session_t * s) { clib_warning ("UDP session disconnected???"); } static void -quic_session_reset_callback (session_t * s) +quic_udp_session_reset_callback (session_t * s) { clib_warning ("UDP session reset???"); } static void -quic_session_migrate_callback (session_t * s, session_handle_t new_sh) +quic_udp_session_migrate_callback (session_t * s, session_handle_t new_sh) { - /* - * TODO we need better way to get the connection from the session - * This will become possible once we stop storing the app id in the UDP - * session opaque - */ - u32 thread_index = vlib_get_thread_index (); - u64 old_session_handle = session_handle (s); u32 new_thread = session_thread_from_handle (new_sh); quic_ctx_t *ctx; QUIC_DBG (1, "Session %x migrated to %lx", s->session_index, new_sh); - /* *INDENT-OFF* */ - pool_foreach (ctx, quic_main.ctx_pool[thread_index], - ({ - if (ctx->udp_session_handle == old_session_handle) - { - /* Right ctx found, move associated conn */ - QUIC_DBG (5, "Found right ctx: %x", ctx->c_c_index); - ctx->udp_session_handle = new_sh; - quic_transfer_connection (ctx->c_c_index, new_thread); - return; - } - })); - /* *INDENT-ON* */ - QUIC_DBG (0, "BUG: Connection to migrate not found"); + ASSERT (vlib_get_thread_index () == s->thread_index); + ctx = quic_ctx_get (s->opaque, s->thread_index); + ASSERT (ctx->udp_session_handle == session_handle (s)); + + ctx->udp_session_handle = new_sh; +#if QUIC_DEBUG >= 1 + s->opaque = 0xfeedface; +#endif + quic_transfer_connection (ctx->c_c_index, new_thread); } int -quic_session_accepted_callback (session_t * udp_session) +quic_udp_session_accepted_callback (session_t * udp_session) { /* New UDP connection, try to accept it */ u32 ctx_index; @@ -1611,7 +1604,11 @@ quic_session_accepted_callback (session_t * udp_session) ctx->conn_state = QUIC_CONN_STATE_OPENED; ctx->c_flags |= TRANSPORT_CONNECTION_F_NO_LOOKUP; - udp_session->opaque = ctx->parent_app_id; + /* Also store it in ctx for convenience + * Waiting for crypto_ctx logic */ + ctx->quicly_ctx = lctx->quicly_ctx; + + udp_session->opaque = ctx_index; /* Put this ctx in the "opening" pool */ pool_get (quic_main.wrk_ctx[ctx->c_thread_index].opening_ctx_pool, @@ -1625,8 +1622,6 @@ quic_session_accepted_callback (session_t * udp_session) static int quic_add_segment_callback (u32 client_index, u64 seg_handle) { - QUIC_DBG (2, "Called quic_add_segment_callback"); - QUIC_DBG (2, "NOT IMPLEMENTED"); /* No-op for builtin */ return 0; } @@ -1634,8 +1629,6 @@ quic_add_segment_callback (u32 client_index, u64 seg_handle) static int quic_del_segment_callback (u32 client_index, u64 seg_handle) { - QUIC_DBG (2, "Called quic_del_segment_callback"); - QUIC_DBG (2, "NOT IMPLEMENTED"); /* No-op for builtin */ return 0; } @@ -1667,9 +1660,8 @@ quic_custom_tx_callback (void *s, u32 max_burst_size) if (PREDICT_FALSE (stream_session->session_state >= SESSION_STATE_TRANSPORT_CLOSING)) return 0; - ctx = - quic_ctx_get (stream_session->connection_index, - stream_session->thread_index); + ctx = quic_ctx_get (stream_session->connection_index, + stream_session->thread_index); if (PREDICT_FALSE (!quic_ctx_is_stream (ctx))) { goto tx_end; /* Most probably a reschedule */ @@ -1733,7 +1725,7 @@ quic_find_packet_ctx (u32 * ctx_thread, u32 * ctx_index, } ctx_ = quic_ctx_get (index, vlib_get_thread_index ()); conn_ = ctx_->conn; - if (conn_ && quicly_is_destination (conn_, sa, salen, packet)) + if (conn_ && quicly_is_destination (conn_, NULL, sa, packet)) { QUIC_DBG (3, "Connection found"); *ctx_index = index; @@ -1746,13 +1738,40 @@ quic_find_packet_ctx (u32 * ctx_thread, u32 * ctx_index, } static int -quic_create_quic_session (quic_ctx_t * ctx) +quic_accept_connection (u32 ctx_index, struct sockaddr *sa, + socklen_t salen, quicly_decoded_packet_t packet) { + u32 thread_index = vlib_get_thread_index (); + quicly_context_t *quicly_ctx; session_t *quic_session; + clib_bihash_kv_16_8_t kv; app_worker_t *app_wrk; + quicly_conn_t *conn; + quic_ctx_t *ctx; quic_ctx_t *lctx; int rv; + /* new connection, accept and create context if packet is valid + * TODO: check if socket is actually listening? */ + ctx = quic_ctx_get (ctx_index, thread_index); + quicly_ctx = quic_get_quicly_ctx_from_ctx (ctx); + if ((rv = quicly_accept (&conn, quicly_ctx, NULL, sa, + &packet, NULL, &quic_main.next_cid, NULL))) + { + /* Invalid packet, pass */ + assert (conn == NULL); + QUIC_DBG (1, "Accept failed with %d", rv); + /* TODO: cleanup created quic ctx and UDP session */ + return 0; + } + assert (conn != NULL); + + ++quic_main.next_cid.master_id; + /* Save ctx handle in quicly connection */ + quic_store_conn_ctx (conn, ctx); + ctx->conn = conn; + ctx->conn_state = QUIC_CONN_STATE_HANDSHAKE; + quic_session = session_alloc (ctx->c_thread_index); QUIC_DBG (2, "Allocated quic_session, 0x%lx ctx %u", session_handle (quic_session), ctx->c_c_index); @@ -1781,43 +1800,6 @@ quic_create_quic_session (quic_ctx_t * ctx) QUIC_DBG (1, "failed to notify accept worker app"); return rv; } - return 0; -} - -static int -quic_create_connection (u32 ctx_index, struct sockaddr *sa, - socklen_t salen, quicly_decoded_packet_t packet) -{ - clib_bihash_kv_16_8_t kv; - quic_ctx_t *ctx; - quicly_conn_t *conn; - u32 thread_index = vlib_get_thread_index (); - quicly_context_t *quicly_ctx; - int rv; - - /* new connection, accept and create context if packet is valid - * TODO: check if socket is actually listening? */ - ctx = quic_ctx_get (ctx_index, thread_index); - quicly_ctx = quic_get_quicly_ctx_from_ctx (ctx); - if ((rv = quicly_accept (&conn, quicly_ctx, sa, salen, - &packet, ptls_iovec_init (NULL, 0), - &quic_main.next_cid, NULL))) - { - /* Invalid packet, pass */ - assert (conn == NULL); - QUIC_DBG (1, "Accept failed with %d", rv); - /* TODO: cleanup created quic ctx and UDP session */ - return 0; - } - assert (conn != NULL); - - ++quic_main.next_cid.master_id; - /* Save ctx handle in quicly connection */ - quic_store_conn_ctx (conn, ctx); - ctx->conn = conn; - ctx->conn_state = QUIC_CONN_STATE_HANDSHAKE; - - quic_create_quic_session (ctx); /* Register connection in connections map */ quic_make_connection_key (&kv, quicly_get_master_id (conn)); @@ -1847,49 +1829,18 @@ quic_reset_connection (u64 udp_session_handle, || packet.cid.dest.plaintext.thread_id != 0) return 0; quicly_ctx = quic_get_quicly_ctx_from_udp (udp_session_handle); - dgram = quicly_send_stateless_reset (quicly_ctx, sa, salen, + dgram = quicly_send_stateless_reset (quicly_ctx, sa, NULL, &packet.cid.dest.plaintext); if (dgram == NULL) return 1; udp_session = session_get_from_handle (udp_session_handle); rv = quic_send_datagram (udp_session, dgram); - if (svm_fifo_set_event (udp_session->tx_fifo)) - session_send_io_evt_to_thread (udp_session->tx_fifo, SESSION_IO_EVT_TX); + quic_set_udp_tx_evt (udp_session); return rv; } -typedef struct quic_rx_packet_ctx_ -{ - quicly_decoded_packet_t packet; - u8 data[QUIC_MAX_PACKET_SIZE]; - u32 ctx_index; - u32 thread_index; -} quic_rx_packet_ctx_t; - -static void -check_quic_client_connected (struct quic_rx_packet_ctx_ *quic_rx_ctx) -{ - /* ctx pointer may change if a new stream is opened */ - quic_ctx_t *ctx = quic_ctx_get (quic_rx_ctx->ctx_index, - quic_rx_ctx->thread_index); - /* Conn may be set to null if the connection is terminated */ - if (ctx->conn && ctx->conn_state == QUIC_CONN_STATE_HANDSHAKE) - { - if (quicly_connection_is_ready (ctx->conn)) - { - ctx->conn_state = QUIC_CONN_STATE_READY; - if (quicly_is_client (ctx->conn)) - { - quic_on_client_connected (ctx); - } - } - } - -} - static int -quic_process_one_rx_packet (u64 udp_session_handle, - quicly_context_t * quicly_ctx, svm_fifo_t * f, +quic_process_one_rx_packet (u64 udp_session_handle, svm_fifo_t * f, u32 * fifo_offset, u32 * max_packet, u32 packet_n, quic_rx_packet_ctx_t * packet_ctx) { @@ -1906,6 +1857,7 @@ quic_process_one_rx_packet (u64 udp_session_handle, u32 thread_index = vlib_get_thread_index (); u32 *opening_ctx_pool, *ctx_index_ptr; u32 cur_deq = svm_fifo_max_dequeue (f) - *fifo_offset; + quicly_context_t *quicly_ctx; if (cur_deq == 0) { @@ -1934,21 +1886,20 @@ quic_process_one_rx_packet (u64 udp_session_handle, /* Quicly can read len bytes from the fifo at offset: * ph.data_offset + SESSION_CONN_HDR_LEN */ - ret = - svm_fifo_peek (f, SESSION_CONN_HDR_LEN + *fifo_offset, ph.data_length, - packet_ctx->data); + ret = svm_fifo_peek (f, SESSION_CONN_HDR_LEN + *fifo_offset, + ph.data_length, packet_ctx->data); if (ret != ph.data_length) { QUIC_DBG (1, "Not enough data peeked in RX"); return 1; } + quic_increment_counter (QUIC_ERROR_RX_PACKETS, 1); rv = 0; quic_build_sockaddr (sa, &salen, &ph.rmt_ip, ph.rmt_port, ph.is_ip4); quicly_ctx = quic_get_quicly_ctx_from_udp (udp_session_handle); - plen = - quicly_decode_packet (quicly_ctx, &packet_ctx->packet, packet_ctx->data, - ph.data_length); + plen = quicly_decode_packet (quicly_ctx, &packet_ctx->packet, + packet_ctx->data, ph.data_length); if (plen == SIZE_MAX) { @@ -1956,13 +1907,13 @@ quic_process_one_rx_packet (u64 udp_session_handle, return 1; } - err = - quic_find_packet_ctx (&packet_ctx->thread_index, &packet_ctx->ctx_index, - sa, salen, &packet_ctx->packet, thread_index); + err = quic_find_packet_ctx (&packet_ctx->thread_index, + &packet_ctx->ctx_index, sa, salen, + &packet_ctx->packet, thread_index); if (err == 0) { ctx = quic_ctx_get (packet_ctx->ctx_index, thread_index); - rv = quicly_receive (ctx->conn, &packet_ctx->packet); + rv = quicly_receive (ctx->conn, NULL, sa, &packet_ctx->packet); if (rv) QUIC_DBG (1, "quicly_receive return error %d", rv); } @@ -1978,22 +1929,22 @@ quic_process_one_rx_packet (u64 udp_session_handle, /* Try to find matching "opening" ctx */ opening_ctx_pool = quic_main.wrk_ctx[thread_index].opening_ctx_pool; - /* *INDENT-OFF* */ - pool_foreach (ctx_index_ptr, opening_ctx_pool, - ({ - ctx = quic_ctx_get (*ctx_index_ptr, thread_index); - if (ctx->udp_session_handle == udp_session_handle) - { - /* Right ctx found, create conn & remove from pool */ - quic_create_connection(*ctx_index_ptr, sa, salen, packet_ctx->packet); - pool_put (opening_ctx_pool, ctx_index_ptr); - *max_packet = packet_n + 1; - packet_ctx->thread_index = thread_index; - packet_ctx->ctx_index = *ctx_index_ptr; - goto updateOffset; - } - })); - /* *INDENT-ON* */ + /* *INDENT-OFF* */ + pool_foreach (ctx_index_ptr, opening_ctx_pool, + ({ + ctx = quic_ctx_get (*ctx_index_ptr, thread_index); + if (ctx->udp_session_handle == udp_session_handle) + { + /* Right ctx found, create conn & remove from pool */ + quic_accept_connection (*ctx_index_ptr, sa, salen, packet_ctx->packet); + *max_packet = packet_n + 1; + packet_ctx->thread_index = thread_index; + packet_ctx->ctx_index = *ctx_index_ptr; + pool_put (opening_ctx_pool, ctx_index_ptr); + goto updateOffset; + } + })); + /* *INDENT-ON* */ } else { @@ -2007,61 +1958,51 @@ updateOffset: } static int -quic_app_rx_callback (session_t * udp_session) +quic_udp_session_rx_callback (session_t * udp_session) { /* Read data from UDP rx_fifo and pass it to the quicly conn. */ - application_t *app; quic_ctx_t *ctx = NULL; svm_fifo_t *f; u32 max_deq; - u32 app_index = udp_session->opaque; u64 udp_session_handle = session_handle (udp_session); int rv = 0; - app = application_get_if_valid (app_index); u32 thread_index = vlib_get_thread_index (); quic_rx_packet_ctx_t packets_ctx[16]; + u32 i, fifo_offset, max_packets; - if (!app) + if (udp_session->flags & SESSION_F_IS_MIGRATING) { - QUIC_DBG (1, "Got RX on detached app"); - /* TODO: close this session, cleanup state? */ - return 1; + QUIC_DBG (3, "RX on migrating udp session"); + return 0; } - do + while (1) { udp_session = session_get_from_handle (udp_session_handle); /* session alloc might have happened */ f = udp_session->rx_fifo; max_deq = svm_fifo_max_dequeue (f); if (max_deq == 0) - { - return 0; - } + return 0; - u32 fifo_offset = 0; - u32 max_packets = 16; - for (int i = 0; i < max_packets; i++) - { - quic_process_one_rx_packet (udp_session_handle, - (quicly_context_t *) app->quicly_ctx, f, - &fifo_offset, &max_packets, i, - &packets_ctx[i]); - } + fifo_offset = 0; + max_packets = 16; + for (i = 0; i < max_packets; i++) + quic_process_one_rx_packet (udp_session_handle, f, &fifo_offset, + &max_packets, i, &packets_ctx[i]); - for (int i = 0; i < max_packets; i++) + for (i = 0; i < max_packets; i++) { if (packets_ctx[i].thread_index != thread_index) continue; - - ctx = - quic_ctx_get (packets_ctx[i].ctx_index, - packets_ctx[i].thread_index); - check_quic_client_connected (&packets_ctx[i]); + ctx = quic_ctx_get (packets_ctx[i].ctx_index, + packets_ctx[i].thread_index); + quic_check_quic_session_connected (ctx); + ctx = quic_ctx_get (packets_ctx[i].ctx_index, + packets_ctx[i].thread_index); quic_send_packets (ctx); } svm_fifo_dequeue_drop (f, fifo_offset); } - while (1); return rv; } @@ -2103,20 +2044,16 @@ quic_get_transport_endpoint (u32 ctx_index, u32 thread_index, quic_common_get_transport_endpoint (ctx, tep, is_lcl); } -/***************************************************************************** - * END TRANSPORT PROTO FUNCTIONS -*****************************************************************************/ - /* *INDENT-OFF* */ static session_cb_vft_t quic_app_cb_vft = { - .session_accept_callback = quic_session_accepted_callback, - .session_disconnect_callback = quic_session_disconnect_callback, - .session_connected_callback = quic_session_connected_callback, - .session_reset_callback = quic_session_reset_callback, - .session_migrate_callback = quic_session_migrate_callback, + .session_accept_callback = quic_udp_session_accepted_callback, + .session_disconnect_callback = quic_udp_session_disconnect_callback, + .session_connected_callback = quic_udp_session_connected_callback, + .session_reset_callback = quic_udp_session_reset_callback, + .session_migrate_callback = quic_udp_session_migrate_callback, .add_segment_callback = quic_add_segment_callback, .del_segment_callback = quic_del_segment_callback, - .builtin_app_rx_callback = quic_app_rx_callback, + .builtin_app_rx_callback = quic_udp_session_rx_callback, }; static const transport_proto_vft_t quic_proto = { @@ -2142,7 +2079,7 @@ static const transport_proto_vft_t quic_proto = { /* *INDENT-ON* */ static void -quic_register_cipher_suite (quic_crypto_engine_t type, +quic_register_cipher_suite (tls_engine_type_t type, ptls_cipher_suite_t ** ciphers) { quic_main_t *qm = &quic_main; @@ -2150,6 +2087,24 @@ quic_register_cipher_suite (quic_crypto_engine_t type, qm->quic_ciphers[type] = ciphers; } +static void +quic_update_fifo_size () +{ + quic_main_t *qm = &quic_main; + segment_manager_props_t *seg_mgr_props = + application_get_segment_manager_properties (qm->app_index); + + if (!seg_mgr_props) + { + clib_warning + ("error while getting segment_manager_props_t, can't update fifo-size"); + return; + } + + seg_mgr_props->tx_fifo_size = qm->udp_fifo_size; + seg_mgr_props->rx_fifo_size = qm->udp_fifo_size; +} + static clib_error_t * quic_init (vlib_main_t * vm) { @@ -2159,13 +2114,12 @@ quic_init (vlib_main_t * vm) vnet_app_attach_args_t _a, *a = &_a; u64 options[APP_OPTIONS_N_OPTIONS]; quic_main_t *qm = &quic_main; - u32 fifo_size = QUIC_FIFO_SIZE; u32 num_threads, i; num_threads = 1 /* main thread */ + vtm->n_threads; - memset (a, 0, sizeof (*a)); - memset (options, 0, sizeof (options)); + clib_memset (a, 0, sizeof (*a)); + clib_memset (options, 0, sizeof (options)); a->session_cb_vft = &quic_app_cb_vft; a->api_client_index = APP_INVALID_INDEX; @@ -2173,8 +2127,9 @@ quic_init (vlib_main_t * vm) a->name = format (0, "quic"); a->options[APP_OPTIONS_SEGMENT_SIZE] = segment_size; a->options[APP_OPTIONS_ADD_SEGMENT_SIZE] = segment_size; - a->options[APP_OPTIONS_RX_FIFO_SIZE] = fifo_size; - a->options[APP_OPTIONS_TX_FIFO_SIZE] = fifo_size; + a->options[APP_OPTIONS_RX_FIFO_SIZE] = qm->udp_fifo_size; + a->options[APP_OPTIONS_TX_FIFO_SIZE] = qm->udp_fifo_size; + a->options[APP_OPTIONS_PREALLOC_FIFO_PAIRS] = qm->udp_fifo_prealloc; a->options[APP_OPTIONS_FLAGS] = APP_OPTIONS_FLAGS_IS_BUILTIN; a->options[APP_OPTIONS_FLAGS] |= APP_OPTIONS_FLAGS_USE_GLOBAL_SCOPE; a->options[APP_OPTIONS_FLAGS] |= APP_OPTIONS_FLAGS_IS_TRANSPORT_APP; @@ -2210,7 +2165,7 @@ quic_init (vlib_main_t * vm) transport_register_protocol (TRANSPORT_PROTO_QUIC, &quic_proto, FIB_PROTOCOL_IP6, ~0); - quic_register_cipher_suite (CRYPTO_ENGINE_VPP, vpp_crypto_cipher_suites); + quic_register_cipher_suite (CRYPTO_ENGINE_VPP, quic_crypto_cipher_suites); quic_register_cipher_suite (CRYPTO_ENGINE_PICOTLS, ptls_openssl_cipher_suites); qm->default_cipher = CRYPTO_ENGINE_PICOTLS; @@ -2239,17 +2194,139 @@ quic_plugin_crypto_command_fn (vlib_main_t * vm, return 0; } +u64 quic_fifosize = 0; +static clib_error_t * +quic_plugin_set_fifo_size_command_fn (vlib_main_t * vm, + unformat_input_t * input, + vlib_cli_command_t * cmd) +{ + unformat_input_t _line_input, *line_input = &_line_input; + if (!unformat_user (input, unformat_line_input, line_input)) + return 0; + + while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) + { + if (unformat + (line_input, "%U", unformat_data_size, &quic_main.udp_fifo_size)) + quic_update_fifo_size (); + else + return clib_error_return (0, "unknown input '%U'", + format_unformat_error, line_input); + } + + return 0; +} + +static u8 * +quic_format_ctx_stat (u8 * s, va_list * args) +{ + quic_ctx_t *ctx = va_arg (*args, quic_ctx_t *); + quicly_stats_t quicly_stats; + + quicly_get_stats (ctx->conn, &quicly_stats); + + s = format (s, "\n\rQUIC conn stats \n\r"); + + s = + format (s, "RTT: min:%d, smoothed:%d, variance:%d, latest:%d \n\r", + quicly_stats.rtt.minimum, quicly_stats.rtt.smoothed, + quicly_stats.rtt.variance, quicly_stats.rtt.latest); + s = format (s, "Packet loss:%d \n\r", quicly_stats.num_packets.lost); + + return s; +} + +static clib_error_t * +quic_plugin_showstats_command_fn (vlib_main_t * vm, + unformat_input_t * input, + vlib_cli_command_t * cmd) +{ + quic_main_t *qm = &quic_main; + quic_ctx_t *ctx = NULL; + u32 num_workers = vlib_num_workers (); + + for (int i = 0; i < num_workers + 1; i++) + { + /* *INDENT-OFF* */ + pool_foreach (ctx, qm->ctx_pool[i], + ({ + if(!(ctx->flags & QUIC_F_IS_LISTENER) && !(ctx->flags & QUIC_F_IS_STREAM)) + vlib_cli_output (vm, "%U", quic_format_ctx_stat, ctx); + })); + /* *INDENT-ON* */ + } + return 0; +} + /* *INDENT-OFF* */ -VLIB_CLI_COMMAND(quic_plugin_crypto_command, static)= +VLIB_CLI_COMMAND (quic_plugin_crypto_command, static) = { .path = "quic set crypto api", .short_help = "quic set crypto api [picotls, vpp]", .function = quic_plugin_crypto_command_fn, }; +VLIB_CLI_COMMAND(quic_plugin_set_fifo_size_command, static)= +{ + .path = "quic set fifo-size", + .short_help = "quic set fifo-size N[Kb|Mb|GB] (default 64K)", + .function = quic_plugin_set_fifo_size_command_fn, +}; +VLIB_CLI_COMMAND(quic_plugin_stats_command, static)= +{ + .path = "show quic stats", + .short_help = "show quic stats", + .function = quic_plugin_showstats_command_fn, +}; VLIB_PLUGIN_REGISTER () = { .version = VPP_BUILD_VER, .description = "Quic transport protocol", + .default_disabled = 1, +}; +/* *INDENT-ON* */ + +static clib_error_t * +quic_config_fn (vlib_main_t * vm, unformat_input_t * input) +{ + quic_main.udp_fifo_size = QUIC_DEFAULT_FIFO_SIZE; + quic_main.udp_fifo_prealloc = 0; + + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat + (input, "fifo-size %U", unformat_data_size, + &quic_main.udp_fifo_size)) + ; + else + if (unformat + (input, "fifo-prealloc %u", &quic_main.udp_fifo_prealloc)) + ; + else + return clib_error_return (0, "unknown input '%U'", + format_unformat_error, input); + } + + return 0; +} + +VLIB_EARLY_CONFIG_FUNCTION (quic_config_fn, "quic"); + +static uword +quic_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node, + vlib_frame_t * frame) +{ + return 0; +} + +/* *INDENT-OFF* */ +VLIB_REGISTER_NODE (quic_input_node) = +{ + .function = quic_node_fn, + .name = "quic-input", + .vector_size = sizeof (u32), + .type = VLIB_NODE_TYPE_INTERNAL, + .n_errors = ARRAY_LEN (quic_error_strings), + .error_strings = quic_error_strings, }; /* *INDENT-ON* */