X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Ftlspicotls%2Ftls_picotls.c;h=17834e3e0516789259d3f0af0b95b7e6de94794b;hb=3cfed05891ca7791e9d8aa8c5ff584de741819f7;hp=6e18551f6d5c3a9d8584d7bc67452824edc117b4;hpb=619179cfcdb087acb0864d273c4fbd3b7396974c;p=vpp.git

diff --git a/src/plugins/tlspicotls/tls_picotls.c b/src/plugins/tlspicotls/tls_picotls.c
index 6e18551f6d5..17834e3e051 100644
--- a/src/plugins/tlspicotls/tls_picotls.c
+++ b/src/plugins/tlspicotls/tls_picotls.c
@@ -2,6 +2,7 @@
 
 #include "certs.h"
 #include "tls_picotls.h"
+#include "pico_vpp_crypto.h"
 
 picotls_main_t picotls_main;
 
@@ -31,7 +32,8 @@ static void
 picotls_ctx_free (tls_ctx_t * ctx)
 {
   picotls_ctx_t *ptls_ctx = (picotls_ctx_t *) ctx;
-  free (ptls_ctx->rx_content);
+  vec_free (ptls_ctx->rx_content);
+  vec_free (ptls_ctx->write_content);
   pool_put_index (picotls_main.ctx_pool[ctx->c_thread_index],
 		  ptls_ctx->ptls_ctx_idx);
 }
@@ -130,7 +132,7 @@ picotls_start_listen (tls_ctx_t * lctx)
   if (!ckpair || !ckpair->cert || !ckpair->key)
     {
       TLS_DBG (1, "tls cert and/or key not configured %d",
-	       ctx->parent_app_wrk_index);
+	       lctx->parent_app_wrk_index);
       return -1;
     }
 
@@ -151,7 +153,7 @@ picotls_start_listen (tls_ctx_t * lctx)
   /* setup protocol related functions */
   ptls_ctx->key_exchanges = key_exchange;
   ptls_ctx->random_bytes = ptls_openssl_random_bytes;
-  ptls_ctx->cipher_suites = ptls_openssl_cipher_suites;
+  ptls_ctx->cipher_suites = ptls_vpp_crypto_cipher_suites;
   ptls_ctx->get_time = &ptls_get_time;
 
   lctx->tls_ssl_ctx = ptls_lctx_idx;
@@ -254,10 +256,10 @@ static inline int
 picotls_ctx_read (tls_ctx_t * ctx, session_t * tls_session)
 {
   picotls_ctx_t *ptls_ctx = (picotls_ctx_t *) ctx;
-  int from_tls_len = 0, to_app_len = 0, crypto_len, ret;
+  int from_tls_len = 0, off, crypto_len, ret;
   u32 deq_max, deq_now;
-  u32 enq_max, enq_now;
-  ptls_buffer_t _buf, *buf = &_buf;
+  u32 enq_max;
+  ptls_buffer_t *buf = &ptls_ctx->read_buffer;
   svm_fifo_t *tls_rx_fifo, *app_rx_fifo;
   session_t *app_session;
 
@@ -266,25 +268,17 @@ picotls_ctx_read (tls_ctx_t * ctx, session_t * tls_session)
   if (!picotls_handshake_is_over (ctx))
     {
       deq_max = svm_fifo_max_dequeue_cons (tls_rx_fifo);
-      deq_now = clib_min (deq_max, svm_fifo_max_read_chunk (tls_rx_fifo));
-      if (!deq_now)
+      if (!deq_max)
 	goto done_hs;
 
-      from_tls_len +=
-	svm_fifo_dequeue (tls_rx_fifo, deq_now, TLS_RX_LEN (ptls_ctx));
-      if (from_tls_len <= 0)
-	{
-	  tls_add_vpp_q_builtin_rx_evt (tls_session);
-	  goto done_hs;
-	}
-      if (from_tls_len < deq_max)
-	{
-	  deq_now = clib_min (svm_fifo_max_read_chunk (tls_rx_fifo),
-			      deq_max - from_tls_len);
-	  from_tls_len += svm_fifo_dequeue (tls_rx_fifo, deq_now,
-					    TLS_RX_LEN (ptls_ctx));
-	}
-      ptls_ctx->rx_len += from_tls_len;
+      vec_validate (ptls_ctx->rx_content, deq_max);
+      ptls_ctx->rx_offset = 0;
+      ptls_ctx->rx_len = 0;
+
+      off = svm_fifo_dequeue (tls_rx_fifo, deq_max, TLS_RX_LEN (ptls_ctx));
+      from_tls_len += off;
+      ptls_ctx->rx_len += off;
+
       picotls_do_handshake (ptls_ctx, tls_session, TLS_RX_OFFSET (ptls_ctx),
 			    from_tls_len);
       if (picotls_handshake_is_over (ctx))
@@ -298,7 +292,11 @@ picotls_ctx_read (tls_ctx_t * ctx, session_t * tls_session)
   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 enq_buf;
+
   ptls_buffer_init (buf, "", 0);
+  ptls_ctx->read_buffer_offset = 0;
 
   if (!TLS_RX_IS_LEFT (ptls_ctx))
     {
@@ -308,35 +306,31 @@ picotls_ctx_read (tls_ctx_t * ctx, session_t * tls_session)
 
       deq_now = clib_min (deq_max, svm_fifo_max_read_chunk (tls_rx_fifo));
 
-      from_tls_len =
-	svm_fifo_dequeue (tls_rx_fifo, deq_now, TLS_RX_LEN (ptls_ctx));
-
-      if (from_tls_len < deq_max)
+      if (PREDICT_FALSE (deq_now < deq_max))
 	{
-	  deq_now =
-	    clib_min (svm_fifo_max_read_chunk (tls_rx_fifo),
-		      deq_max - from_tls_len);
-	  from_tls_len +=
-	    svm_fifo_dequeue (tls_rx_fifo, deq_now, TLS_RX_LEN (ptls_ctx));
+	  off =
+	    svm_fifo_dequeue (tls_rx_fifo, deq_max, TLS_RX_LEN (ptls_ctx));
+	  from_tls_len += off;
+	  ptls_ctx->rx_len += off;
+	}
+      else
+	{
+	  ret =
+	    ptls_receive (ptls_ctx->tls, buf, svm_fifo_head (tls_rx_fifo),
+			  (size_t *) & deq_now);
+	  svm_fifo_dequeue_drop (tls_rx_fifo, deq_now);
+	  goto enq_buf;
 	}
-
-      ptls_ctx->rx_len += from_tls_len;
-
-      if (from_tls_len < deq_max)
-	tls_add_vpp_q_builtin_rx_evt (tls_session);
     }
 
 app_fifo:
 
   enq_max = svm_fifo_max_enqueue_prod (app_rx_fifo);
   if (!enq_max)
-    {
-      tls_add_vpp_q_builtin_rx_evt (tls_session);
-      goto final;
-    }
+    goto final;
 
   crypto_len = clib_min (enq_max, TLS_RX_LEFT_LEN (ptls_ctx));
-  int off = 0;
+  off = 0;
 
   do
     {
@@ -345,25 +339,23 @@ app_fifo:
 	ptls_receive (ptls_ctx->tls, buf,
 		      TLS_RX_OFFSET (ptls_ctx), &consumed);
       off += consumed;
-      ptls_ctx->rx_offset += consumed;
+      ptls_ctx->rx_offset += off;
     }
   while (ret == 0 && off < crypto_len);
 
-  if (ret == 0)
+enq_buf:
+
+  off =
+    svm_fifo_enqueue (app_rx_fifo, TLS_READ_LEFT_LEN (ptls_ctx),
+		      TLS_READ_OFFSET (ptls_ctx));
+  if (off < 0)
     {
-      enq_now = clib_min (buf->off, svm_fifo_max_write_chunk (app_rx_fifo));
-      to_app_len = svm_fifo_enqueue (app_rx_fifo, enq_now, buf->base);
-      if (to_app_len < buf->off)
-	{
-	  enq_now =
-	    clib_min (svm_fifo_max_write_chunk (app_rx_fifo),
-		      buf->off - to_app_len);
-	  to_app_len +=
-	    svm_fifo_enqueue (app_rx_fifo, enq_now, buf->base + to_app_len);
-	}
+      tls_add_vpp_q_builtin_rx_evt (tls_session);
+      return 0;
     }
 
-  if (ptls_ctx->rx_len != 0 && !TLS_RX_IS_LEFT (ptls_ctx))
+  ptls_ctx->read_buffer_offset += off;
+  if (!TLS_RX_IS_LEFT (ptls_ctx))
     {
       ptls_ctx->rx_len = 0;
       ptls_ctx->rx_offset = 0;
@@ -375,24 +367,25 @@ final:
   if (app_session->session_state >= SESSION_STATE_READY)
     tls_notify_app_enqueue (ctx, app_session);
 
-  if (TLS_RX_IS_LEFT (ptls_ctx))
+  if (TLS_RX_IS_LEFT (ptls_ctx) || TLS_READ_IS_LEFT (ptls_ctx)
+      || svm_fifo_max_dequeue (tls_rx_fifo))
     tls_add_vpp_q_builtin_rx_evt (tls_session);
 
   return from_tls_len;
 }
 
 static inline int
-picotls_content_process (ptls_t * tls, svm_fifo_t * src_fifo,
+picotls_content_process (picotls_ctx_t * ptls_ctx, svm_fifo_t * src_fifo,
 			 svm_fifo_t * dst_fifo, int content_len,
 			 int total_record_overhead, int is_no_copy)
 {
-  ptls_buffer_t _buf, *buf = &_buf;
+  ptls_buffer_t *buf = &ptls_ctx->write_buffer;
   int total_length = content_len + total_record_overhead;
   int to_dst_len;
   if (is_no_copy)
     {
       ptls_buffer_init (buf, svm_fifo_tail (dst_fifo), total_length);
-      ptls_send (tls, buf, svm_fifo_head (src_fifo), content_len);
+      ptls_send (ptls_ctx->tls, buf, svm_fifo_head (src_fifo), content_len);
 
       assert (!buf->is_allocated);
       assert (buf->base == svm_fifo_tail (dst_fifo));
@@ -403,19 +396,16 @@ picotls_content_process (ptls_t * tls, svm_fifo_t * src_fifo,
     }
   else
     {
-      uint8_t *buf_content = malloc (total_length);
-      ptls_buffer_init (buf, buf_content, total_length);
+      assert (!TLS_WRITE_IS_LEFT (ptls_ctx));
+      vec_validate (ptls_ctx->write_content, total_length);
+      ptls_buffer_init (buf, ptls_ctx->write_content, total_length);
 
-      ptls_send (tls, buf, svm_fifo_head (src_fifo), content_len);
+      ptls_send (ptls_ctx->tls, buf, svm_fifo_head (src_fifo), content_len);
       svm_fifo_dequeue_drop (src_fifo, content_len);
 
       to_dst_len = svm_fifo_enqueue (dst_fifo, buf->off, buf->base);
-      if (to_dst_len < buf->off)
-	to_dst_len +=
-	  svm_fifo_enqueue (dst_fifo, buf->off - to_dst_len,
-			    buf->base + to_dst_len);
-      ptls_buffer_dispose (buf);
     }
+  ptls_ctx->write_buffer_offset += to_dst_len;
   return to_dst_len;
 }
 
@@ -436,15 +426,42 @@ picotls_ctx_write (tls_ctx_t * ctx, session_t * app_session)
   tls_tx_fifo = tls_session->tx_fifo;
   app_tx_fifo = app_session->tx_fifo;
 
+  if (PREDICT_FALSE (TLS_WRITE_IS_LEFT (ptls_ctx)))
+    {
+      enq_max = svm_fifo_max_enqueue_prod (tls_tx_fifo);
+      int to_write = clib_min (enq_max,
+			       ptls_ctx->write_buffer.off -
+			       ptls_ctx->write_buffer_offset);
+      to_tls_len =
+	svm_fifo_enqueue (tls_tx_fifo, to_write, TLS_WRITE_OFFSET (ptls_ctx));
+      if (to_tls_len < 0)
+	{
+	  tls_add_vpp_q_builtin_tx_evt (app_session);
+	  return 0;
+	}
+      ptls_ctx->write_buffer_offset += to_tls_len;
+
+      if (TLS_WRITE_IS_LEFT (ptls_ctx))
+	{
+	  tls_add_vpp_q_builtin_tx_evt (app_session);
+	  return to_tls_len;
+	}
+      else
+	{
+	  ptls_buffer_init (&ptls_ctx->write_buffer, "", 0);
+	  ptls_ctx->write_buffer_offset = 0;
+	}
+
+    }
+
   deq_max = svm_fifo_max_dequeue_cons (app_tx_fifo);
   if (!deq_max)
     return deq_max;
   deq_now = clib_min (deq_max, svm_fifo_max_read_chunk (app_tx_fifo));
 
   enq_max = svm_fifo_max_enqueue_prod (tls_tx_fifo);
-
     /** There is no engough enqueue space for one record **/
-  if (enq_max < record_overhead)
+  if (enq_max <= record_overhead)
     {
       tls_add_vpp_q_builtin_tx_evt (app_session);
       return 0;
@@ -462,8 +479,6 @@ picotls_ctx_write (tls_ctx_t * ctx, session_t * app_session)
       total_overhead = num_records * record_overhead;
       if (from_app_len + total_overhead > enq_now)
 	from_app_len = enq_now - total_overhead;
-
-
     }
   else
     {
@@ -473,12 +488,16 @@ picotls_ctx_write (tls_ctx_t * ctx, session_t * app_session)
       total_overhead = num_records * record_overhead;
       if (from_app_len + total_overhead > enq_max)
 	from_app_len = enq_max - total_overhead;
-
     }
 
   to_tls_len =
-    picotls_content_process (ptls_ctx->tls, app_tx_fifo, tls_tx_fifo,
+    picotls_content_process (ptls_ctx, app_tx_fifo, tls_tx_fifo,
 			     from_app_len, total_overhead, is_nocopy);
+  if (!TLS_WRITE_IS_LEFT (ptls_ctx))
+    {
+      ptls_ctx->write_buffer_offset = 0;
+      ptls_buffer_init (&ptls_ctx->write_buffer, "", 0);
+    }
 
   if (svm_fifo_needs_deq_ntf (app_tx_fifo, from_app_len))
     session_dequeue_notify (app_session);
@@ -486,7 +505,7 @@ picotls_ctx_write (tls_ctx_t * ctx, session_t * app_session)
   if (to_tls_len)
     tls_add_vpp_q_tx_evt (tls_session);
 
-  if (from_app_len < deq_max)
+  if (from_app_len < deq_max || TLS_WRITE_IS_LEFT (ptls_ctx))
     tls_add_vpp_q_builtin_tx_evt (app_session);
 
   if (ctx->app_closed)
@@ -513,8 +532,7 @@ picotls_ctx_init_server (tls_ctx_t * ctx)
   ptls_ctx->rx_len = 0;
   ptls_ctx->rx_offset = 0;
 
-  ptls_ctx->rx_content = malloc (MAX_QUEUE);
-
+  ptls_ctx->write_buffer_offset = 0;
   return 0;
 }