X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fquic%2Fquic.c;h=8e29e74e9657e2542b939bd547da9d1ea99fc35b;hb=bec771b879c2eae31ecef61891405c1570aae2b1;hp=b77a1d37d8e9118b41c04b8cadc54fe2f5c68d68;hpb=3a34b1d9366551bbff7eabff3ab48ec8189249e2;p=vpp.git diff --git a/src/plugins/quic/quic.c b/src/plugins/quic/quic.c index b77a1d37d8e..8e29e74e965 100644 --- a/src/plugins/quic/quic.c +++ b/src/plugins/quic/quic.c @@ -26,43 +26,258 @@ #include -#include +#include #include #include static quic_main_t quic_main; - static void quic_update_timer (quic_ctx_t * ctx); -static void quic_connection_closed (u32 conn_index); -static void quic_disconnect (u32 ctx_index, u32 thread_index); -static int quic_connect_new_stream (session_endpoint_cfg_t * sep); -static int quic_connect_new_connection (session_endpoint_cfg_t * sep); - -static int64_t quic_get_time (quicly_now_cb * self); -static quicly_now_cb quicly_vpp_now_cb = { quic_get_time }; - -static void quic_transfer_connection (u32 ctx_index, u32 dest_thread); - -#define QUIC_TIMER_HANDLE_INVALID ((u32) ~0) -#define QUIC_SESSION_INVALID ((u32) ~0 - 1) -#define QUIC_MAX_PACKET_SIZE 1280 - -#define QUIC_INT_MAX 0x3FFFFFFFFFFFFFFF - -/* Taken from quicly.c */ -#define QUICLY_QUIC_BIT 0x40 - -#define QUICLY_PACKET_TYPE_INITIAL (QUICLY_LONG_HEADER_BIT | QUICLY_QUIC_BIT | 0) -#define QUICLY_PACKET_TYPE_0RTT (QUICLY_LONG_HEADER_BIT | QUICLY_QUIC_BIT | 0x10) -#define QUICLY_PACKET_TYPE_HANDSHAKE (QUICLY_LONG_HEADER_BIT | QUICLY_QUIC_BIT | 0x20) -#define QUICLY_PACKET_TYPE_RETRY (QUICLY_LONG_HEADER_BIT | QUICLY_QUIC_BIT | 0x30) -#define QUICLY_PACKET_TYPE_BITMASK 0xf0 +static u8 * +quic_format_err (u8 * s, va_list * args) +{ + u64 code = va_arg (*args, u64); + switch (code) + { + case 0: + s = format (s, "no error"); + break; + /* app errors */ + case QUIC_ERROR_FULL_FIFO: + s = format (s, "full fifo"); + break; + case QUIC_APP_ERROR_CLOSE_NOTIFY: + s = format (s, "QUIC_APP_ERROR_CLOSE_NOTIFY"); + break; + case QUIC_APP_ALLOCATION_ERROR: + s = format (s, "QUIC_APP_ALLOCATION_ERROR"); + break; + case QUIC_APP_ACCEPT_NOTIFY_ERROR: + s = format (s, "QUIC_APP_ACCEPT_NOTIFY_ERROR"); + break; + case QUIC_APP_CONNECT_NOTIFY_ERROR: + s = format (s, "QUIC_APP_CONNECT_NOTIFY_ERROR"); + break; + /* quicly errors */ + case QUICLY_ERROR_PACKET_IGNORED: + s = format (s, "QUICLY_ERROR_PACKET_IGNORED"); + break; + case QUICLY_ERROR_SENDBUF_FULL: + s = format (s, "QUICLY_ERROR_SENDBUF_FULL"); + break; + case QUICLY_ERROR_FREE_CONNECTION: + s = format (s, "QUICLY_ERROR_FREE_CONNECTION"); + break; + case QUICLY_ERROR_RECEIVED_STATELESS_RESET: + s = format (s, "QUICLY_ERROR_RECEIVED_STATELESS_RESET"); + break; + case QUICLY_TRANSPORT_ERROR_NONE: + s = format (s, "QUICLY_TRANSPORT_ERROR_NONE"); + break; + case QUICLY_TRANSPORT_ERROR_INTERNAL: + s = format (s, "QUICLY_TRANSPORT_ERROR_INTERNAL"); + break; + case QUICLY_TRANSPORT_ERROR_SERVER_BUSY: + s = format (s, "QUICLY_TRANSPORT_ERROR_SERVER_BUSY"); + break; + case QUICLY_TRANSPORT_ERROR_FLOW_CONTROL: + s = format (s, "QUICLY_TRANSPORT_ERROR_FLOW_CONTROL"); + break; + case QUICLY_TRANSPORT_ERROR_STREAM_ID: + s = format (s, "QUICLY_TRANSPORT_ERROR_STREAM_ID"); + break; + case QUICLY_TRANSPORT_ERROR_STREAM_STATE: + s = format (s, "QUICLY_TRANSPORT_ERROR_STREAM_STATE"); + break; + case QUICLY_TRANSPORT_ERROR_FINAL_OFFSET: + s = format (s, "QUICLY_TRANSPORT_ERROR_FINAL_OFFSET"); + break; + case QUICLY_TRANSPORT_ERROR_FRAME_ENCODING: + s = format (s, "QUICLY_TRANSPORT_ERROR_FRAME_ENCODING"); + break; + case QUICLY_TRANSPORT_ERROR_TRANSPORT_PARAMETER: + s = format (s, "QUICLY_TRANSPORT_ERROR_TRANSPORT_PARAMETER"); + break; + case QUICLY_TRANSPORT_ERROR_VERSION_NEGOTIATION: + s = format (s, "QUICLY_TRANSPORT_ERROR_VERSION_NEGOTIATION"); + break; + case QUICLY_TRANSPORT_ERROR_PROTOCOL_VIOLATION: + s = format (s, "QUICLY_TRANSPORT_ERROR_PROTOCOL_VIOLATION"); + break; + case QUICLY_TRANSPORT_ERROR_INVALID_MIGRATION: + s = format (s, "QUICLY_TRANSPORT_ERROR_INVALID_MIGRATION"); + break; + /* picotls errors */ + case QUICLY_TRANSPORT_ERROR_TLS_ALERT_BASE + PTLS_ERROR_TO_ALERT (PTLS_ALERT_CLOSE_NOTIFY): + s = + format (s, "PTLS_ALERT_CLOSE_NOTIFY"); + break; + case QUICLY_TRANSPORT_ERROR_TLS_ALERT_BASE + PTLS_ERROR_TO_ALERT (PTLS_ALERT_UNEXPECTED_MESSAGE): + s = + format (s, "PTLS_ALERT_UNEXPECTED_MESSAGE"); + break; + case QUICLY_TRANSPORT_ERROR_TLS_ALERT_BASE + PTLS_ERROR_TO_ALERT (PTLS_ALERT_BAD_RECORD_MAC): + s = + format (s, "PTLS_ALERT_BAD_RECORD_MAC"); + break; + case QUICLY_TRANSPORT_ERROR_TLS_ALERT_BASE + PTLS_ERROR_TO_ALERT (PTLS_ALERT_HANDSHAKE_FAILURE): + s = + format (s, "PTLS_ALERT_HANDSHAKE_FAILURE"); + break; + case QUICLY_TRANSPORT_ERROR_TLS_ALERT_BASE + PTLS_ERROR_TO_ALERT (PTLS_ALERT_BAD_CERTIFICATE): + s = + format (s, "PTLS_ALERT_BAD_CERTIFICATE"); + break; + case QUICLY_TRANSPORT_ERROR_TLS_ALERT_BASE + PTLS_ERROR_TO_ALERT (PTLS_ALERT_CERTIFICATE_REVOKED): + s = + format (s, "PTLS_ALERT_CERTIFICATE_REVOKED"); + break; + case QUICLY_TRANSPORT_ERROR_TLS_ALERT_BASE + PTLS_ERROR_TO_ALERT (PTLS_ALERT_CERTIFICATE_EXPIRED): + s = + format (s, "PTLS_ALERT_CERTIFICATE_EXPIRED"); + break; + case QUICLY_TRANSPORT_ERROR_TLS_ALERT_BASE + PTLS_ERROR_TO_ALERT (PTLS_ALERT_CERTIFICATE_UNKNOWN): + s = + format (s, "PTLS_ALERT_CERTIFICATE_UNKNOWN"); + break; + case QUICLY_TRANSPORT_ERROR_TLS_ALERT_BASE + PTLS_ERROR_TO_ALERT (PTLS_ALERT_ILLEGAL_PARAMETER): + s = + format (s, "PTLS_ALERT_ILLEGAL_PARAMETER"); + break; + case QUICLY_TRANSPORT_ERROR_TLS_ALERT_BASE + PTLS_ERROR_TO_ALERT (PTLS_ALERT_UNKNOWN_CA): + s = + format (s, "PTLS_ALERT_UNKNOWN_CA"); + break; + case QUICLY_TRANSPORT_ERROR_TLS_ALERT_BASE + PTLS_ERROR_TO_ALERT (PTLS_ALERT_DECODE_ERROR): + s = + format (s, "PTLS_ALERT_DECODE_ERROR"); + break; + case QUICLY_TRANSPORT_ERROR_TLS_ALERT_BASE + PTLS_ERROR_TO_ALERT (PTLS_ALERT_DECRYPT_ERROR): + s = + format (s, "PTLS_ALERT_DECRYPT_ERROR"); + break; + case QUICLY_TRANSPORT_ERROR_TLS_ALERT_BASE + PTLS_ERROR_TO_ALERT (PTLS_ALERT_PROTOCOL_VERSION): + s = + format (s, "PTLS_ALERT_PROTOCOL_VERSION"); + break; + case QUICLY_TRANSPORT_ERROR_TLS_ALERT_BASE + PTLS_ERROR_TO_ALERT (PTLS_ALERT_INTERNAL_ERROR): + s = + format (s, "PTLS_ALERT_INTERNAL_ERROR"); + break; + case QUICLY_TRANSPORT_ERROR_TLS_ALERT_BASE + PTLS_ERROR_TO_ALERT (PTLS_ALERT_USER_CANCELED): + s = + format (s, "PTLS_ALERT_USER_CANCELED"); + break; + case QUICLY_TRANSPORT_ERROR_TLS_ALERT_BASE + PTLS_ERROR_TO_ALERT (PTLS_ALERT_MISSING_EXTENSION): + s = + format (s, "PTLS_ALERT_MISSING_EXTENSION"); + break; + case QUICLY_TRANSPORT_ERROR_TLS_ALERT_BASE + PTLS_ERROR_TO_ALERT (PTLS_ALERT_UNRECOGNIZED_NAME): + s = + format (s, "PTLS_ALERT_UNRECOGNIZED_NAME"); + break; + case QUICLY_TRANSPORT_ERROR_TLS_ALERT_BASE + PTLS_ERROR_TO_ALERT (PTLS_ALERT_CERTIFICATE_REQUIRED): + s = + format (s, "PTLS_ALERT_CERTIFICATE_REQUIRED"); + break; + case QUICLY_TRANSPORT_ERROR_TLS_ALERT_BASE + PTLS_ERROR_TO_ALERT (PTLS_ALERT_NO_APPLICATION_PROTOCOL): + s = + format (s, "PTLS_ALERT_NO_APPLICATION_PROTOCOL"); + break; + case QUICLY_TRANSPORT_ERROR_TLS_ALERT_BASE + PTLS_ERROR_TO_ALERT (PTLS_ERROR_NO_MEMORY): + s = + format (s, "PTLS_ERROR_NO_MEMORY"); + break; + case QUICLY_TRANSPORT_ERROR_TLS_ALERT_BASE + PTLS_ERROR_TO_ALERT (PTLS_ERROR_IN_PROGRESS): + s = + format (s, "PTLS_ERROR_IN_PROGRESS"); + break; + case QUICLY_TRANSPORT_ERROR_TLS_ALERT_BASE + PTLS_ERROR_TO_ALERT (PTLS_ERROR_LIBRARY): + s = + format (s, "PTLS_ERROR_LIBRARY"); + break; + case QUICLY_TRANSPORT_ERROR_TLS_ALERT_BASE + PTLS_ERROR_TO_ALERT (PTLS_ERROR_INCOMPATIBLE_KEY): + s = + format (s, "PTLS_ERROR_INCOMPATIBLE_KEY"); + break; + case QUICLY_TRANSPORT_ERROR_TLS_ALERT_BASE + PTLS_ERROR_TO_ALERT (PTLS_ERROR_SESSION_NOT_FOUND): + s = + format (s, "PTLS_ERROR_SESSION_NOT_FOUND"); + break; + case QUICLY_TRANSPORT_ERROR_TLS_ALERT_BASE + PTLS_ERROR_TO_ALERT (PTLS_ERROR_STATELESS_RETRY): + s = + format (s, "PTLS_ERROR_STATELESS_RETRY"); + break; + case QUICLY_TRANSPORT_ERROR_TLS_ALERT_BASE + PTLS_ERROR_TO_ALERT (PTLS_ERROR_NOT_AVAILABLE): + s = + format (s, "PTLS_ERROR_NOT_AVAILABLE"); + break; + case QUICLY_TRANSPORT_ERROR_TLS_ALERT_BASE + PTLS_ERROR_TO_ALERT (PTLS_ERROR_COMPRESSION_FAILURE): + s = + format (s, "PTLS_ERROR_COMPRESSION_FAILURE"); + break; + case QUICLY_TRANSPORT_ERROR_TLS_ALERT_BASE + PTLS_ERROR_TO_ALERT (PTLS_ERROR_BER_INCORRECT_ENCODING): + s = + format (s, "PTLS_ERROR_BER_INCORRECT_ENCODING"); + break; + case QUICLY_TRANSPORT_ERROR_TLS_ALERT_BASE + PTLS_ERROR_TO_ALERT (PTLS_ERROR_BER_MALFORMED_TYPE): + s = + format (s, "PTLS_ERROR_BER_MALFORMED_TYPE"); + break; + case QUICLY_TRANSPORT_ERROR_TLS_ALERT_BASE + PTLS_ERROR_TO_ALERT (PTLS_ERROR_BER_MALFORMED_LENGTH): + s = + format (s, "PTLS_ERROR_BER_MALFORMED_LENGTH"); + break; + case QUICLY_TRANSPORT_ERROR_TLS_ALERT_BASE + PTLS_ERROR_TO_ALERT (PTLS_ERROR_BER_EXCESSIVE_LENGTH): + s = + format (s, "PTLS_ERROR_BER_EXCESSIVE_LENGTH"); + break; + case QUICLY_TRANSPORT_ERROR_TLS_ALERT_BASE + PTLS_ERROR_TO_ALERT (PTLS_ERROR_BER_ELEMENT_TOO_SHORT): + s = + format (s, "PTLS_ERROR_BER_ELEMENT_TOO_SHORT"); + break; + case QUICLY_TRANSPORT_ERROR_TLS_ALERT_BASE + PTLS_ERROR_TO_ALERT (PTLS_ERROR_BER_UNEXPECTED_EOC): + s = + format (s, "PTLS_ERROR_BER_UNEXPECTED_EOC"); + break; + case QUICLY_TRANSPORT_ERROR_TLS_ALERT_BASE + PTLS_ERROR_TO_ALERT (PTLS_ERROR_DER_INDEFINITE_LENGTH): + s = + format (s, "PTLS_ERROR_DER_INDEFINITE_LENGTH"); + break; + case QUICLY_TRANSPORT_ERROR_TLS_ALERT_BASE + PTLS_ERROR_TO_ALERT (PTLS_ERROR_INCORRECT_ASN1_SYNTAX): + s = + format (s, "PTLS_ERROR_INCORRECT_ASN1_SYNTAX"); + break; + case QUICLY_TRANSPORT_ERROR_TLS_ALERT_BASE + PTLS_ERROR_TO_ALERT (PTLS_ERROR_INCORRECT_PEM_KEY_VERSION): + s = + format (s, "PTLS_ERROR_INCORRECT_PEM_KEY_VERSION"); + break; + case QUICLY_TRANSPORT_ERROR_TLS_ALERT_BASE + PTLS_ERROR_TO_ALERT (PTLS_ERROR_INCORRECT_PEM_ECDSA_KEY_VERSION): + s = + format (s, "PTLS_ERROR_INCORRECT_PEM_ECDSA_KEY_VERSION"); + break; + case QUICLY_TRANSPORT_ERROR_TLS_ALERT_BASE + PTLS_ERROR_TO_ALERT (PTLS_ERROR_INCORRECT_PEM_ECDSA_CURVE): + s = + format (s, "PTLS_ERROR_INCORRECT_PEM_ECDSA_CURVE"); + break; + case QUICLY_TRANSPORT_ERROR_TLS_ALERT_BASE + PTLS_ERROR_TO_ALERT (PTLS_ERROR_INCORRECT_PEM_ECDSA_KEYSIZE): + s = + format (s, "PTLS_ERROR_INCORRECT_PEM_ECDSA_KEYSIZE"); + break; + case QUICLY_TRANSPORT_ERROR_TLS_ALERT_BASE + PTLS_ERROR_TO_ALERT (PTLS_ERROR_INCORRECT_ASN1_ECDSA_KEY_SYNTAX): + s = + format (s, "PTLS_ERROR_INCORRECT_ASN1_ECDSA_KEY_SYNTAX"); + break; + default: + s = format (s, "unknown error 0x%lx", code); + break; + } + return s; +} static u32 -quic_ctx_alloc () +quic_ctx_alloc (u32 thread_index) { - u8 thread_index = vlib_get_thread_index (); quic_main_t *qm = &quic_main; quic_ctx_t *ctx; @@ -70,6 +285,8 @@ quic_ctx_alloc () memset (ctx, 0, sizeof (quic_ctx_t)); ctx->c_thread_index = thread_index; + QUIC_DBG (1, "Allocated quic_ctx %u on thread %u", + ctx - qm->ctx_pool[thread_index], thread_index); return ctx - qm->ctx_pool[thread_index]; } @@ -84,35 +301,154 @@ quic_ctx_free (quic_ctx_t * ctx) } static quic_ctx_t * -quic_ctx_get (u32 ctx_index) +quic_ctx_get (u32 ctx_index, u32 thread_index) { - return pool_elt_at_index (quic_main.ctx_pool[vlib_get_thread_index ()], - ctx_index); + return pool_elt_at_index (quic_main.ctx_pool[thread_index], ctx_index); } static quic_ctx_t * -quic_ctx_get_w_thread (u32 ctx_index, u32 thread_index) +quic_ctx_get_if_valid (u32 ctx_index, u32 thread_index) { + if (pool_is_free_index (quic_main.ctx_pool[thread_index], ctx_index)) + return 0; return pool_elt_at_index (quic_main.ctx_pool[thread_index], ctx_index); } +static quic_ctx_t * +quic_get_conn_ctx (quicly_conn_t * conn) +{ + u64 conn_data; + conn_data = (u64) * quicly_get_data (conn); + return quic_ctx_get (conn_data & UINT32_MAX, conn_data >> 32); +} + +static void +quic_store_conn_ctx (quicly_conn_t * conn, quic_ctx_t * ctx) +{ + *quicly_get_data (conn) = + (void *) (((u64) ctx->c_thread_index) << 32 | (u64) ctx->c_c_index); +} + +static inline int +quic_ctx_is_stream (quic_ctx_t * ctx) +{ + return (ctx->flags & QUIC_F_IS_STREAM); +} + +static inline int +quic_ctx_is_listener (quic_ctx_t * ctx) +{ + return (ctx->flags & QUIC_F_IS_LISTENER); +} + +static session_t * +get_stream_session_from_stream (quicly_stream_t * stream) +{ + quic_ctx_t *ctx; + quic_stream_data_t *stream_data; + + stream_data = (quic_stream_data_t *) stream->data; + ctx = quic_ctx_get (stream_data->ctx_id, stream_data->thread_index); + return session_get (ctx->c_s_index, stream_data->thread_index); +} + +static inline void +quic_make_connection_key (clib_bihash_kv_16_8_t * kv, + const quicly_cid_plaintext_t * id) +{ + kv->key[0] = ((u64) id->master_id) << 32 | (u64) id->thread_id; + kv->key[1] = id->node_id; +} + +static int +quic_sendable_packet_count (session_t * udp_session) +{ + u32 max_enqueue; + u32 packet_size = QUIC_MAX_PACKET_SIZE + SESSION_CONN_HDR_LEN; + max_enqueue = svm_fifo_max_enqueue (udp_session->tx_fifo); + return clib_min (max_enqueue / packet_size, QUIC_SEND_PACKET_VEC_SIZE); +} + + +static void +quic_ack_rx_data (session_t * stream_session) +{ + u32 max_deq; + quic_ctx_t *sctx; + svm_fifo_t *f; + quicly_stream_t *stream; + quic_stream_data_t *stream_data; + + sctx = + quic_ctx_get (stream_session->connection_index, + stream_session->thread_index); + ASSERT (quic_ctx_is_stream (sctx)); + stream = sctx->c_quic_ctx_id.stream; + stream_data = (quic_stream_data_t *) stream->data; + + f = stream_session->rx_fifo; + max_deq = svm_fifo_max_dequeue (f); + + ASSERT (stream_data->app_rx_data_len >= max_deq); + quicly_stream_sync_recvbuf (stream, stream_data->app_rx_data_len - max_deq); + QUIC_DBG (3, "Acking %u bytes", stream_data->app_rx_data_len - max_deq); + stream_data->app_rx_data_len = max_deq; +} + static void quic_disconnect_transport (quic_ctx_t * ctx) { - QUIC_DBG (2, "Called quic_disconnect_transport"); + QUIC_DBG (2, "Disconnecting transport 0x%lx", ctx->udp_session_handle); vnet_disconnect_args_t a = { - .handle = ctx->c_quic_ctx_id.udp_session_handle, + .handle = ctx->udp_session_handle, .app_index = quic_main.app_index, }; if (vnet_disconnect_session (&a)) - clib_warning ("UDP session disconnect errored"); + clib_warning ("UDP session 0x%lx disconnect errored", + ctx->udp_session_handle); +} + +static void +quic_connection_closed (u32 ctx_index, u32 thread_index, u8 notify_transport) +{ + QUIC_DBG (2, "QUIC connection closed"); + tw_timer_wheel_1t_3w_1024sl_ov_t *tw; + clib_bihash_kv_16_8_t kv; + quicly_conn_t *conn; + quic_ctx_t *ctx; + + ctx = quic_ctx_get (ctx_index, thread_index); + ASSERT (!quic_ctx_is_stream (ctx)); + /* TODO if connection is not established, just delete the session? */ + + /* Stop the timer */ + if (ctx->timer_handle != QUIC_TIMER_HANDLE_INVALID) + { + tw = &quic_main.wrk_ctx[thread_index].timer_wheel; + tw_timer_stop_1t_3w_1024sl_ov (tw, ctx->timer_handle); + } + + /* Delete the connection from the connection map */ + conn = ctx->c_quic_ctx_id.conn; + quic_make_connection_key (&kv, quicly_get_master_id (conn)); + QUIC_DBG (2, "Deleting conn with id %lu %lu", kv.key[0], kv.key[1]); + clib_bihash_add_del_16_8 (&quic_main.connection_hash, &kv, 0 /* is_add */ ); + + quic_disconnect_transport (ctx); + if (notify_transport) + session_transport_closing_notify (&ctx->connection); + else + session_transport_delete_notify (&ctx->connection); + /* Do not try to send anything anymore */ + quicly_free (ctx->c_quic_ctx_id.conn); + ctx->c_quic_ctx_id.conn = NULL; + quic_ctx_free (ctx); } static int quic_send_datagram (session_t * udp_session, quicly_datagram_t * packet) { - /* QUIC_DBG (2, "Called quic_send_datagram at %ld", quic_get_time (NULL)); */ u32 max_enqueue; session_dgram_hdr_t hdr; u32 len, ret; @@ -122,21 +458,12 @@ quic_send_datagram (session_t * udp_session, quicly_datagram_t * packet) len = packet->data.len; f = udp_session->tx_fifo; tc = session_get_transport (udp_session); - max_enqueue = svm_fifo_max_enqueue (f); - if (max_enqueue <= sizeof (session_dgram_hdr_t)) - { - QUIC_DBG (1, "Not enough space to enqueue header"); - return 1; - } - - max_enqueue -= sizeof (session_dgram_hdr_t); - - if (max_enqueue < len) + if (max_enqueue < SESSION_CONN_HDR_LEN + len) { QUIC_DBG (1, "Too much data to send, max_enqueue %u, len %u", - max_enqueue, len); - return 1; + max_enqueue, len + SESSION_CONN_HDR_LEN); + return QUIC_ERROR_FULL_FIFO; } /* Build packet header for fifo */ @@ -165,30 +492,18 @@ quic_send_datagram (session_t * udp_session, quicly_datagram_t * packet) ret = svm_fifo_enqueue (f, sizeof (hdr), (u8 *) & hdr); if (ret != sizeof (hdr)) { - QUIC_DBG (2, "Not enough space to enqueue header"); - return 1; + QUIC_DBG (1, "Not enough space to enqueue header"); + return QUIC_ERROR_FULL_FIFO; } ret = svm_fifo_enqueue (f, len, packet->data.base); if (ret != len) { - QUIC_DBG (2, "Not enough space to enqueue payload"); - return 1; + QUIC_DBG (1, "Not enough space to enqueue payload"); + return QUIC_ERROR_FULL_FIFO; } return 0; } -#define QUIC_SEND_PACKET_VEC_SIZE 16 - -static int -quic_sendable_packet_count (session_t * udp_session) -{ - u32 max_enqueue; - max_enqueue = svm_fifo_max_enqueue (udp_session->tx_fifo); - return clib_min (max_enqueue / - (QUIC_MAX_PACKET_SIZE + sizeof (session_dgram_hdr_t)), - QUIC_SEND_PACKET_VEC_SIZE); -} - static int quic_send_packets (quic_ctx_t * ctx) { @@ -196,14 +511,23 @@ quic_send_packets (quic_ctx_t * ctx) session_t *udp_session; quicly_conn_t *conn; size_t num_packets, i, max_packets; + quicly_context_t *quicly_context; + app_worker_t *app_wrk; + application_t *app; + int err = 0; + /* We have sctx, get qctx */ - if (ctx->c_quic_ctx_id.is_stream) - ctx = quic_ctx_get (ctx->c_quic_ctx_id.quic_connection_ctx_id); + if (quic_ctx_is_stream (ctx)) + ctx = + quic_ctx_get (ctx->c_quic_ctx_id.quic_connection_ctx_id, + ctx->c_thread_index); - ASSERT (!ctx->c_quic_ctx_id.is_stream); + ASSERT (!quic_ctx_is_stream (ctx)); + + udp_session = session_get_from_handle_if_valid (ctx->udp_session_handle); + if (!udp_session) + goto quicly_error; - udp_session = - session_get_from_handle (ctx->c_quic_ctx_id.udp_session_handle); conn = ctx->c_quic_ctx_id.conn; if (!conn) @@ -213,68 +537,113 @@ quic_send_packets (quic_ctx_t * ctx) if (quic_sendable_packet_count (udp_session) < 2) goto stop_sending; + app_wrk = app_worker_get_if_valid (ctx->parent_app_wrk_id); + if (!app_wrk) + { + clib_warning ("Tried to send packets on non existing app worker %u", + ctx->parent_app_wrk_id); + quic_connection_closed (ctx->c_c_index, ctx->c_thread_index, + 1 /* notify_transport */ ); + return 1; + } + app = application_get (app_wrk->app_index); + + quicly_context = (quicly_context_t *) app->quicly_ctx; do { max_packets = quic_sendable_packet_count (udp_session); if (max_packets < 2) break; num_packets = max_packets; - if (quicly_send (conn, packets, &num_packets)) + if ((err = quicly_send (conn, packets, &num_packets))) goto quicly_error; for (i = 0; i != num_packets; ++i) { - if (quic_send_datagram (udp_session, packets[i])) + if ((err = quic_send_datagram (udp_session, packets[i]))) goto quicly_error; - quicly_default_free_packet_cb.cb - (&quicly_default_free_packet_cb, packets[i]); + quicly_context->packet_allocator-> + free_packet (quicly_context->packet_allocator, packets[i]); } - } while (num_packets > 0 && num_packets == max_packets); +stop_sending: if (svm_fifo_set_event (udp_session->tx_fifo)) - session_send_io_evt_to_thread (udp_session->tx_fifo, SESSION_IO_EVT_TX); + if ((err = + session_send_io_evt_to_thread (udp_session->tx_fifo, + SESSION_IO_EVT_TX))) + clib_warning ("Event enqueue errored %d", err); -stop_sending: + QUIC_DBG (3, "%u[TX] %u[RX]", svm_fifo_max_dequeue (udp_session->tx_fifo), + svm_fifo_max_dequeue (udp_session->rx_fifo)); quic_update_timer (ctx); return 0; quicly_error: - QUIC_DBG (1, "Error sending packets closing connection"); - quic_connection_closed (ctx->c_c_index); + if (err && err != QUICLY_ERROR_PACKET_IGNORED + && err != QUICLY_ERROR_FREE_CONNECTION) + clib_warning ("Quic error '%U'.", quic_format_err, err); + quic_connection_closed (ctx->c_c_index, ctx->c_thread_index, + 1 /* notify_transport */ ); return 1; } /***************************************************************************** + * * START QUICLY CALLBACKS * Called from QUIC lib + * *****************************************************************************/ static void -quic_on_stream_destroy (quicly_stream_t * stream) +quic_on_stream_destroy (quicly_stream_t * stream, int err) { - quic_stream_data_t *stream_data = stream->data; - u32 sctx_id = stream_data->ctx_id; - quic_ctx_t *sctx = quic_ctx_get (sctx_id); - QUIC_DBG (2, "Stream %ld (ctx %u) destroyed", stream->stream_id, sctx_id); + 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_delete_notify (&sctx->connection); + quic_ctx_free (sctx); - quicly_streambuf_destroy (stream); + free (stream->data); } static int -quic_on_stop_sending (quicly_stream_t * stream, int error_code) -{ - QUIC_DBG (2, "received STOP_SENDING: %d", error_code); +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); + clib_warning ("(NOT IMPLEMENTD) STOP_SENDING: session 0x%lx (%U)", + session_handle (stream_session), quic_format_err, err); +#endif + /* TODO : handle STOP_SENDING */ return 0; } static int -quic_on_receive_reset (quicly_stream_t * stream, int error_code) -{ - QUIC_DBG (2, "received RESET_STREAM: %d", error_code); +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); +#if QUIC_DEBUG >= 2 + 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 + session_transport_closing_notify (&sctx->connection); return 0; } @@ -282,93 +651,114 @@ static int quic_on_receive (quicly_stream_t * stream, size_t off, const void *src, size_t len) { -/* QUIC_DBG (2, "received data: %lu bytes", len); */ - u32 max_enq, ctx_id, ret; + QUIC_DBG (3, "received data: %lu bytes, offset %lu", len, off); + u32 max_enq; quic_ctx_t *sctx; session_t *stream_session; - svm_fifo_t *rx_fifo; app_worker_t *app_wrk; - int rv; - ptls_iovec_t input; + svm_fifo_t *f; + quic_stream_data_t *stream_data; + int rlen; - if ((rv = quicly_streambuf_ingress_receive (stream, off, src, len)) != 0) - { - clib_warning ("quicly_streambuf_ingress_receive Failed"); - return rv; - } + stream_data = (quic_stream_data_t *) stream->data; + sctx = quic_ctx_get (stream_data->ctx_id, stream_data->thread_index); + stream_session = session_get (sctx->c_s_index, stream_data->thread_index); + f = stream_session->rx_fifo; - if ((input = quicly_streambuf_ingress_get (stream)).len == 0) + max_enq = svm_fifo_max_enqueue_prod (f); + QUIC_DBG (3, "Enqueuing %u at off %u in %u space", len, off, max_enq); + if (off - stream_data->app_rx_data_len + len > max_enq) { - QUIC_DBG (2, "No data, ignoring"); - return QUICLY_ERROR_PACKET_IGNORED; + QUIC_DBG (1, "Error RX fifo is full"); + return 1; } - - QUIC_DBG (1, "Got %lu bytes in RX", input.len); - - ctx_id = ((quic_stream_data_t *) stream->data)->ctx_id; - sctx = quic_ctx_get (ctx_id); - stream_session = session_get (sctx->c_s_index, vlib_get_thread_index ()); - rx_fifo = stream_session->rx_fifo; - max_enq = svm_fifo_max_enqueue (rx_fifo); - - if (!max_enq) + if (off == stream_data->app_rx_data_len) { - QUIC_DBG (2, "RX FIFO full on stream receive"); - rv = QUICLY_ERROR_PACKET_IGNORED; - goto notify_app; + /* Streams live on the same thread so (f, stream_data) should stay consistent */ + rlen = svm_fifo_enqueue (f, len, (u8 *) src); + stream_data->app_rx_data_len += rlen; + ASSERT (rlen >= len); + app_wrk = app_worker_get_if_valid (stream_session->app_wrk_index); + if (PREDICT_TRUE (app_wrk != 0)) + app_worker_lock_and_send_event (app_wrk, stream_session, + SESSION_IO_EVT_RX); + quic_ack_rx_data (stream_session); } - len = clib_min (max_enq, input.len); - ret = svm_fifo_enqueue (rx_fifo, len, input.base); - if (ret != len) + else { - QUIC_DBG (2, "Not enough data to dequeue"); - return 1; + rlen = + svm_fifo_enqueue_with_offset (f, off - stream_data->app_rx_data_len, + len, (u8 *) src); + ASSERT (rlen == 0); } - quicly_streambuf_ingress_shift (stream, len); - rv = 0; - -notify_app: - app_wrk = app_worker_get_if_valid (stream_session->app_wrk_index); - if (PREDICT_TRUE (app_wrk != 0)) - app_worker_lock_and_send_event (app_wrk, stream_session, - SESSION_IO_EVT_RX); - return rv; + return 0; } void -quic_streambuf_egress_shift (quicly_stream_t * stream, size_t delta) +quic_fifo_egress_shift (quicly_stream_t * stream, size_t delta) { - quicly_streambuf_egress_shift (stream, delta); + session_t *stream_session; + svm_fifo_t *f; + int rv; + + stream_session = get_stream_session_from_stream (stream); + f = stream_session->tx_fifo; + + rv = svm_fifo_dequeue_drop (f, delta); + ASSERT (rv == delta); + quicly_stream_sync_sendbuf (stream, 0); } int -quic_streambuf_egress_emit (quicly_stream_t * stream, size_t off, void *dst, - size_t * len, int *wrote_all) +quic_fifo_egress_emit (quicly_stream_t * stream, size_t off, void *dst, + size_t * len, int *wrote_all) { - quicly_streambuf_t *sbuf = stream->data; + session_t *stream_session; + svm_fifo_t *f; + u32 deq_max, first_deq, max_rd_chunk, rem_offset; - assert (off < sbuf->egress.buf.off); + stream_session = get_stream_session_from_stream (stream); + f = stream_session->tx_fifo; + + QUIC_DBG (3, "Emitting %u, offset %u", *len, off); - if (off + *len < sbuf->egress.buf.off) + deq_max = svm_fifo_max_dequeue_cons (f); + ASSERT (off <= deq_max); + if (off + *len < deq_max) { *wrote_all = 0; } else { - *len = sbuf->egress.buf.off - off; *wrote_all = 1; + *len = deq_max - off; + QUIC_DBG (3, "Wrote ALL, %u", *len); } - QUIC_DBG (1, "EGRESS %lu bytes in TX", *len); - memcpy (dst, sbuf->egress.buf.base + off, *len); + /* TODO, use something like : return svm_fifo_peek (f, off, *len, dst); */ + max_rd_chunk = svm_fifo_max_read_chunk (f); + + first_deq = 0; + if (off < max_rd_chunk) + { + first_deq = clib_min (*len, max_rd_chunk - off); + clib_memcpy_fast (dst, svm_fifo_head (f) + off, first_deq); + } + + if (max_rd_chunk < off + *len) + { + rem_offset = max_rd_chunk < off ? off - max_rd_chunk : 0; + clib_memcpy_fast (dst + first_deq, f->head_chunk->data + rem_offset, + *len - first_deq); + } return 0; } static const quicly_stream_callbacks_t quic_stream_callbacks = { .on_destroy = quic_on_stream_destroy, - .on_send_shift = quic_streambuf_egress_shift, - .on_send_emit = quic_streambuf_egress_emit, + .on_send_shift = quic_fifo_egress_shift, + .on_send_emit = quic_fifo_egress_emit, .on_send_stop = quic_on_stop_sending, .on_receive = quic_on_receive, .on_receive_reset = quic_on_receive_reset @@ -378,79 +768,72 @@ static void quic_accept_stream (void *s) { quicly_stream_t *stream = (quicly_stream_t *) s; - session_t *stream_session; + session_t *stream_session, *quic_session; quic_stream_data_t *stream_data; app_worker_t *app_wrk; quic_ctx_t *qctx, *sctx; - u32 qctx_id, sctx_id; - quic_main_t *qm = &quic_main; + u32 sctx_id; int rv; - sctx_id = quic_ctx_alloc (); + sctx_id = quic_ctx_alloc (vlib_get_thread_index ()); - qctx_id = (u64) * quicly_get_data (stream->conn); - qctx = quic_ctx_get (qctx_id); + qctx = quic_get_conn_ctx (stream->conn); stream_session = session_alloc (qctx->c_thread_index); - QUIC_DBG (1, "Created stream_session, id %u ctx %u", - stream_session->session_index, sctx_id); - - sctx = quic_ctx_get (sctx_id); - sctx->c_quic_ctx_id.parent_app_wrk_id = - qctx->c_quic_ctx_id.parent_app_wrk_id; - sctx->c_quic_ctx_id.parent_app_id = qctx->c_quic_ctx_id.parent_app_id; + QUIC_DBG (2, "ACCEPTED stream_session 0x%lx ctx %u", + session_handle (stream_session), sctx_id); + sctx = quic_ctx_get (sctx_id, qctx->c_thread_index); + sctx->parent_app_wrk_id = qctx->parent_app_wrk_id; + sctx->parent_app_id = qctx->parent_app_id; sctx->c_quic_ctx_id.quic_connection_ctx_id = qctx->c_c_index; sctx->c_c_index = sctx_id; - sctx->c_quic_ctx_id.is_stream = 1; sctx->c_s_index = stream_session->session_index; sctx->c_quic_ctx_id.stream = stream; - sctx->c_quic_ctx_id.stream_session_handle = session_handle (stream_session); + sctx->c_flags |= TRANSPORT_CONNECTION_F_NO_LOOKUP; + sctx->flags |= QUIC_F_IS_STREAM; stream_data = (quic_stream_data_t *) stream->data; stream_data->ctx_id = sctx_id; + stream_data->thread_index = sctx->c_thread_index; + stream_data->app_rx_data_len = 0; sctx->c_s_index = stream_session->session_index; stream_session->session_state = SESSION_STATE_CREATED; - stream_session->flags |= SESSION_F_QUIC_STREAM; - stream_session->app_wrk_index = sctx->c_quic_ctx_id.parent_app_wrk_id; + stream_session->app_wrk_index = sctx->parent_app_wrk_id; stream_session->connection_index = sctx->c_c_index; stream_session->session_type = session_type_from_proto_and_ip (TRANSPORT_PROTO_QUIC, qctx->c_quic_ctx_id.udp_is_ip4); - stream_session->listener_index = qm->fake_app_listener_index; - stream_session->app_index = sctx->c_quic_ctx_id.parent_app_id; + quic_session = session_get (qctx->c_s_index, qctx->c_thread_index); + stream_session->listener_handle = listen_session_get_handle (quic_session); app_wrk = app_worker_get (stream_session->app_wrk_index); if ((rv = app_worker_init_connected (app_wrk, stream_session))) { QUIC_DBG (1, "failed to allocate fifos"); session_free (stream_session); - quicly_reset_stream (stream, 0x30001); + quicly_reset_stream (stream, QUIC_APP_ALLOCATION_ERROR); return; } + svm_fifo_add_want_deq_ntf (stream_session->rx_fifo, + SVM_FIFO_WANT_DEQ_NOTIF_IF_FULL | + SVM_FIFO_WANT_DEQ_NOTIF_IF_EMPTY); rv = app_worker_accept_notify (app_wrk, stream_session); if (rv) { QUIC_DBG (1, "failed to notify accept worker app"); session_free_w_fifos (stream_session); - quicly_reset_stream (stream, 0x30002); + quicly_reset_stream (stream, QUIC_APP_ACCEPT_NOTIFY_ERROR); return; } - session_lookup_add_connection (&sctx->connection, - session_handle (stream_session)); } static int -quic_on_stream_open (quicly_stream_open_cb * self, quicly_stream_t * stream) +quic_on_stream_open (quicly_stream_open_t * self, quicly_stream_t * stream) { QUIC_DBG (2, "on_stream_open called"); - int ret; - if ((ret = - quicly_streambuf_create (stream, sizeof (quic_stream_data_t))) != 0) - { - return ret; - } + 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 */ @@ -461,24 +844,158 @@ quic_on_stream_open (quicly_stream_open_cb * self, quicly_stream_t * stream) return 0; } -static quicly_stream_open_cb on_stream_open = { &quic_on_stream_open }; - static void -quic_on_conn_close (quicly_closed_by_peer_cb * self, quicly_conn_t * conn, - int code, uint64_t frame_type, - const char *reason, size_t reason_len) -{ - QUIC_DBG (2, "connection closed, reason: %.*s", reason, reason_len); - u32 ctx_index = (u64) * quicly_get_data (conn); - quic_ctx_t *ctx = quic_ctx_get (ctx_index); +quic_on_closed_by_peer (quicly_closed_by_peer_t * self, quicly_conn_t * conn, + int code, uint64_t frame_type, + const char *reason, size_t reason_len) +{ + quic_ctx_t *ctx = quic_get_conn_ctx (conn); +#if QUIC_DEBUG >= 2 + session_t *quic_session = session_get (ctx->c_s_index, ctx->c_thread_index); + clib_warning ("Session 0x%lx closed by peer (%U) %.*s ", + session_handle (quic_session), quic_format_err, code, + reason_len, reason); +#endif + ctx->c_quic_ctx_id.conn_state = QUIC_CONN_STATE_PASSIVE_CLOSING; session_transport_closing_notify (&ctx->connection); } -static quicly_closed_by_peer_cb on_closed_by_peer = { &quic_on_conn_close }; +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 + * + *****************************************************************************/ + +static int64_t +quic_get_thread_time (u8 thread_index) +{ + return quic_main.wrk_ctx[thread_index].time_now; +} + +static int64_t +quic_get_time (quicly_now_t * self) +{ + u8 thread_index = vlib_get_thread_index (); + return quic_get_thread_time (thread_index); +} + +static quicly_now_t quicly_vpp_now_cb = { quic_get_time }; + +static u32 +quic_set_time_now (u32 thread_index) +{ + vlib_main_t *vlib_main = vlib_get_main (); + f64 time = vlib_time_now (vlib_main); + quic_main.wrk_ctx[thread_index].time_now = (int64_t) (time * 1000.f); + return quic_main.wrk_ctx[thread_index].time_now; +} + +/* Transport proto callback */ +static void +quic_update_time (f64 now, u8 thread_index) +{ + tw_timer_wheel_1t_3w_1024sl_ov_t *tw; + + tw = &quic_main.wrk_ctx[thread_index].timer_wheel; + quic_set_time_now (thread_index); + tw_timer_expire_timers_1t_3w_1024sl_ov (tw, now); +} + +static void +quic_timer_expired (u32 conn_index) +{ + quic_ctx_t *ctx; + QUIC_DBG (4, "Timer expired for conn %u at %ld", conn_index, + quic_get_time (NULL)); + ctx = quic_ctx_get (conn_index, vlib_get_thread_index ()); + ctx->timer_handle = QUIC_TIMER_HANDLE_INVALID; + quic_send_packets (ctx); +} + +static void +quic_update_timer (quic_ctx_t * ctx) +{ + tw_timer_wheel_1t_3w_1024sl_ov_t *tw; + int64_t next_timeout, next_interval; + session_t *quic_session; + + /* This timeout is in ms which is the unit of our timer */ + next_timeout = quicly_get_first_timeout (ctx->c_quic_ctx_id.conn); + next_interval = next_timeout - quic_get_time (NULL); + + if (next_timeout == 0 || next_interval <= 0) + { + if (ctx->c_s_index == QUIC_SESSION_INVALID) + { + next_interval = 1; + } + else + { + quic_session = session_get (ctx->c_s_index, ctx->c_thread_index); + if (svm_fifo_set_event (quic_session->tx_fifo)) + session_send_io_evt_to_thread_custom (quic_session, + quic_session->thread_index, + SESSION_IO_EVT_BUILTIN_TX); + return; + } + } + + tw = &quic_main.wrk_ctx[vlib_get_thread_index ()].timer_wheel; + + QUIC_DBG (4, "Timer set to %ld (int %ld) for ctx %u", next_timeout, + next_interval, ctx->c_c_index); + + if (ctx->timer_handle == QUIC_TIMER_HANDLE_INVALID) + { + if (next_timeout == INT64_MAX) + { + 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); + } + else + { + if (next_timeout == INT64_MAX) + { + tw_timer_stop_1t_3w_1024sl_ov (tw, ctx->timer_handle); + ctx->timer_handle = QUIC_TIMER_HANDLE_INVALID; + QUIC_DBG (4, "Stopping timer for ctx %u", ctx->c_c_index); + } + else + tw_timer_update_1t_3w_1024sl_ov (tw, ctx->timer_handle, + next_interval); + } + return; +} + +static void +quic_expired_timers_dispatch (u32 * expired_timers) +{ + int i; + + for (i = 0; i < vec_len (expired_timers); i++) + { + quic_timer_expired (expired_timers[i]); + } +} + +/***************************************************************************** + * + * END TIMERS HANDLING + * *****************************************************************************/ /* single-entry session cache */ @@ -754,66 +1271,28 @@ load_bio_private_key (ptls_context_t * ctx, const char *pk_data) ctx->sign_certificate = &sc.super; } -static inline void -quic_make_connection_key (clib_bihash_kv_16_8_t * kv, - const quicly_cid_plaintext_t * id) -{ - kv->key[0] = ((u64) id->master_id) << 32 | (u64) id->thread_id; - kv->key[1] = id->node_id; -} - -static void -quic_connection_closed (u32 ctx_index) -{ - /* TODO : free fifos */ - QUIC_DBG (2, "QUIC connection closed"); - tw_timer_wheel_1t_3w_1024sl_ov_t *tw; - clib_bihash_kv_16_8_t kv; - quicly_conn_t *conn; - quic_ctx_t *ctx; - - ctx = quic_ctx_get (ctx_index); - - ASSERT (!ctx->c_quic_ctx_id.is_stream); - /* TODO if connection is not established, just delete the session? */ - - /* TODO: close all streams? or is the streams closed cb called by quicly? */ - - /* Stop the timer */ - if (ctx->timer_handle != QUIC_TIMER_HANDLE_INVALID) - { - tw = &quic_main.wrk_ctx[vlib_get_thread_index ()].timer_wheel; - tw_timer_stop_1t_3w_1024sl_ov (tw, ctx->timer_handle); - } - - /* Delete the connection from the connection map */ - conn = ctx->c_quic_ctx_id.conn; - quic_make_connection_key (&kv, quicly_get_master_id (conn)); - clib_bihash_add_del_16_8 (&quic_main.connection_hash, &kv, 0 /* is_add */ ); - - session_transport_delete_notify (&ctx->connection); - /* Do not try to send anything anymore */ - quicly_free (ctx->c_quic_ctx_id.conn); - ctx->c_quic_ctx_id.conn = NULL; - quic_ctx_free (ctx); -} - static void allocate_quicly_ctx (application_t * app, u8 is_client) { - QUIC_DBG (2, "Called allocate_quicly_ctx"); struct { quicly_context_t _; char cid_key[17]; } *ctx_data; quicly_context_t *quicly_ctx; - char *cid_key; + ptls_iovec_t key_vec; + QUIC_DBG (2, "Called allocate_quicly_ctx"); + + if (app->quicly_ctx) + { + QUIC_DBG (1, "Trying to reallocate quicly_ctx"); + return; + } ctx_data = malloc (sizeof (*ctx_data)); quicly_ctx = &ctx_data->_; app->quicly_ctx = (u64 *) quicly_ctx; - memcpy (quicly_ctx, &quicly_default_context, sizeof (quicly_context_t)); + memcpy (quicly_ctx, &quicly_spec_context, sizeof (quicly_context_t)); quicly_ctx->max_packet_size = QUIC_MAX_PACKET_SIZE; quicly_ctx->tls = &quic_tlsctx; @@ -824,187 +1303,34 @@ allocate_quicly_ctx (application_t * app, u8 is_client) quicly_amend_ptls_context (quicly_ctx->tls); quicly_ctx->event_log.mask = 0; /* logs */ - quicly_ctx->event_log.cb = quicly_new_default_event_log_cb (stderr); + 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 = QUIC_INT_MAX; quicly_ctx->transport_params.max_streams_bidi = QUIC_INT_MAX; - quicly_ctx->transport_params.max_stream_data.bidi_local = QUIC_INT_MAX; - quicly_ctx->transport_params.max_stream_data.bidi_remote = QUIC_INT_MAX; + 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.uni = QUIC_INT_MAX; - if (!is_client) + quicly_ctx->tls->random_bytes (ctx_data->cid_key, 16); + ctx_data->cid_key[16] = 0; + key_vec = ptls_iovec_init (ctx_data->cid_key, strlen (ctx_data->cid_key)); + quicly_ctx->cid_encryptor = + quicly_new_default_cid_encryptor (&ptls_openssl_bfecb, + &ptls_openssl_sha256, key_vec); + if (!is_client && app->tls_key != NULL && app->tls_cert != NULL) { - load_bio_private_key (quicly_ctx->tls, (char *) app->tls_key); - load_bio_certificate_chain (quicly_ctx->tls, (char *) app->tls_cert); - cid_key = ctx_data->cid_key; - quicly_ctx->tls->random_bytes (cid_key, 16); - cid_key[16] = 0; - quicly_ctx->encrypt_cid = - quicly_new_default_encrypt_cid_cb (&ptls_openssl_bfecb, - &ptls_openssl_sha256, - ptls_iovec_init (cid_key, - strlen - (cid_key))); - quicly_ctx->decrypt_cid = - quicly_new_default_decrypt_cid_cb (&ptls_openssl_bfecb, - &ptls_openssl_sha256, - ptls_iovec_init (cid_key, - strlen - (cid_key))); - } -} - - -/***************************************************************************** - * BEGIN TIMERS HANDLING - *****************************************************************************/ - -static int64_t -quic_get_thread_time (u8 thread_index) -{ - return quic_main.wrk_ctx[thread_index].time_now; -} - -static int64_t -quic_get_time (quicly_now_cb * self) -{ - u8 thread_index = vlib_get_thread_index (); - return quic_get_thread_time (thread_index); -} - -static u32 -quic_set_time_now (u32 thread_index) -{ - vlib_main_t *vlib_main = vlib_get_main (); - f64 time = vlib_time_now (vlib_main); - quic_main.wrk_ctx[thread_index].time_now = (int64_t) (time * 1000.f); - return quic_main.wrk_ctx[thread_index].time_now; -} - -/* Transport proto callback */ -static void -quic_update_time (f64 now, u8 thread_index) -{ - tw_timer_wheel_1t_3w_1024sl_ov_t *tw; - - tw = &quic_main.wrk_ctx[thread_index].timer_wheel; - quic_set_time_now (thread_index); - tw_timer_expire_timers_1t_3w_1024sl_ov (tw, now); -} - -static void -quic_timer_expired (u32 conn_index) -{ - quic_ctx_t *ctx; - QUIC_DBG (5, "Timer expired for conn %u at %ld", conn_index, - quic_get_time (NULL)); - ctx = quic_ctx_get (conn_index); - ctx->timer_handle = QUIC_TIMER_HANDLE_INVALID; - quic_send_packets (ctx); -} - -static void -quic_update_timer (quic_ctx_t * ctx) -{ - tw_timer_wheel_1t_3w_1024sl_ov_t *tw; - int64_t next_timeout, next_interval; - session_t *quic_session; - - /* This timeout is in ms which is the unit of our timer */ - next_timeout = quicly_get_first_timeout (ctx->c_quic_ctx_id.conn); - next_interval = next_timeout - quic_get_time (NULL); - - if (next_timeout == 0 || next_interval <= 0) - { - if (ctx->c_s_index == QUIC_SESSION_INVALID) - { - next_interval = 1; - } - else - { - quic_session = session_get (ctx->c_s_index, ctx->c_thread_index); - if (svm_fifo_set_event (quic_session->tx_fifo)) - session_send_io_evt_to_thread_custom (quic_session, - quic_session->thread_index, - SESSION_IO_EVT_BUILTIN_TX); - return; - } - } - - tw = &quic_main.wrk_ctx[vlib_get_thread_index ()].timer_wheel; - - QUIC_DBG (5, "Timer set to %ld (int %ld) for ctx %u", next_timeout, - next_interval, ctx->c_c_index); - - if (ctx->timer_handle == QUIC_TIMER_HANDLE_INVALID) - { - if (next_timeout == INT64_MAX) - { - QUIC_DBG (5, "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); - } - else - { - if (next_timeout == INT64_MAX) - { - tw_timer_stop_1t_3w_1024sl_ov (tw, ctx->timer_handle); - ctx->timer_handle = QUIC_TIMER_HANDLE_INVALID; - QUIC_DBG (5, "Stopping timer for ctx %u", ctx->c_c_index); - } - else - tw_timer_update_1t_3w_1024sl_ov (tw, ctx->timer_handle, - next_interval); - } - return; -} - -static void -quic_expired_timers_dispatch (u32 * expired_timers) -{ - int i; - - for (i = 0; i < vec_len (expired_timers); i++) - { - quic_timer_expired (expired_timers[i]); + load_bio_private_key (quicly_ctx->tls, (char *) app->tls_key); + load_bio_certificate_chain (quicly_ctx->tls, (char *) app->tls_cert); } } - /***************************************************************************** - * END TIMERS HANDLING * * BEGIN TRANSPORT PROTO FUNCTIONS + * *****************************************************************************/ -static int -quic_connect (transport_endpoint_cfg_t * tep) -{ - QUIC_DBG (2, "Called quic_connect"); - session_endpoint_cfg_t *sep; - int connect_stream = 0; - - sep = (session_endpoint_cfg_t *) tep; - - if (sep->port == 0) - { - /* TODO: better logic to detect if this is a stream or a connection request */ - connect_stream = 1; - } - - if (connect_stream) - { - return quic_connect_new_stream (sep); - } - else - { - return quic_connect_new_connection (sep); - } -} - static int quic_connect_new_stream (session_endpoint_cfg_t * sep) { @@ -1016,7 +1342,6 @@ quic_connect_new_stream (session_endpoint_cfg_t * sep) app_worker_t *app_wrk; quic_ctx_t *qctx, *sctx; u32 sctx_index; - quic_main_t *qm = &quic_main; int rv; /* Find base session to which the user want to attach a stream */ @@ -1038,29 +1363,30 @@ quic_connect_new_stream (session_endpoint_cfg_t * sep) return -1; } - sctx_index = quic_ctx_alloc (); /* Allocate before we get pointers */ - sctx = quic_ctx_get (sctx_index); - qctx = quic_ctx_get (quic_session->connection_index); - if (qctx->c_quic_ctx_id.is_stream) + 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); + if (quic_ctx_is_stream (qctx)) { QUIC_DBG (1, "session is a stream"); quic_ctx_free (sctx); return -1; } - sctx->c_quic_ctx_id.parent_app_wrk_id = - qctx->c_quic_ctx_id.parent_app_wrk_id; - sctx->c_quic_ctx_id.parent_app_id = qctx->c_quic_ctx_id.parent_app_id; + sctx->parent_app_wrk_id = qctx->parent_app_wrk_id; + sctx->parent_app_id = qctx->parent_app_id; sctx->c_quic_ctx_id.quic_connection_ctx_id = qctx->c_c_index; sctx->c_c_index = sctx_index; - sctx->c_quic_ctx_id.is_stream = 1; + sctx->c_flags |= TRANSPORT_CONNECTION_F_NO_LOOKUP; + sctx->flags |= QUIC_F_IS_STREAM; conn = qctx->c_quic_ctx_id.conn; if (!conn || !quicly_connection_is_ready (conn)) return -1; - if ((rv = quicly_open_stream (conn, &stream, 0))) + if ((rv = quicly_open_stream (conn, &stream, 0 /* uni */ ))) { QUIC_DBG (2, "Stream open failed with %d", rv); return -1; @@ -1070,41 +1396,43 @@ quic_connect_new_stream (session_endpoint_cfg_t * sep) QUIC_DBG (2, "Opened stream %d, creating session", stream->stream_id); stream_session = session_alloc (qctx->c_thread_index); - QUIC_DBG (1, "Created stream_session, id %u ctx %u", - stream_session->session_index, sctx_index); - stream_session->flags |= SESSION_F_QUIC_STREAM; + QUIC_DBG (2, "Allocated stream_session 0x%lx ctx %u", + session_handle (stream_session), sctx_index); stream_session->app_wrk_index = app_wrk->wrk_index; stream_session->connection_index = sctx_index; - stream_session->listener_index = qm->fake_app_listener_index; + stream_session->listener_handle = quic_session_handle; stream_session->session_type = session_type_from_proto_and_ip (TRANSPORT_PROTO_QUIC, qctx->c_quic_ctx_id.udp_is_ip4); sctx->c_s_index = stream_session->session_index; - sctx->c_quic_ctx_id.stream_session_handle = session_handle (stream_session); if (app_worker_init_connected (app_wrk, stream_session)) { QUIC_DBG (1, "failed to app_worker_init_connected"); - quicly_reset_stream (stream, 0x30003); + quicly_reset_stream (stream, QUIC_APP_ALLOCATION_ERROR); session_free_w_fifos (stream_session); quic_ctx_free (sctx); return app_worker_connect_notify (app_wrk, NULL, sep->opaque); } + svm_fifo_add_want_deq_ntf (stream_session->rx_fifo, + SVM_FIFO_WANT_DEQ_NOTIF_IF_FULL | + SVM_FIFO_WANT_DEQ_NOTIF_IF_EMPTY); + stream_session->session_state = SESSION_STATE_READY; if (app_worker_connect_notify (app_wrk, stream_session, sep->opaque)) { QUIC_DBG (1, "failed to notify app"); - quicly_reset_stream (stream, 0x30004); + quicly_reset_stream (stream, QUIC_APP_CONNECT_NOTIFY_ERROR); session_free_w_fifos (stream_session); quic_ctx_free (sctx); return -1; } - session_lookup_add_connection (&sctx->connection, - session_handle (stream_session)); stream_data = (quic_stream_data_t *) stream->data; stream_data->ctx_id = sctx->c_c_index; + stream_data->thread_index = sctx->c_thread_index; + stream_data->app_rx_data_len = 0; return 0; } @@ -1119,24 +1447,25 @@ quic_connect_new_connection (session_endpoint_cfg_t * sep) u32 ctx_index; int error; - ctx_index = quic_ctx_alloc (); - ctx = quic_ctx_get (ctx_index); - ctx->c_quic_ctx_id.parent_app_wrk_id = sep->app_wrk_index; + 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; ctx->c_s_index = QUIC_SESSION_INVALID; ctx->c_c_index = ctx_index; ctx->c_quic_ctx_id.udp_is_ip4 = sep->is_ip4; ctx->timer_handle = QUIC_TIMER_HANDLE_INVALID; - ctx->conn_state = QUIC_CONN_STATE_HANDSHAKE; - ctx->client_opaque = sep->opaque; + ctx->c_quic_ctx_id.conn_state = QUIC_CONN_STATE_HANDSHAKE; + ctx->c_quic_ctx_id.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->c_quic_ctx_id.srv_hostname = format (0, "%v", sep->hostname); + vec_terminate_c_string (ctx->c_quic_ctx_id.srv_hostname); } else { /* needed by quic for crypto + determining client / server */ - ctx->srv_hostname = + ctx->c_quic_ctx_id.srv_hostname = format (0, "%U", format_ip46_address, &sep->ip, sep->is_ip4); } @@ -1147,7 +1476,7 @@ quic_connect_new_connection (session_endpoint_cfg_t * sep) app_wrk = app_worker_get (sep->app_wrk_index); app = application_get (app_wrk->app_index); - ctx->c_quic_ctx_id.parent_app_id = app_wrk->app_index; + ctx->parent_app_id = app_wrk->app_index; cargs->sep_ext.ns_index = app->ns_index; allocate_quicly_ctx (app, 1 /* is client */ ); @@ -1158,32 +1487,46 @@ quic_connect_new_connection (session_endpoint_cfg_t * sep) return 0; } -static void -quic_disconnect (u32 ctx_index, u32 thread_index) +static int +quic_connect (transport_endpoint_cfg_t * tep) { - QUIC_DBG (2, "Called quic_disconnect"); - quic_ctx_t *ctx; + QUIC_DBG (2, "Called quic_connect"); + session_endpoint_cfg_t *sep = (session_endpoint_cfg_t *) tep; + sep = (session_endpoint_cfg_t *) tep; + if (sep->transport_opts) + return quic_connect_new_stream (sep); + else + return quic_connect_new_connection (sep); +} - ctx = quic_ctx_get (ctx_index); - if (ctx->c_quic_ctx_id.is_stream) +static void +quic_proto_on_close (u32 ctx_index, u32 thread_index) +{ + quic_ctx_t *ctx = quic_ctx_get_if_valid (ctx_index, thread_index); + if (!ctx) + return; +#if QUIC_DEBUG >= 2 + 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)) { - QUIC_DBG (1, "Closing stream %x", ctx_index); quicly_stream_t *stream = ctx->c_quic_ctx_id.stream; - quicly_reset_stream (stream, 0x30000); + quicly_reset_stream (stream, QUIC_APP_ERROR_CLOSE_NOTIFY); + quic_send_packets (ctx); } + else if (ctx->c_quic_ctx_id.conn_state == QUIC_CONN_STATE_PASSIVE_CLOSING) + quic_connection_closed (ctx->c_c_index, ctx->c_thread_index, + 0 /* notify_transport */ ); else { - QUIC_DBG (1, "Closing connection %x", ctx_index); quicly_conn_t *conn = ctx->c_quic_ctx_id.conn; /* Start connection closing. Keep sending packets until quicly_send returns QUICLY_ERROR_FREE_CONNECTION */ - quicly_close (conn, 0, ""); + quicly_close (conn, QUIC_APP_ERROR_CLOSE_NOTIFY, "Closed by peer"); /* This also causes all streams to be closed (and the cb called) */ - if (quic_send_packets (ctx)) - { - QUIC_DBG (2, "closing connection in disconnect"); - quic_connection_closed (ctx->c_c_index); - } + quic_send_packets (ctx); } } @@ -1194,7 +1537,7 @@ quic_start_listen (u32 quic_listen_session_index, transport_endpoint_t * tep) quic_main_t *qm = &quic_main; session_handle_t udp_handle; session_endpoint_cfg_t *sep; - session_t *udp_listen_session, *quic_listen_session; + session_t *udp_listen_session; app_worker_t *app_wrk; application_t *app; quic_ctx_t *lctx; @@ -1219,24 +1562,30 @@ quic_start_listen (u32 quic_listen_session_index, transport_endpoint_t * tep) if (vnet_listen (args)) return -1; - lctx_index = quic_ctx_alloc (); /* listener */ + lctx_index = quic_ctx_alloc (0); udp_handle = args->handle; app_listener = app_listener_get_w_handle (udp_handle); udp_listen_session = app_listener_get_session (app_listener); udp_listen_session->opaque = lctx_index; - quic_listen_session = listen_session_get (quic_listen_session_index); - - lctx = quic_ctx_get (lctx_index); /* listener */ - lctx->is_listener = 1; - lctx->c_quic_ctx_id.parent_app_wrk_id = sep->app_wrk_index; - lctx->c_quic_ctx_id.parent_app_id = app_wrk->app_index; - lctx->c_quic_ctx_id.udp_session_handle = udp_handle; - lctx->c_quic_ctx_id.quic_session_handle = - listen_session_get_handle (quic_listen_session); - lctx->c_quic_ctx_id.udp_is_ip4 = sep->is_ip4; - - QUIC_DBG (1, "Started listening %d", lctx_index); + lctx = quic_ctx_get (lctx_index, 0); + lctx->flags |= QUIC_F_IS_LISTENER; + + 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)); + lctx->c_rmt_port = args->sep.peer.port; + lctx->c_lcl_port = args->sep.port; + lctx->c_is_ip4 = args->sep.is_ip4; + lctx->c_fib_index = args->sep.fib_index; + lctx->c_proto = TRANSPORT_PROTO_QUIC; + lctx->parent_app_wrk_id = sep->app_wrk_index; + lctx->parent_app_id = app_wrk->app_index; + lctx->udp_session_handle = udp_handle; + lctx->c_s_index = quic_listen_session_index; + + QUIC_DBG (2, "Listening UDP session 0x%lx", + session_handle (udp_listen_session)); + QUIC_DBG (2, "Listening QUIC session 0x%lx", quic_listen_session_index); return lctx_index; } @@ -1245,10 +1594,10 @@ quic_stop_listen (u32 lctx_index) { QUIC_DBG (2, "Called quic_stop_listen"); quic_ctx_t *lctx; - - lctx = quic_ctx_get (lctx_index); /* listener */ + lctx = quic_ctx_get (lctx_index, 0); + ASSERT (quic_ctx_is_listener (lctx)); vnet_unlisten_args_t a = { - .handle = lctx->c_quic_ctx_id.udp_session_handle, + .handle = lctx->udp_session_handle, .app_index = quic_main.app_index, .wrk_map_index = 0 /* default wrk */ }; @@ -1257,16 +1606,15 @@ quic_stop_listen (u32 lctx_index) /* TODO: crypto state cleanup */ - quic_ctx_free (lctx); /* listener */ + quic_ctx_free (lctx); return 0; } static transport_connection_t * quic_connection_get (u32 ctx_index, u32 thread_index) { - QUIC_DBG (2, "Called quic_connection_get"); quic_ctx_t *ctx; - ctx = quic_ctx_get_w_thread (ctx_index, thread_index); + ctx = quic_ctx_get (ctx_index, thread_index); return &ctx->connection; } @@ -1275,14 +1623,53 @@ quic_listener_get (u32 listener_index) { QUIC_DBG (2, "Called quic_listener_get"); quic_ctx_t *ctx; - ctx = quic_ctx_get (listener_index); + ctx = quic_ctx_get (listener_index, 0); return &ctx->connection; } +static u8 * +format_quic_ctx (u8 * s, va_list * args) +{ + quic_ctx_t *ctx = va_arg (*args, quic_ctx_t *); + u32 verbose = va_arg (*args, u32); + + if (!ctx) + return s; + s = format (s, "[#%d][Q] ", ctx->c_thread_index); + + if (!quic_ctx_is_listener (ctx)) + { + s = format (s, "%s Session: ", quic_ctx_is_stream (ctx) ? + "Stream" : "Quic"); + if (verbose) + s = format (s, "app %d wrk %d", ctx->parent_app_id, + ctx->parent_app_wrk_id); + } + else + { + if (ctx->c_is_ip4) + s = format (s, "%U:%d->%U:%d", format_ip4_address, &ctx->c_lcl_ip4, + clib_net_to_host_u16 (ctx->c_lcl_port), + format_ip4_address, &ctx->c_rmt_ip4, + clib_net_to_host_u16 (ctx->c_rmt_port)); + else + s = format (s, "%U:%d->%U:%d", format_ip6_address, &ctx->c_lcl_ip6, + clib_net_to_host_u16 (ctx->c_lcl_port), + format_ip6_address, &ctx->c_rmt_ip6, + clib_net_to_host_u16 (ctx->c_rmt_port)); + } + return s; +} + static u8 * format_quic_connection (u8 * s, va_list * args) { - s = format (s, "[QUIC] connection"); /* TODO */ + u32 qc_index = va_arg (*args, u32); + u32 thread_index = va_arg (*args, u32); + u32 verbose = va_arg (*args, u32); + quic_ctx_t *ctx = quic_ctx_get (qc_index, thread_index); + if (ctx) + s = format (s, "%-50U", format_quic_ctx, ctx, verbose); return s; } @@ -1290,8 +1677,9 @@ static u8 * format_quic_half_open (u8 * s, va_list * args) { u32 qc_index = va_arg (*args, u32); - quic_ctx_t *ctx = quic_ctx_get (qc_index); - s = format (s, "[QUIC] half-open app %u", ctx->c_quic_ctx_id.parent_app_id); + u32 thread_index = va_arg (*args, u32); + quic_ctx_t *ctx = quic_ctx_get (qc_index, thread_index); + s = format (s, "[QUIC] half-open app %u", ctx->parent_app_id); return s; } @@ -1299,7 +1687,15 @@ format_quic_half_open (u8 * s, va_list * args) static u8 * format_quic_listener (u8 * s, va_list * args) { - s = format (s, "[QUIC] listener"); /* TODO */ + u32 tci = va_arg (*args, u32); + u32 thread_index = va_arg (*args, u32); + u32 verbose = va_arg (*args, u32); + quic_ctx_t *ctx = quic_ctx_get (tci, thread_index); + if (ctx) + { + ASSERT (quic_ctx_is_listener (ctx)); + s = format (s, "%-50U", format_quic_ctx, ctx, verbose); + } return s; } @@ -1333,28 +1729,27 @@ quic_build_sockaddr (struct sockaddr *sa, socklen_t * salen, } static int -quic_notify_app_connected (quic_ctx_t * ctx) +quic_on_client_connected (quic_ctx_t * ctx) { - QUIC_DBG (1, "quic_notify_app_connected"); session_t *quic_session; app_worker_t *app_wrk; u32 ctx_id = ctx->c_c_index; - quic_main_t *qm = &quic_main; + u32 thread_index = ctx->c_thread_index; - app_wrk = app_worker_get_if_valid (ctx->c_quic_ctx_id.parent_app_wrk_id); + app_wrk = app_worker_get_if_valid (ctx->parent_app_wrk_id); if (!app_wrk) { quic_disconnect_transport (ctx); return -1; } - quic_session = session_alloc (ctx->c_thread_index); + quic_session = session_alloc (thread_index); - QUIC_DBG (1, "Created quic_session, id %u", quic_session->session_index); + QUIC_DBG (2, "Allocated quic session 0x%lx", session_handle (quic_session)); ctx->c_s_index = quic_session->session_index; - quic_session->app_wrk_index = ctx->c_quic_ctx_id.parent_app_wrk_id; + quic_session->app_wrk_index = ctx->parent_app_wrk_id; quic_session->connection_index = ctx->c_c_index; - quic_session->listener_index = qm->fake_app_listener_index; + quic_session->listener_handle = SESSION_INVALID_HANDLE; quic_session->session_type = session_type_from_proto_and_ip (TRANSPORT_PROTO_QUIC, ctx->c_quic_ctx_id.udp_is_ip4); @@ -1362,112 +1757,27 @@ quic_notify_app_connected (quic_ctx_t * ctx) if (app_worker_init_connected (app_wrk, quic_session)) { QUIC_DBG (1, "failed to app_worker_init_connected"); - quic_disconnect (ctx->c_c_index, vlib_get_thread_index ()); - return app_worker_connect_notify (app_wrk, NULL, ctx->client_opaque); + quic_proto_on_close (ctx_id, thread_index); + return app_worker_connect_notify (app_wrk, NULL, + ctx->c_quic_ctx_id.client_opaque); } quic_session->session_state = SESSION_STATE_CONNECTING; - if (app_worker_connect_notify (app_wrk, quic_session, ctx->client_opaque)) + if (app_worker_connect_notify + (app_wrk, quic_session, ctx->c_quic_ctx_id.client_opaque)) { QUIC_DBG (1, "failed to notify app"); - quic_disconnect (ctx->c_c_index, vlib_get_thread_index ()); + quic_proto_on_close (ctx_id, thread_index); return -1; } /* If the app opens a stream in its callback it may invalidate ctx */ - ctx = quic_ctx_get (ctx_id); - ctx->c_quic_ctx_id.quic_session_handle = session_handle (quic_session); + ctx = quic_ctx_get (ctx_id, thread_index); quic_session->session_state = SESSION_STATE_LISTENING; - session_lookup_add_connection (&ctx->connection, - session_handle (quic_session)); return 0; } -static int -quic_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); - /* This should always be called before quic_connect returns since UDP always - * connects instantly. */ - clib_bihash_kv_16_8_t kv; - struct sockaddr_in6 sa6; - struct sockaddr *sa = (struct sockaddr *) &sa6; - socklen_t salen; - transport_connection_t *tc; - app_worker_t *app_wrk; - quicly_conn_t *conn; - application_t *app; - quic_ctx_t *ctx; - int ret; - - ctx = quic_ctx_get (ctx_index); - if (is_fail) - { - u32 api_context; - int rv = 0; - - app_wrk = - app_worker_get_if_valid (ctx->c_quic_ctx_id.parent_app_wrk_id); - if (app_wrk) - { - api_context = ctx->c_s_index; - app_worker_connect_notify (app_wrk, 0, api_context); - } - return rv; - } - - app_wrk = app_worker_get_if_valid (ctx->c_quic_ctx_id.parent_app_wrk_id); - if (!app_wrk) - { - QUIC_DBG (1, "Appwrk not found"); - return -1; - } - app = application_get (app_wrk->app_index); - - ctx->c_thread_index = vlib_get_thread_index (); - ctx->c_c_index = ctx_index; - - QUIC_DBG (1, "Quic connect returned %u. New ctx [%u]%x", - is_fail, vlib_get_thread_index (), (ctx) ? ctx_index : ~0); - - ctx->c_quic_ctx_id.udp_session_handle = session_handle (udp_session); - udp_session->opaque = ctx->c_quic_ctx_id.parent_app_id; - udp_session->session_state = SESSION_STATE_READY; - - /* Init QUIC lib connection - * Generate required sockaddr & salen */ - tc = session_get_transport (udp_session); - quic_build_sockaddr (sa, &salen, &tc->rmt_ip, tc->rmt_port, tc->is_ip4); - - ret = - quicly_connect (&ctx->c_quic_ctx_id.conn, - (quicly_context_t *) app->quicly_ctx, - (char *) ctx->srv_hostname, sa, salen, - &quic_main.next_cid, &quic_main.hs_properties, NULL); - ++quic_main.next_cid.master_id; - /* Save context handle in quicly connection */ - *quicly_get_data (ctx->c_quic_ctx_id.conn) = (void *) (u64) ctx_index; - assert (ret == 0); - - /* Register connection in connections map */ - conn = ctx->c_quic_ctx_id.conn; - quic_make_connection_key (&kv, quicly_get_master_id (conn)); - kv.value = ((u64) vlib_get_thread_index ()) << 32 | (u64) ctx_index; - QUIC_DBG (1, "Registering conn with id %lu %lu", kv.key[0], kv.key[1]); - clib_bihash_add_del_16_8 (&quic_main.connection_hash, &kv, 1 /* is_add */ ); - - quic_send_packets (ctx); - - /* UDP stack quirk? preemptively transfer connection if that happens */ - if (udp_session->thread_index != vlib_get_thread_index ()) - quic_transfer_connection (ctx_index, udp_session->thread_index); - - return ret; -} - static void quic_receive_connection (void *arg) { @@ -1477,10 +1787,10 @@ quic_receive_connection (void *arg) quicly_conn_t *conn; temp_ctx = arg; - new_ctx_id = quic_ctx_alloc (); - new_ctx = quic_ctx_get (new_ctx_id); + new_ctx_id = quic_ctx_alloc (thread_index); + new_ctx = quic_ctx_get (new_ctx_id, thread_index); - QUIC_DBG (3, "Received conn %u (now %u)", temp_ctx->c_thread_index, + QUIC_DBG (2, "Received conn %u (now %u)", temp_ctx->c_thread_index, new_ctx_id); @@ -1491,9 +1801,10 @@ quic_receive_connection (void *arg) new_ctx->c_c_index = new_ctx_id; conn = new_ctx->c_quic_ctx_id.conn; + quic_store_conn_ctx (conn, new_ctx); quic_make_connection_key (&kv, quicly_get_master_id (conn)); kv.value = ((u64) thread_index) << 32 | (u64) new_ctx_id; - QUIC_DBG (1, "Registering conn with id %lu %lu", kv.key[0], kv.key[1]); + QUIC_DBG (2, "Registering conn with id %lu %lu", kv.key[0], kv.key[1]); clib_bihash_add_del_16_8 (&quic_main.connection_hash, &kv, 1 /* is_add */ ); new_ctx->timer_handle = QUIC_TIMER_HANDLE_INVALID; quic_update_timer (new_ctx); @@ -1508,12 +1819,13 @@ quic_transfer_connection (u32 ctx_index, u32 dest_thread) quic_ctx_t *ctx, *temp_ctx; clib_bihash_kv_16_8_t kv; quicly_conn_t *conn; + u32 thread_index = vlib_get_thread_index (); - QUIC_DBG (3, "Transferring conn %u to thread %u", ctx_index, dest_thread); + QUIC_DBG (2, "Transferring conn %u to thread %u", ctx_index, dest_thread); temp_ctx = malloc (sizeof (quic_ctx_t)); ASSERT (temp_ctx); - ctx = quic_ctx_get (ctx_index); + ctx = quic_ctx_get (ctx_index, thread_index); memcpy (temp_ctx, ctx, sizeof (quic_ctx_t)); @@ -1523,7 +1835,7 @@ quic_transfer_connection (u32 ctx_index, u32 dest_thread) clib_bihash_add_del_16_8 (&quic_main.connection_hash, &kv, 0 /* is_add */ ); if (ctx->timer_handle != QUIC_TIMER_HANDLE_INVALID) { - tw = &quic_main.wrk_ctx[vlib_get_thread_index ()].timer_wheel; + tw = &quic_main.wrk_ctx[thread_index].timer_wheel; tw_timer_stop_1t_3w_1024sl_ov (tw, ctx->timer_handle); } quic_ctx_free (ctx); @@ -1553,13 +1865,97 @@ static void quic_move_connection_to_thread (u32 ctx_index, u32 owner_thread, u32 to_thread) { - QUIC_DBG (3, "Requesting transfer of conn %u from thread %u", ctx_index, + QUIC_DBG (2, "Requesting transfer of conn %u from thread %u", ctx_index, owner_thread); u64 arg = ((u64) ctx_index) << 32 | to_thread; session_send_rpc_evt_to_thread (owner_thread, quic_transfer_connection_rpc, (void *) arg); } +static int +quic_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); + /* This should always be called before quic_connect returns since UDP always + * connects instantly. */ + clib_bihash_kv_16_8_t kv; + struct sockaddr_in6 sa6; + struct sockaddr *sa = (struct sockaddr *) &sa6; + socklen_t salen; + transport_connection_t *tc; + app_worker_t *app_wrk; + quicly_conn_t *conn; + application_t *app; + quic_ctx_t *ctx; + u32 thread_index = vlib_get_thread_index (); + int ret; + + ctx = quic_ctx_get (ctx_index, thread_index); + if (is_fail) + { + u32 api_context; + int rv = 0; + + app_wrk = app_worker_get_if_valid (ctx->parent_app_wrk_id); + if (app_wrk) + { + api_context = ctx->c_s_index; + app_worker_connect_notify (app_wrk, 0, api_context); + } + return rv; + } + + app_wrk = app_worker_get_if_valid (ctx->parent_app_wrk_id); + if (!app_wrk) + { + QUIC_DBG (1, "Appwrk not found"); + return -1; + } + app = application_get (app_wrk->app_index); + + ctx->c_thread_index = thread_index; + ctx->c_c_index = ctx_index; + + QUIC_DBG (2, "Quic connect returned %u. New ctx [%u]%x", + 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->session_state = SESSION_STATE_READY; + + /* Init QUIC lib connection + * Generate required sockaddr & salen */ + tc = session_get_transport (udp_session); + quic_build_sockaddr (sa, &salen, &tc->rmt_ip, tc->rmt_port, tc->is_ip4); + + ret = + quicly_connect (&ctx->c_quic_ctx_id.conn, + (quicly_context_t *) app->quicly_ctx, + (char *) ctx->c_quic_ctx_id.srv_hostname, sa, salen, + &quic_main.next_cid, &quic_main.hs_properties, NULL); + ++quic_main.next_cid.master_id; + /* Save context handle in quicly connection */ + quic_store_conn_ctx (ctx->c_quic_ctx_id.conn, ctx); + assert (ret == 0); + + /* Register connection in connections map */ + conn = ctx->c_quic_ctx_id.conn; + quic_make_connection_key (&kv, quicly_get_master_id (conn)); + kv.value = ((u64) thread_index) << 32 | (u64) ctx_index; + QUIC_DBG (2, "Registering conn with id %lu %lu", kv.key[0], kv.key[1]); + clib_bihash_add_del_16_8 (&quic_main.connection_hash, &kv, 1 /* is_add */ ); + + quic_send_packets (ctx); + + /* UDP stack quirk? preemptively transfer connection if that happens */ + if (udp_session->thread_index != thread_index) + quic_transfer_connection (ctx_index, udp_session->thread_index); + + return ret; +} + static void quic_session_disconnect_callback (session_t * s) { @@ -1576,31 +1972,33 @@ int quic_session_accepted_callback (session_t * udp_session) { /* New UDP connection, try to accept it */ - QUIC_DBG (1, "UDP session accepted"); u32 ctx_index; u32 *pool_index; quic_ctx_t *ctx, *lctx; session_t *udp_listen_session; + u32 thread_index = vlib_get_thread_index (); - udp_listen_session = listen_session_get (udp_session->listener_index); + udp_listen_session = + listen_session_get_from_handle (udp_session->listener_handle); - ctx_index = quic_ctx_alloc (); - ctx = quic_ctx_get (ctx_index); + ctx_index = quic_ctx_alloc (thread_index); + ctx = quic_ctx_get (ctx_index, thread_index); ctx->c_thread_index = udp_session->thread_index; ctx->c_c_index = ctx_index; ctx->c_s_index = QUIC_SESSION_INVALID; - ctx->c_quic_ctx_id.udp_session_handle = session_handle (udp_session); + ctx->udp_session_handle = session_handle (udp_session); + QUIC_DBG (2, "ACCEPTED UDP 0x%lx", ctx->udp_session_handle); ctx->c_quic_ctx_id.listener_ctx_id = udp_listen_session->opaque; - lctx = quic_ctx_get_w_thread (udp_listen_session->opaque, - udp_listen_session->thread_index); - ctx->c_quic_ctx_id.udp_is_ip4 = lctx->c_quic_ctx_id.udp_is_ip4; - ctx->c_quic_ctx_id.parent_app_id = lctx->c_quic_ctx_id.parent_app_id; - ctx->c_quic_ctx_id.parent_app_wrk_id = - lctx->c_quic_ctx_id.parent_app_wrk_id; + lctx = quic_ctx_get (udp_listen_session->opaque, + udp_listen_session->thread_index); + ctx->c_quic_ctx_id.udp_is_ip4 = lctx->c_is_ip4; + ctx->parent_app_id = lctx->parent_app_id; + ctx->parent_app_wrk_id = lctx->parent_app_wrk_id; ctx->timer_handle = QUIC_TIMER_HANDLE_INVALID; - ctx->conn_state = QUIC_CONN_STATE_OPENED; + ctx->c_quic_ctx_id.conn_state = QUIC_CONN_STATE_OPENED; + ctx->c_flags |= TRANSPORT_CONNECTION_F_NO_LOOKUP; - udp_session->opaque = ctx->c_quic_ctx_id.parent_app_id; + udp_session->opaque = ctx->parent_app_id; /* Put this ctx in the "opening" pool */ pool_get (quic_main.wrk_ctx[ctx->c_thread_index].opening_ctx_pool, @@ -1629,56 +2027,56 @@ quic_del_segment_callback (u32 client_index, u64 seg_handle) return 0; } + +static int +quic_custom_app_rx_callback (transport_connection_t * tc) +{ + quic_ctx_t *ctx; + session_t *stream_session = session_get (tc->s_index, tc->thread_index); + QUIC_DBG (3, "Received app READ notification"); + quic_ack_rx_data (stream_session); + svm_fifo_reset_has_deq_ntf (stream_session->rx_fifo); + + /* Need to send packets (acks may never be sent otherwise) */ + ctx = quic_ctx_get (stream_session->connection_index, + stream_session->thread_index); + quic_send_packets (ctx); + return 0; +} + static int quic_custom_tx_callback (void *s) { session_t *stream_session = (session_t *) s; - quic_ctx_t *ctx; - svm_fifo_t *f; quicly_stream_t *stream; - u32 deq_max, rv; - u8 *data; + quic_ctx_t *ctx; + int rv; if (PREDICT_FALSE (stream_session->session_state >= SESSION_STATE_TRANSPORT_CLOSING)) return 0; - ctx = quic_ctx_get (stream_session->connection_index); - if (PREDICT_FALSE (!ctx->c_quic_ctx_id.is_stream)) + 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 */ } - if (!ctx->c_quic_ctx_id.stream->sendstate.is_open) - { - QUIC_DBG (3, "Warning: tried to send on closed stream"); - return -1; - } - - f = stream_session->tx_fifo; - deq_max = svm_fifo_max_dequeue (f); - if (!deq_max) - goto tx_end; + QUIC_DBG (3, "Stream TX event"); + quic_ack_rx_data (stream_session); + if (!svm_fifo_max_dequeue (stream_session->tx_fifo)) + return 0; - data = malloc (deq_max); - rv = svm_fifo_peek (f, 0, deq_max, data); - if (rv != deq_max) + stream = ctx->c_quic_ctx_id.stream; + if (!quicly_sendstate_is_open (&stream->sendstate)) { - QUIC_DBG (2, "Not enough data dequeued in TX"); - return 1; + QUIC_DBG (1, "Warning: tried to send on closed stream"); + return -1; } - stream = ctx->c_quic_ctx_id.stream; - rv = quicly_streambuf_egress_write (stream, data, deq_max); - free (data); - if (rv) + if ((rv = quicly_stream_sync_sendbuf (stream, 1)) != 0) return rv; - rv = svm_fifo_dequeue_drop (f, deq_max); - if (rv != deq_max) - { - QUIC_DBG (2, "Not enough data dropped in TX"); - return 1; - } - QUIC_DBG (2, "Sent %u bytes", deq_max); tx_end: quic_send_packets (ctx); @@ -1704,26 +2102,27 @@ quic_find_packet_ctx (u32 * ctx_thread, u32 * ctx_index, h = &quic_main.connection_hash; quic_make_connection_key (&kv, &packet->cid.dest.plaintext); + QUIC_DBG (3, "Searching conn with id %lu %lu", kv.key[0], kv.key[1]); if (clib_bihash_search_16_8 (h, &kv, &kv) == 0) { u32 index = kv.value & UINT32_MAX; - u32 thread_id = kv.value >> 32; + u8 thread_id = kv.value >> 32; /* Check if this connection belongs to this thread, otherwise * ask for it to be moved */ if (thread_id != caller_thread_index) { - QUIC_DBG (3, "Connection is on wrong thread"); + QUIC_DBG (2, "Connection is on wrong thread"); /* Cannot make full check with quicly_is_destination... */ *ctx_index = index; *ctx_thread = thread_id; return -1; } - ctx_ = quic_ctx_get (index); + ctx_ = quic_ctx_get (index, vlib_get_thread_index ()); conn_ = ctx_->c_quic_ctx_id.conn; if (conn_ && quicly_is_destination (conn_, sa, salen, packet)) { - QUIC_DBG (4, "Connection found"); + QUIC_DBG (3, "Connection found"); *ctx_index = index; *ctx_thread = thread_id; return 0; @@ -1739,24 +2138,27 @@ quic_receive (quic_ctx_t * ctx, quicly_conn_t * conn, { int rv; u32 ctx_id = ctx->c_c_index; + u32 thread_index = ctx->c_thread_index; + /* TODO : QUICLY_ERROR_PACKET_IGNORED sould be handled */ rv = quicly_receive (conn, &packet); - if (rv) /* TOOD : QUICLY_ERROR_PACKET_IGNORED sould be handled */ + if (rv) { - QUIC_DBG (1, "Quicly receive ignored packet code : %u", rv); + QUIC_DBG (2, "quicly_receive errored %U", quic_format_err, rv); return 0; } /* ctx pointer may change if a new stream is opened */ - ctx = quic_ctx_get (ctx_id); + ctx = quic_ctx_get (ctx_id, thread_index); /* Conn may be set to null if the connection is terminated */ - if (ctx->c_quic_ctx_id.conn && ctx->conn_state == QUIC_CONN_STATE_HANDSHAKE) + if (ctx->c_quic_ctx_id.conn + && ctx->c_quic_ctx_id.conn_state == QUIC_CONN_STATE_HANDSHAKE) { if (quicly_connection_is_ready (conn)) { - ctx->conn_state = QUIC_CONN_STATE_READY; + ctx->c_quic_ctx_id.conn_state = QUIC_CONN_STATE_READY; if (quicly_is_client (conn)) { - quic_notify_app_connected (ctx); - ctx = quic_ctx_get (ctx_id); + quic_on_client_connected (ctx); + ctx = quic_ctx_get (ctx_id, thread_index); } } } @@ -1766,28 +2168,25 @@ quic_receive (quic_ctx_t * ctx, quicly_conn_t * conn, static int quic_create_quic_session (quic_ctx_t * ctx) { - session_t *quic_session, *quic_listen_session; + session_t *quic_session; app_worker_t *app_wrk; quic_ctx_t *lctx; int rv; quic_session = session_alloc (ctx->c_thread_index); - QUIC_DBG (1, "Created quic session, id %u ctx %u", - quic_session->session_index, ctx->c_c_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->c_quic_ctx_id.listener_ctx_id); + lctx = quic_ctx_get (ctx->c_quic_ctx_id.listener_ctx_id, 0); - quic_listen_session = - listen_session_get_from_handle (lctx->c_quic_ctx_id.quic_session_handle); - quic_session->app_wrk_index = lctx->c_quic_ctx_id.parent_app_wrk_id; + quic_session->app_wrk_index = lctx->parent_app_wrk_id; quic_session->connection_index = ctx->c_c_index; quic_session->session_type = session_type_from_proto_and_ip (TRANSPORT_PROTO_QUIC, ctx->c_quic_ctx_id.udp_is_ip4); - quic_session->listener_index = quic_listen_session->session_index; - quic_session->app_index = quic_main.app_index; + quic_session->listener_handle = lctx->c_s_index; /* TODO: don't alloc fifos when we don't transfer data on this session * but we still need fifos for the events? */ @@ -1797,9 +2196,6 @@ quic_create_quic_session (quic_ctx_t * ctx) session_free (quic_session); return rv; } - ctx->c_quic_ctx_id.quic_session_handle = session_handle (quic_session); - session_lookup_add_connection (&ctx->connection, - session_handle (quic_session)); app_wrk = app_worker_get (quic_session->app_wrk_index); rv = app_worker_accept_notify (app_wrk, quic_session); if (rv) @@ -1812,13 +2208,13 @@ quic_create_quic_session (quic_ctx_t * ctx) static int quic_create_connection (quicly_context_t * quicly_ctx, - u64 udp_session_handle, u32 ctx_index, - struct sockaddr *sa, + 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 (); int rv; /* new connection, accept and create context if packet is valid @@ -1829,26 +2225,26 @@ quic_create_connection (quicly_context_t * quicly_ctx, { /* Invalid packet, pass */ assert (conn == NULL); - QUIC_DBG (2, "Accept failed with %d", rv); + 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; - ctx = quic_ctx_get (ctx_index); + ctx = quic_ctx_get (ctx_index, thread_index); /* Save ctx handle in quicly connection */ - *quicly_get_data (conn) = (void *) (u64) ctx_index; + quic_store_conn_ctx (conn, ctx); ctx->c_quic_ctx_id.conn = conn; - ctx->conn_state = QUIC_CONN_STATE_HANDSHAKE; + ctx->c_quic_ctx_id.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)); - kv.value = ((u64) vlib_get_thread_index ()) << 32 | (u64) ctx_index; + kv.value = ((u64) thread_index) << 32 | (u64) ctx_index; clib_bihash_add_del_16_8 (&quic_main.connection_hash, &kv, 1 /* is_add */ ); - QUIC_DBG (1, "Registering conn with id %lu %lu", kv.key[0], kv.key[1]); + QUIC_DBG (2, "Registering conn with id %lu %lu", kv.key[0], kv.key[1]); return quic_send_packets (ctx); } @@ -1864,6 +2260,7 @@ quic_reset_connection (quicly_context_t * quicly_ctx, u64 udp_session_handle, * reset, then the next CID is highly likely to contain a non-authenticating * CID, ... */ QUIC_DBG (2, "Sending stateless reset"); + int rv; quicly_datagram_t *dgram; session_t *udp_session; if (packet.cid.dest.plaintext.node_id == 0 @@ -1871,8 +2268,14 @@ quic_reset_connection (quicly_context_t * quicly_ctx, u64 udp_session_handle, { dgram = quicly_send_stateless_reset (quicly_ctx, sa, salen, &packet.cid.dest.plaintext); + if (dgram == NULL) + return 1; udp_session = session_get_from_handle (udp_session_handle); - return quic_send_datagram (udp_session, dgram); /* TODO : set event on fifo */ + 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); + return rv; } return 0; } @@ -1890,7 +2293,7 @@ quic_app_rx_callback (session_t * udp_session) struct sockaddr_in6 sa6; struct sockaddr *sa = (struct sockaddr *) &sa6; socklen_t salen; - u32 max_deq, len, full_len, ctx_index, ctx_thread = UINT32_MAX, ret; + u32 max_deq, full_len, ctx_index = UINT32_MAX, ctx_thread = UINT32_MAX, ret; u8 *data; int err; u32 *opening_ctx_pool, *ctx_index_ptr; @@ -1898,7 +2301,6 @@ quic_app_rx_callback (session_t * udp_session) u64 udp_session_handle = session_handle (udp_session); int rv = 0; u32 thread_index = vlib_get_thread_index (); - app = application_get_if_valid (app_index); if (!app) { @@ -1911,52 +2313,44 @@ quic_app_rx_callback (session_t * udp_session) { udp_session = session_get_from_handle (udp_session_handle); /* session alloc might have happened */ f = udp_session->rx_fifo; - svm_fifo_unset_event (f); max_deq = svm_fifo_max_dequeue (f); - if (max_deq < sizeof (session_dgram_hdr_t)) + if (max_deq == 0) return 0; - ret = svm_fifo_peek (f, 0, SESSION_CONN_HDR_LEN, (u8 *) & ph); - if (ret != SESSION_CONN_HDR_LEN) + if (max_deq < SESSION_CONN_HDR_LEN) { - QUIC_DBG (2, "Not enough data for header in RX"); + QUIC_DBG (1, "Not enough data for even a header in RX"); return 1; } - if (ph.data_length < ph.data_offset) + ret = svm_fifo_peek (f, 0, SESSION_CONN_HDR_LEN, (u8 *) & ph); + if (ret != SESSION_CONN_HDR_LEN) { - QUIC_DBG (2, "Not enough data vs offset in RX"); + QUIC_DBG (1, "Not enough data for header in RX"); return 1; } - len = ph.data_length - ph.data_offset; - full_len = ph.data_length + ph.data_offset + SESSION_CONN_HDR_LEN; + ASSERT (ph.data_offset == 0); + full_len = ph.data_length + SESSION_CONN_HDR_LEN; if (full_len > max_deq) { - QUIC_DBG (2, "Not enough data in fifo RX"); + QUIC_DBG (1, "Not enough data in fifo RX"); return 1; } /* Quicly can read len bytes from the fifo at offset: * ph.data_offset + SESSION_CONN_HDR_LEN */ data = malloc (ph.data_length); - ret = - svm_fifo_peek (f, ph.data_offset + SESSION_CONN_HDR_LEN, - ph.data_length, data); + ret = svm_fifo_peek (f, SESSION_CONN_HDR_LEN, ph.data_length, data); if (ret != ph.data_length) { - QUIC_DBG (2, "Not enough data peeked in RX"); - return 1; + QUIC_DBG (1, "Not enough data peeked in RX"); free (data); + return 1; } - plen = - quicly_decode_packet ((quicly_context_t *) app->quicly_ctx, &packet, - data, len); - rv = 0; quic_build_sockaddr (sa, &salen, &ph.rmt_ip, ph.rmt_port, ph.is_ip4); - plen = - quicly_decode_packet ((quicly_context_t *) app->quicly_ctx, &packet, - data, len); + plen = quicly_decode_packet ((quicly_context_t *) app->quicly_ctx, + &packet, data, ph.data_length); if (plen != SIZE_MAX) { @@ -1965,7 +2359,7 @@ quic_app_rx_callback (session_t * udp_session) &packet, thread_index); if (err == 0) { - ctx = quic_ctx_get_w_thread (ctx_index, thread_index); + ctx = quic_ctx_get (ctx_index, thread_index); quic_receive (ctx, ctx->c_quic_ctx_id.conn, packet); } else if (ctx_thread != UINT32_MAX) @@ -1984,13 +2378,12 @@ quic_app_rx_callback (session_t * udp_session) /* *INDENT-OFF* */ pool_foreach (ctx_index_ptr, opening_ctx_pool, ({ - ctx = quic_ctx_get_w_thread (*ctx_index_ptr, thread_index); - if (ctx->c_quic_ctx_id.udp_session_handle == udp_session_handle) + 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 ((quicly_context_t *) app->quicly_ctx, - udp_session_handle, *ctx_index_ptr, - sa, salen, packet); + *ctx_index_ptr, sa, salen, packet); pool_put (opening_ctx_pool, ctx_index_ptr); goto ctx_search_done; } @@ -2005,9 +2398,7 @@ quic_app_rx_callback (session_t * udp_session) } } ctx_search_done: - svm_fifo_dequeue_drop (f, - ph.data_length + ph.data_offset + - SESSION_CONN_HDR_LEN); + svm_fifo_dequeue_drop (f, full_len); free (data); } while (1); @@ -2019,15 +2410,9 @@ quic_common_get_transport_endpoint (quic_ctx_t * ctx, transport_endpoint_t * tep, u8 is_lcl) { session_t *udp_session; - QUIC_DBG (2, "Called quic_get_transport_endpoint"); - if (ctx->c_quic_ctx_id.is_stream) - { - tep->is_ip4 = 255; /* well this is ugly */ - } - else + if (!quic_ctx_is_stream (ctx)) { - udp_session = - session_get_from_handle (ctx->c_quic_ctx_id.udp_session_handle); + udp_session = session_get_from_handle (ctx->udp_session_handle); session_get_endpoint (udp_session, tep, is_lcl); } } @@ -2037,7 +2422,15 @@ quic_get_transport_listener_endpoint (u32 listener_index, transport_endpoint_t * tep, u8 is_lcl) { quic_ctx_t *ctx; - ctx = quic_ctx_get (listener_index); + app_listener_t *app_listener; + session_t *udp_listen_session; + ctx = quic_ctx_get (listener_index, vlib_get_thread_index ()); + if (quic_ctx_is_listener (ctx)) + { + app_listener = app_listener_get_w_handle (ctx->udp_session_handle); + udp_listen_session = app_listener_get_session (app_listener); + return session_get_endpoint (udp_listen_session, tep, is_lcl); + } quic_common_get_transport_endpoint (ctx, tep, is_lcl); } @@ -2046,7 +2439,7 @@ quic_get_transport_endpoint (u32 ctx_index, u32 thread_index, transport_endpoint_t * tep, u8 is_lcl) { quic_ctx_t *ctx; - ctx = quic_ctx_get_w_thread (ctx_index, thread_index); + ctx = quic_ctx_get (ctx_index, thread_index); quic_common_get_transport_endpoint (ctx, tep, is_lcl); } @@ -2067,36 +2460,37 @@ static session_cb_vft_t quic_app_cb_vft = { static const transport_proto_vft_t quic_proto = { .connect = quic_connect, - .close = quic_disconnect, + .close = quic_proto_on_close, .start_listen = quic_start_listen, .stop_listen = quic_stop_listen, .get_connection = quic_connection_get, .get_listener = quic_listener_get, .update_time = quic_update_time, + .app_rx_evt = quic_custom_app_rx_callback, .custom_tx = quic_custom_tx_callback, - .tx_type = TRANSPORT_TX_INTERNAL, - .service_type = TRANSPORT_SERVICE_APP, .format_connection = format_quic_connection, .format_half_open = format_quic_half_open, .format_listener = format_quic_listener, .get_transport_endpoint = quic_get_transport_endpoint, .get_transport_listener_endpoint = quic_get_transport_listener_endpoint, + .transport_options = { + .tx_type = TRANSPORT_TX_INTERNAL, + .service_type = TRANSPORT_SERVICE_APP, + }, }; /* *INDENT-ON* */ static clib_error_t * quic_init (vlib_main_t * vm) { - QUIC_DBG (2, "Called quic_init"); - u32 add_segment_size = (4096ULL << 20) - 1, segment_size = 512 << 20; + u32 segment_size = 256 << 20; vlib_thread_main_t *vtm = vlib_get_thread_main (); tw_timer_wheel_1t_3w_1024sl_ov_t *tw; vnet_app_attach_args_t _a, *a = &_a; u64 options[APP_OPTIONS_N_OPTIONS]; quic_main_t *qm = &quic_main; - u32 fifo_size = 64 << 10; + u32 fifo_size = QUIC_FIFO_SIZE; u32 num_threads, i; - application_t *app; num_threads = 1 /* main thread */ + vtm->n_threads; @@ -2108,7 +2502,7 @@ quic_init (vlib_main_t * vm) a->options = options; a->name = format (0, "quic"); a->options[APP_OPTIONS_SEGMENT_SIZE] = segment_size; - a->options[APP_OPTIONS_ADD_SEGMENT_SIZE] = add_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_FLAGS] = APP_OPTIONS_FLAGS_IS_BUILTIN; @@ -2135,23 +2529,8 @@ quic_init (vlib_main_t * vm) clib_bihash_init_16_8 (&qm->connection_hash, "quic connections", 1024, 4 << 20); - if (!qm->ca_cert_path) - qm->ca_cert_path = QUIC_DEFAULT_CA_CERT_PATH; qm->app_index = a->app_index; - - /* Fake app listener hack, to remove */ - app = application_get (a->app_index); - app_listener_t *fake_app_listener; - pool_get (app->listeners, fake_app_listener); - clib_memset (fake_app_listener, 0, sizeof (*fake_app_listener)); - fake_app_listener->al_index = fake_app_listener - app->listeners; - fake_app_listener->app_index = app->app_index; - fake_app_listener->session_index = SESSION_INVALID_INDEX; - fake_app_listener->local_index = SESSION_INVALID_INDEX; - qm->fake_app_listener_index = fake_app_listener->al_index; - /* End fake listener hack */ - qm->tstamp_ticks_per_clock = vm->clib_time.seconds_per_clock / QUIC_TSTAMP_RESOLUTION;