diff options
Diffstat (limited to 'src/plugins/quic/quic.c')
-rw-r--r-- | src/plugins/quic/quic.c | 88 |
1 files changed, 45 insertions, 43 deletions
diff --git a/src/plugins/quic/quic.c b/src/plugins/quic/quic.c index 499eb8bc776..60d4ac21c19 100644 --- a/src/plugins/quic/quic.c +++ b/src/plugins/quic/quic.c @@ -14,6 +14,9 @@ */ #include <sys/socket.h> +#include <sys/syscall.h> + +#include <openssl/rand.h> #include <vnet/session/application.h> #include <vnet/session/transport.h> @@ -103,7 +106,6 @@ quic_app_cert_key_pair_delete_callback (app_cert_key_pair_t * ckpair) for (i = 0; i < num_threads; i++) { - /* *INDENT-OFF* */ pool_foreach (crctx, qm->wrk_ctx[i].crypto_ctx_pool) { if (crctx->ckpair_index == ckpair->cert_key_index) { @@ -111,7 +113,6 @@ quic_app_cert_key_pair_delete_callback (app_cert_key_pair_t * ckpair) clib_bihash_add_del_24_8 (&qm->wrk_ctx[i].crypto_context_hash, &kv, 0 /* is_add */ ); } } - /* *INDENT-ON* */ } return 0; } @@ -151,11 +152,9 @@ quic_list_crypto_context_command_fn (vlib_main_t * vm, int i, num_threads = 1 /* main thread */ + vtm->n_threads; for (i = 0; i < num_threads; i++) { - /* *INDENT-OFF* */ pool_foreach (crctx, qm->wrk_ctx[i].crypto_ctx_pool) { vlib_cli_output (vm, "[%d][Q]%U", i, format_crypto_context, crctx); } - /* *INDENT-ON* */ } return 0; } @@ -388,7 +387,8 @@ quic_ctx_alloc (u32 thread_index) quic_main_t *qm = &quic_main; quic_ctx_t *ctx; - pool_get (qm->ctx_pool[thread_index], ctx); + pool_get_aligned_safe (qm->ctx_pool[thread_index], ctx, + CLIB_CACHE_LINE_BYTES); clib_memset (ctx, 0, sizeof (quic_ctx_t)); ctx->c_thread_index = thread_index; @@ -675,6 +675,7 @@ quic_send_datagram (session_t *udp_session, struct iovec *packet, hdr.is_ip4 = tc->is_ip4; clib_memcpy (&hdr.lcl_ip, &tc->lcl_ip, sizeof (ip46_address_t)); hdr.lcl_port = tc->lcl_port; + hdr.gso_size = 0; /* Read dest address from quicly-provided sockaddr */ if (hdr.is_ip4) @@ -782,12 +783,10 @@ 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_DBG (2, "DESTROYED_STREAM: session 0x%lx (%U)", session_handle (stream_session), quic_format_err, err); - stream_session->session_state = SESSION_STATE_CLOSED; + session_transport_closing_notify (&sctx->connection); session_transport_delete_notify (&sctx->connection); quic_increment_counter (QUIC_ERROR_CLOSED_STREAM, 1); @@ -830,12 +829,13 @@ quic_on_receive (quicly_stream_t * stream, size_t off, const void *src, size_t len) { QUIC_DBG (3, "received data: %lu bytes, offset %lu", len, off); - u32 max_enq, rlen, rv; + u32 max_enq; quic_ctx_t *sctx; session_t *stream_session; app_worker_t *app_wrk; svm_fifo_t *f; quic_stream_data_t *stream_data; + int rlen; if (!len) return; @@ -876,6 +876,14 @@ quic_on_receive (quicly_stream_t * stream, size_t off, const void *src, { /* Streams live on the same thread so (f, stream_data) should stay consistent */ rlen = svm_fifo_enqueue (f, len, (u8 *) src); + if (PREDICT_FALSE (rlen < 0)) + { + /* + * drop, fifo full + * drop, fifo grow + */ + return; + } QUIC_DBG (3, "Session [idx %u, app_wrk %u, ti %u, rx-fifo 0x%llx]: " "Enqueuing %u (rlen %u) at off %u in %u space, ", stream_session->session_index, @@ -886,10 +894,7 @@ quic_on_receive (quicly_stream_t * stream, size_t off, const void *src, app_wrk = app_worker_get_if_valid (stream_session->app_wrk_index); if (PREDICT_TRUE (app_wrk != 0)) { - rv = app_worker_lock_and_send_event (app_wrk, stream_session, - SESSION_IO_EVT_RX); - if (rv) - QUIC_ERR ("Failed to ping app for RX"); + app_worker_rx_notify (app_wrk, stream_session); } quic_ack_rx_data (stream_session); } @@ -898,6 +903,14 @@ quic_on_receive (quicly_stream_t * stream, size_t off, const void *src, rlen = svm_fifo_enqueue_with_offset (f, off - stream_data->app_rx_data_len, len, (u8 *) src); + if (PREDICT_FALSE (rlen < 0)) + { + /* + * drop, fifo full + * drop, fifo grow + */ + return; + } QUIC_ASSERT (rlen == 0); } return; @@ -1031,6 +1044,8 @@ quic_on_stream_open (quicly_stream_open_t * self, quicly_stream_t * stream) stream_session->session_type = session_type_from_proto_and_ip (TRANSPORT_PROTO_QUIC, qctx->udp_is_ip4); quic_session = session_get (qctx->c_s_index, qctx->c_thread_index); + /* Make sure quic session is in listening state */ + quic_session->session_state = SESSION_STATE_LISTENING; stream_session->listener_handle = listen_session_get_handle (quic_session); app_wrk = app_worker_get (stream_session->app_wrk_index); @@ -1044,6 +1059,7 @@ quic_on_stream_open (quicly_stream_open_t * self, quicly_stream_t * stream) SVM_FIFO_WANT_DEQ_NOTIF_IF_FULL | SVM_FIFO_WANT_DEQ_NOTIF_IF_EMPTY); + stream_session->session_state = SESSION_STATE_ACCEPTING; if ((rv = app_worker_accept_notify (app_wrk, stream_session))) { QUIC_ERR ("failed to notify accept worker app"); @@ -1139,9 +1155,8 @@ quic_update_timer (quic_ctx_t * ctx) quic_session = session_get (ctx->c_s_index, ctx->c_thread_index); if (svm_fifo_set_event (quic_session->tx_fifo)) { - rv = session_send_io_evt_to_thread_custom (quic_session, - quic_session->thread_index, - SESSION_IO_EVT_BUILTIN_TX); + rv = session_send_io_evt_to_thread_custom ( + quic_session, quic_session->thread_index, SESSION_IO_EVT_TX); if (PREDICT_FALSE (rv)) QUIC_ERR ("Failed to enqueue builtin_tx %d", rv); } @@ -1277,6 +1292,7 @@ quic_connect_stream (session_t * quic_session, session_endpoint_cfg_t * sep) stream_data->app_rx_data_len = 0; stream_data->app_tx_data_len = 0; stream_session->session_state = SESSION_STATE_READY; + stream_session->opaque = sep->opaque; /* For now we only reset streams. Cleanup will be triggered by timers */ if ((rv = app_worker_init_connected (app_wrk, stream_session))) @@ -1441,7 +1457,8 @@ quic_proto_on_close (u32 ctx_index, u32 thread_index) } static u32 -quic_start_listen (u32 quic_listen_session_index, transport_endpoint_t * tep) +quic_start_listen (u32 quic_listen_session_index, + transport_endpoint_cfg_t *tep) { vnet_listen_args_t _bargs, *args = &_bargs; transport_endpt_crypto_cfg_t *ccfg; @@ -1552,7 +1569,7 @@ format_quic_ctx (u8 * s, va_list * args) if (!ctx) return s; - str = format (str, "[#%d][Q] ", ctx->c_thread_index); + str = format (str, "[%d:%d][Q] ", ctx->c_thread_index, ctx->c_s_index); if (quic_ctx_is_listener (ctx)) str = format (str, "Listener, UDP %ld", ctx->udp_session_handle); @@ -1670,15 +1687,6 @@ quic_on_quic_session_connected (quic_ctx_t * ctx) quic_proto_on_close (ctx_id, thread_index); return; } - - /* 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; } static void @@ -2105,7 +2113,6 @@ quic_accept_connection (quic_rx_packet_ctx_t * pctx) 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); - quic_session->session_state = SESSION_STATE_LISTENING; ctx->c_s_index = quic_session->session_index; lctx = quic_ctx_get (ctx->listener_ctx_id, 0); @@ -2131,6 +2138,7 @@ quic_accept_connection (quic_rx_packet_ctx_t * pctx) } app_wrk = app_worker_get (quic_session->app_wrk_index); + quic_session->session_state = SESSION_STATE_ACCEPTING; if ((rv = app_worker_accept_notify (app_wrk, quic_session))) { QUIC_ERR ("failed to notify accept worker app"); @@ -2416,7 +2424,6 @@ quic_get_transport_endpoint (u32 ctx_index, u32 thread_index, quic_common_get_transport_endpoint (ctx, tep, is_lcl); } -/* *INDENT-OFF* */ static session_cb_vft_t quic_app_cb_vft = { .session_accept_callback = quic_udp_session_accepted_callback, .session_disconnect_callback = quic_udp_session_disconnect_callback, @@ -2452,7 +2459,6 @@ static const transport_proto_vft_t quic_proto = { .service_type = TRANSPORT_SERVICE_APP, }, }; -/* *INDENT-ON* */ static quicly_stream_open_t on_stream_open = { quic_on_stream_open }; static quicly_closed_by_remote_t on_closed_by_remote = { @@ -2498,6 +2504,11 @@ quic_init (vlib_main_t * vm) u64 options[APP_OPTIONS_N_OPTIONS]; quic_main_t *qm = &quic_main; u32 num_threads, i; + u8 seed[32]; + + if (syscall (SYS_getrandom, &seed, sizeof (seed), 0) != sizeof (seed)) + return clib_error_return_unix (0, "getrandom() failed"); + RAND_seed (seed, sizeof (seed)); num_threads = 1 /* main thread */ + vtm->n_threads; @@ -2550,6 +2561,7 @@ quic_init (vlib_main_t * vm) transport_register_protocol (TRANSPORT_PROTO_QUIC, &quic_proto, FIB_PROTOCOL_IP6, ~0); + quic_load_openssl3_legacy_provider (); clib_bitmap_alloc (qm->available_crypto_engines, app_crypto_engine_n_types ()); quic_register_cipher_suite (CRYPTO_ENGINE_PICOTLS, @@ -2656,7 +2668,6 @@ quic_get_counter_value (u32 event_code) u32 code, i; u64 c, sum = 0; - int index = 0; vm = vlib_get_main (); em = &vm->error_main; @@ -2671,7 +2682,6 @@ quic_get_counter_value (u32 event_code) if (i < vec_len (em->counters_last_clear)) c -= em->counters_last_clear[i]; sum += c; - index++; } return sum; } @@ -2688,7 +2698,6 @@ quic_show_aggregated_stats (vlib_main_t * vm) clib_memset (&agg_stats, 0, sizeof (agg_stats)); for (i = 0; i < num_workers + 1; i++) { - /* *INDENT-OFF* */ pool_foreach (ctx, qm->ctx_pool[i]) { if (quic_ctx_is_conn (ctx) && ctx->conn) @@ -2708,7 +2717,6 @@ quic_show_aggregated_stats (vlib_main_t * vm) else if (quic_ctx_is_stream (ctx)) nstream++; } - /* *INDENT-ON* */ } vlib_cli_output (vm, "-------- Connections --------"); vlib_cli_output (vm, "Current: %u", nconn); @@ -2883,7 +2891,6 @@ quic_show_connections_command_fn (vlib_main_t * vm, for (int i = 0; i < num_workers + 1; i++) { - /* *INDENT-OFF* */ pool_foreach (ctx, qm->ctx_pool[i]) { if (quic_ctx_is_stream (ctx) && show_stream) @@ -2893,7 +2900,6 @@ quic_show_connections_command_fn (vlib_main_t * vm, else if (quic_ctx_is_conn (ctx) && show_conn) vlib_cli_output (vm, "%U", quic_format_connection_ctx, ctx); } - /* *INDENT-ON* */ } done: @@ -2901,7 +2907,6 @@ done: return error; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (quic_plugin_crypto_command, static) = { .path = "quic set crypto api", .short_help = "quic set crypto api [picotls|vpp]", @@ -2942,7 +2947,6 @@ VLIB_PLUGIN_REGISTER () = .description = "Quic transport protocol", .default_disabled = 1, }; -/* *INDENT-ON* */ static clib_error_t * quic_config_fn (vlib_main_t * vm, unformat_input_t * input) @@ -2962,7 +2966,7 @@ quic_config_fn (vlib_main_t * vm, unformat_input_t * input) while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) { - if (unformat (input, "fifo-size %U", unformat_memory_size, &tmp)) + if (unformat (line_input, "fifo-size %U", unformat_memory_size, &tmp)) { if (tmp >= 0x100000000ULL) { @@ -2973,9 +2977,9 @@ quic_config_fn (vlib_main_t * vm, unformat_input_t * input) } qm->udp_fifo_size = tmp; } - else if (unformat (input, "conn-timeout %u", &i)) + else if (unformat (line_input, "conn-timeout %u", &i)) qm->connection_timeout = i; - else if (unformat (input, "fifo-prealloc %u", &i)) + else if (unformat (line_input, "fifo-prealloc %u", &i)) qm->udp_fifo_prealloc = i; else { @@ -2998,7 +3002,6 @@ quic_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node, return 0; } -/* *INDENT-OFF* */ VLIB_REGISTER_NODE (quic_input_node) = { .function = quic_node_fn, @@ -3008,7 +3011,6 @@ VLIB_REGISTER_NODE (quic_input_node) = .n_errors = ARRAY_LEN (quic_error_strings), .error_strings = quic_error_strings, }; -/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON |