diff options
| -rw-r--r-- | src/plugins/tlspicotls/tls_picotls.c | 182 |
1 files changed, 113 insertions, 69 deletions
diff --git a/src/plugins/tlspicotls/tls_picotls.c b/src/plugins/tlspicotls/tls_picotls.c index 84c6d789928..ba1fdd8c05c 100644 --- a/src/plugins/tlspicotls/tls_picotls.c +++ b/src/plugins/tlspicotls/tls_picotls.c @@ -302,19 +302,120 @@ ptls_copy_buf_to_fs (ptls_buffer_t *buf, u32 to_copy, svm_fifo_seg_t *fs, return to_copy; } +static u32 +ptls_tcp_to_app_write (picotls_ctx_t *ptls_ctx, svm_fifo_t *app_rx_fifo, + svm_fifo_t *tcp_rx_fifo) +{ + u32 ai = 0, thread_index, min_buf_len, to_copy, left, wrote = 0; + ptls_buffer_t *buf = &ptls_ctx->read_buffer; + int ret, i = 0, read = 0, tcp_len, n_fs_app; + const int n_segs = 4, max_len = 1 << 16; + svm_fifo_seg_t tcp_fs[n_segs], app_fs[n_segs]; + picotls_main_t *pm = &picotls_main; + uword deq_now; + u8 is_nocopy; + + thread_index = ptls_ctx->ctx.c_thread_index; + + n_fs_app = svm_fifo_provision_chunks (app_rx_fifo, app_fs, n_segs, max_len); + if (n_fs_app <= 0) + return 0; + + tcp_len = svm_fifo_segments (tcp_rx_fifo, 0, tcp_fs, n_segs, max_len); + if (tcp_len <= 0) + return 0; + + if (ptls_ctx->read_buffer_offset) + { + to_copy = buf->off - ptls_ctx->read_buffer_offset; + left = ptls_copy_buf_to_fs (buf, to_copy, app_fs, &ai, n_fs_app); + wrote += to_copy - left; + if (left) + { + ptls_ctx->read_buffer_offset = buf->off - left; + goto do_checks; + } + ptls_ctx->read_buffer_offset = 0; + } + + while (ai < n_fs_app && read < tcp_len) + { + deq_now = clib_min (tcp_fs[i].len, tcp_len - read); + min_buf_len = deq_now + (16 << 10); + is_nocopy = app_fs[ai].len < min_buf_len ? 0 : 1; + if (is_nocopy) + { + ptls_buffer_init (buf, app_fs[ai].data, app_fs[ai].len); + ret = ptls_receive (ptls_ctx->tls, buf, tcp_fs[i].data, &deq_now); + assert (ret == 0 || ret == PTLS_ERROR_IN_PROGRESS); + + wrote += buf->off; + if (buf->off == app_fs[ai].len) + { + ai++; + } + else + { + app_fs[ai].len -= buf->off; + app_fs[ai].data += buf->off; + } + } + else + { + vec_validate (pm->rx_bufs[thread_index], min_buf_len); + ptls_buffer_init (buf, pm->rx_bufs[thread_index], min_buf_len); + ret = ptls_receive (ptls_ctx->tls, buf, tcp_fs[i].data, &deq_now); + assert (ret == 0 || ret == PTLS_ERROR_IN_PROGRESS); + + left = ptls_copy_buf_to_fs (buf, buf->off, app_fs, &ai, n_fs_app); + if (!left) + { + ptls_ctx->read_buffer_offset = 0; + wrote += buf->off; + } + else + { + ptls_ctx->read_buffer_offset = buf->off - left; + wrote += ptls_ctx->read_buffer_offset; + } + } + + assert (deq_now <= tcp_fs[i].len); + read += deq_now; + if (deq_now < tcp_fs[i].len) + { + tcp_fs[i].data += deq_now; + tcp_fs[i].len -= deq_now; + } + else + i++; + } + +do_checks: + + if (read) + { + svm_fifo_dequeue_drop (tcp_rx_fifo, read); + if (svm_fifo_needs_deq_ntf (tcp_rx_fifo, read)) + { + svm_fifo_clear_deq_ntf (tcp_rx_fifo); + session_send_io_evt_to_thread (tcp_rx_fifo, SESSION_IO_EVT_RX); + } + } + + if (wrote) + svm_fifo_enqueue_nocopy (app_rx_fifo, wrote); + + return wrote; +} + static inline int picotls_ctx_read (tls_ctx_t *ctx, session_t *tcp_session) { picotls_ctx_t *ptls_ctx = (picotls_ctx_t *) ctx; - ptls_buffer_t *buf = &ptls_ctx->read_buffer; - int off = 0, ret, i = 0, read = 0, len; - const int n_segs = 4, max_len = 32768; - svm_fifo_t *tcp_rx_fifo, *app_rx_fifo; - picotls_main_t *pm = &picotls_main; - svm_fifo_seg_t fs[n_segs]; + svm_fifo_t *tcp_rx_fifo; session_t *app_session; - u32 thread_index; - uword deq_now; + int wrote; if (PREDICT_FALSE (!ptls_handshake_is_complete (ptls_ctx->tls))) { @@ -342,72 +443,15 @@ picotls_ctx_read (tls_ctx_t *ctx, session_t *tcp_session) tcp_rx_fifo = tcp_session->rx_fifo; app_session = session_get_from_handle (ctx->app_session_handle); - app_rx_fifo = app_session->rx_fifo; - - if (TLS_READ_IS_LEFT (ptls_ctx)) - goto do_enq; + wrote = ptls_tcp_to_app_write (ptls_ctx, app_session->rx_fifo, tcp_rx_fifo); - len = svm_fifo_segments (tcp_rx_fifo, 0, fs, n_segs, max_len); - if (len <= 0) - goto final_checks; - - thread_index = ptls_ctx->ctx.c_thread_index; - vec_validate (pm->rx_bufs[thread_index], 2 * max_len); - ptls_buffer_init (buf, pm->rx_bufs[thread_index], 2 * max_len); - ptls_ctx->read_buffer_offset = 0; - - while (read < len && i < n_segs) - { - deq_now = fs[i].len; - ret = ptls_receive (ptls_ctx->tls, buf, fs[i].data, &deq_now); - ASSERT (ret == 0 || ret == PTLS_ERROR_IN_PROGRESS); - read += deq_now; - if (deq_now < fs[i].len) - { - fs[i].data += deq_now; - fs[i].len -= deq_now; - } - else - i++; - } - - if (read) - svm_fifo_dequeue_drop (tcp_rx_fifo, read); - - if (!TLS_READ_LEFT_LEN (ptls_ctx)) - { - ptls_buffer_dispose (buf); - goto final_checks; - } - -do_enq: - - len = TLS_READ_LEFT_LEN (ptls_ctx); - off = svm_fifo_enqueue (app_rx_fifo, len, TLS_READ_OFFSET (ptls_ctx)); - if (off != len) - { - if (off < 0) - { - off = 0; - goto final_checks; - } - ptls_ctx->read_buffer_offset += off; - } - else - { - buf->off = 0; - ptls_ctx->read_buffer_offset = 0; - } - - if (app_session->session_state >= SESSION_STATE_READY) + if (wrote && app_session->session_state >= SESSION_STATE_READY) tls_notify_app_enqueue (ctx, app_session); -final_checks: - - if (TLS_READ_IS_LEFT (ptls_ctx) || svm_fifo_max_dequeue (tcp_rx_fifo)) + if (ptls_ctx->read_buffer_offset || svm_fifo_max_dequeue (tcp_rx_fifo)) tls_add_vpp_q_builtin_rx_evt (tcp_session); - return off; + return wrote; } static inline u32 |