quic: stream reset improvement

- quic_quicly_on_receive_reset send reset notification to app
- handle app reset
- implement quic_quicly_on_stop_sending
- use attribute api to set/get app proto error code
- reset stream only when app asked

Type: improvement

Change-Id: I82d165e5c9541406336ac9a2a33f64da28266f9b
Signed-off-by: Matus Fabian <matfabia@cisco.com>

Author: matfabia-cisco

src/plugins/hs_apps/hs_test.h

@@ -47,11 +47,19 @@ typedef enum
   HS_TEST_TYPE_EXIT_CLIENT,
 } hs_test_t;
 
+typedef enum
+{
+  HS_TEST_PARAM_NONE,
+  HS_TEST_PARAM_SERVER_RST_STREAM,
+  HS_TEST_PARAM_CLIENT_RST_STREAM,
+} hs_test_param_t;
+
 typedef struct __attribute__ ((packed))
 {
   uint32_t magic;
   uint32_t seq_num;
   uint32_t test;
+  uint32_t test_param;
   uint32_t cmd;
   uint32_t ctrl_handle;
   uint32_t num_test_sessions;
@@ -87,6 +95,28 @@ hs_test_type_str (hs_test_t t)
     case HS_TEST_TYPE_EXIT:
       return "EXIT";
 
+    case HS_TEST_TYPE_EXIT_CLIENT:
+      return "EXIT-CLIENT";
+
+    default:
+      return "Unknown";
+    }
+}
+
+static inline char *
+hs_test_param_str (hs_test_param_t p)
+{
+  switch (p)
+    {
+    case HS_TEST_PARAM_NONE:
+      return "NONE";
+
+    case HS_TEST_PARAM_SERVER_RST_STREAM:
+      return "SERVER-RST-STREAM";
+
+    case HS_TEST_PARAM_CLIENT_RST_STREAM:
+      return "CLIENT-RST-STREAM";
+
     default:
       return "Unknown";
     }
@@ -147,6 +177,7 @@ hs_test_cfg_dump (hs_test_cfg_t *cfg, uint8_t is_client)
 	  "               seq_num:  0x%08x\n"
 	  "            test bytes:  %s\n"
 	  "%-5s             test:  %s (%d)\n"
+	  "  additional parameter:  %s (%d)\n"
 	  "           ctrl handle:  %d (0x%x)\n"
 	  "%-5s num test sockets:  %u (0x%08x)\n"
 	  "%-5s          verbose:  %s (%d)\n"
@@ -157,12 +188,13 @@ hs_test_cfg_dump (hs_test_cfg_t *cfg, uint8_t is_client)
 	  (void *) cfg, hs_test_cmd_to_str (cfg->cmd), cfg->magic,
 	  cfg->seq_num, cfg->test_bytes ? "yes" : "no",
 	  is_client && (cfg->test == HS_TEST_TYPE_UNI) ?
-		  "'" HS_TEST_TOKEN_RUN_UNI "'" :
+	    "'" HS_TEST_TOKEN_RUN_UNI "'" :
 	  is_client && (cfg->test == HS_TEST_TYPE_BI) ?
-		  "'" HS_TEST_TOKEN_RUN_BI "'" :
-		  spc,
-	  hs_test_type_str (cfg->test), cfg->test, cfg->ctrl_handle,
-	  cfg->ctrl_handle,
+	    "'" HS_TEST_TOKEN_RUN_BI "'" :
+	    spc,
+	  hs_test_type_str (cfg->test), cfg->test,
+	  hs_test_param_str (cfg->test_param), cfg->test_param,
+	  cfg->ctrl_handle, cfg->ctrl_handle,
 	  is_client ? "'" VCL_TEST_TOKEN_NUM_TEST_SESS "'" : spc,
 	  cfg->num_test_sessions, cfg->num_test_sessions,
 	  is_client ? "'" VCL_TEST_TOKEN_VERBOSE "'" : spc,

src/plugins/hs_apps/vcl/vcl_test.h

@@ -60,6 +60,7 @@ typedef struct
   uint64_t tx_bytes;
   uint32_t tx_eagain;
   uint32_t tx_incomp;
+  uint32_t reset_count; /* received reset from vpp */
   struct timespec start;
   struct timespec stop;
 } vcl_test_stats_t;
@@ -150,6 +151,7 @@ vcl_test_stats_accumulate (vcl_test_stats_t * accum, vcl_test_stats_t * incr)
   accum->tx_bytes += incr->tx_bytes;
   accum->tx_eagain += incr->tx_eagain;
   accum->tx_incomp += incr->tx_incomp;
+  accum->reset_count += incr->reset_count;
 }
 
 static inline void
@@ -246,6 +248,7 @@ vcl_test_stats_dump (char *header, vcl_test_stats_t * stats,
 	      stats->rx_bytes, stats->rx_bytes, stats->rx_eagain,
 	      stats->rx_eagain, stats->rx_incomp, stats->rx_incomp);
     }
+  printf ("    reset count:  %u\n", stats->reset_count);
   if (verbose)
     printf ("   start.tv_sec:  %ld\n"
 	    "  start.tv_nsec:  %ld\n"
@@ -328,6 +331,7 @@ static inline int
 vcl_test_reset_nop (vcl_test_session_t *ts)
 {
   /* just signal that this was not expected (error) */
+  ts->stats.reset_count = 1;
   return 1;
 }
 

src/plugins/hs_apps/vcl/vcl_test_client.c

@@ -644,13 +644,13 @@ vtc_worker_run_epoll (vcl_test_client_worker_t *wrk)
 	}
 
       rv = ts->write (ts, ts->txbuf, ts->cfg.txbuf_size);
+      if (ts->done (ts, check_rx))
+	n_active_sessions -= 1;
       next = ts->next;
       if (rv > 0)
 	{
 	  if (vcm->incremental_stats)
 	    vtc_worker_inc_stats_check (wrk, ts);
-	  if (ts->done (ts, check_rx))
-	    n_active_sessions -= 1;
 	}
       else if (rv == 0)
 	{
@@ -1036,33 +1036,45 @@ parse_input ()
   return rv;
 }
 
+static int
+vtc_unformat_test_param (uint32_t *test_param, char *test_param_str)
+{
+  if (!strcmp (test_param_str, "server-rst-stream"))
+    *test_param = HS_TEST_PARAM_SERVER_RST_STREAM;
+  else if (!strcmp (test_param_str, "client-rst-stream"))
+    *test_param = HS_TEST_PARAM_CLIENT_RST_STREAM;
+  else
+    return 1;
+  return 0;
+}
+
 void
 print_usage_and_exit (void)
 {
-  fprintf (
-    stderr,
-    "vcl_test_client [OPTIONS] <ipaddr> <port>\n"
-    "  OPTIONS\n"
-    "  -h               Print this message and exit.\n"
-    "  -6               Use IPv6\n"
-    "  -c               Print test config before test.\n"
-    "  -w <dir>         Write test results to <dir>.\n"
-    "  -X               Exit after running test.\n"
-    "  -p <proto>       Use <proto> transport layer\n"
-    "  -D               Use UDP transport layer\n"
-    "  -L               Use TLS transport layer\n"
-    "  -E               Run Echo test.\n"
-    "  -N <num-writes>  Test Cfg: number of writes.\n"
-    "  -R <rxbuf-size>  Test Cfg: rx buffer size.\n"
-    "  -T <txbuf-size>  Test Cfg: tx buffer size.\n"
-    "  -U               Run Uni-directional test.\n"
-    "  -B               Run Bi-directional test.\n"
-    "  -b <bytes>       Total number of bytes transferred\n"
-    "  -V               Verbose mode.\n"
-    "  -I <N>           Use N sessions.\n"
-    "  -s <N>           Use N sessions.\n"
-    "  -S	       	Print incremental stats per session.\n"
-    "  -q <n>           QUIC : use N Ssessions on top of n Qsessions\n");
+  fprintf (stderr,
+	   "vcl_test_client [OPTIONS] <ipaddr> <port>\n"
+	   "  OPTIONS\n"
+	   "  -h               Print this message and exit.\n"
+	   "  -6               Use IPv6\n"
+	   "  -c               Print test config before test.\n"
+	   "  -w <dir>         Write test results to <dir>.\n"
+	   "  -X               Exit after running test.\n"
+	   "  -p <proto>       Use <proto> transport layer\n"
+	   "  -D               Use UDP transport layer\n"
+	   "  -L               Use TLS transport layer\n"
+	   "  -E               Run Echo test.\n"
+	   "  -N <num-writes>  Test Cfg: number of writes.\n"
+	   "  -R <rxbuf-size>  Test Cfg: rx buffer size.\n"
+	   "  -T <txbuf-size>  Test Cfg: tx buffer size.\n"
+	   "  -U               Run Uni-directional test.\n"
+	   "  -B               Run Bi-directional test.\n"
+	   "  -b <bytes>       Total number of bytes transferred\n"
+	   "  -V               Verbose mode.\n"
+	   "  -I <N>           Use N sessions.\n"
+	   "  -s <N>           Use N sessions.\n"
+	   "  -S               Print incremental stats per session.\n"
+	   "  -q <n>           QUIC : use N Ssessions on top of n Qsessions\n"
+	   "  -t <test-param>  QUIC : additional test parameter\n");
   exit (1);
 }
 
@@ -1073,7 +1085,7 @@ vtc_process_opts (vcl_test_client_main_t * vcm, int argc, char **argv)
   int c, v;
 
   opterr = 0;
-  while ((c = getopt (argc, argv, "chnp:w:xXE:I:N:R:T:b:UBV6DLs:q:S")) != -1)
+  while ((c = getopt (argc, argv, "chnp:w:xXE:I:N:R:T:b:UBV6DLs:q:St:")) != -1)
     switch (c)
       {
       case 'c':
@@ -1251,6 +1263,14 @@ vtc_process_opts (vcl_test_client_main_t * vcm, int argc, char **argv)
 	vcm->incremental_stats = 1;
 	break;
 
+      case 't':
+	if (vtc_unformat_test_param (&ctrl->cfg.test_param, optarg))
+	  {
+	    vtwrn ("Invalid value for option -%c!", c);
+	    print_usage_and_exit ();
+	  }
+	break;
+
       case '?':
 	switch (optopt)
 	  {
@@ -1262,6 +1282,7 @@ vtc_process_opts (vcl_test_client_main_t * vcm, int argc, char **argv)
 	  case 'w':
 	  case 'p':
 	  case 'q':
+	  case 't':
 	    vtwrn ("Option -%c requires an argument.", optopt);
 	    break;