X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fflow%2Fflow_cli.c;h=772f89a9b247e183d6c55bef6713c66dae3a4f58;hb=24e2c50bf34af37b688df83cd8d39a58345349c5;hp=1c09b2b61497446314c3d9b5e1c4096c4fd6b4a1;hpb=bf85a98fbf7622dc177ce3901f5b3cfd954b015a;p=vpp.git

diff --git a/src/vnet/flow/flow_cli.c b/src/vnet/flow/flow_cli.c
index 1c09b2b6149..772f89a9b24 100644
--- a/src/vnet/flow/flow_cli.c
+++ b/src/vnet/flow/flow_cli.c
@@ -294,6 +294,10 @@ test_flow (vlib_main_t * vm, unformat_input_t * input,
   ip6_address_and_mask_t inner_ip6d = { };
   ip_port_and_mask_t sport = { };
   ip_port_and_mask_t dport = { };
+  u16 eth_type;
+  bool ethernet_set = false;
+  u8 *rss_type[3] = { };
+  u8 *type_str = NULL;
 
   clib_memset (&flow, 0, sizeof (vnet_flow_t));
   flow.index = ~0;
@@ -312,6 +316,9 @@ test_flow (vlib_main_t * vm, unformat_input_t * input,
 	action = FLOW_ENABLE;
       else if (unformat (line_input, "disable"))
 	action = FLOW_DISABLE;
+      else if (unformat (line_input, "eth-type %U",
+			 unformat_ethernet_type_host_byte_order, &eth_type))
+	ethernet_set = true;
       else if (unformat (line_input, "src-ip %U",
 			 unformat_ip4_address_and_mask, &ip4s))
 	outer_ip4_set = true;
@@ -336,7 +343,6 @@ test_flow (vlib_main_t * vm, unformat_input_t * input,
       else if (unformat (line_input, "inner-ip6-dst-ip %U",
 			 unformat_ip6_address_and_mask, &inner_ip6d))
 	inner_ip6_set = true;
-
       else if (unformat (line_input, "src-port %U", unformat_ip_port_and_mask,
 			 &sport))
 	;
@@ -366,6 +372,65 @@ test_flow (vlib_main_t * vm, unformat_input_t * input,
 	flow.actions |= VNET_FLOW_ACTION_REDIRECT_TO_QUEUE;
       else if (unformat (line_input, "drop"))
 	flow.actions |= VNET_FLOW_ACTION_DROP;
+      else if (unformat (line_input, "rss function"))
+	{
+	  if (0)
+	    ;
+#undef _
+#define _(f, s)                                 \
+        else if (unformat (line_input, s)) \
+          flow.rss_fun = VNET_RSS_FUNC_##f;
+
+	  foreach_rss_function
+#undef _
+	    else
+	    {
+	      return clib_error_return (0, "unknown input `%U'",
+					format_unformat_error, line_input);
+	    }
+
+	  flow.actions |= VNET_FLOW_ACTION_RSS;
+	}
+      else if (unformat (line_input, "rss types"))
+	{
+	  rss_type[0] = NULL;
+	  rss_type[1] = NULL;
+	  rss_type[2] = NULL;
+	  type_str = NULL;
+
+	  if (unformat (line_input, "%s use %s and %s",
+			&rss_type[0], &rss_type[1], &rss_type[2]))
+	    ;
+	  else
+	    if (unformat
+		(line_input, "%s use %s", &rss_type[0], &rss_type[1]))
+	    ;
+	  else if (unformat (line_input, "%s", &rss_type[0]))
+	    ;
+
+#undef _
+#define _(a,b,c)     \
+        else if (!clib_strcmp(c, (const char *)type_str)) \
+          flow.rss_types |= (1ULL<<a);
+
+#define check_rss_types(_str)     \
+        if (_str != NULL) {\
+          type_str = _str;\
+          if (0) \
+	          ; \
+          foreach_flow_rss_types \
+          else \
+          { \
+            return clib_error_return (0, "parse error: '%U'", \
+              format_unformat_error, line_input); \
+          } \
+        }
+
+	  check_rss_types (rss_type[0])
+	    check_rss_types (rss_type[1]) check_rss_types (rss_type[2])
+#undef _
+	    flow.actions |= VNET_FLOW_ACTION_RSS;
+	}
       else if (unformat (line_input, "%U", unformat_vnet_hw_interface, vnm,
 			 &hw_if_index))
 	;
@@ -390,6 +455,8 @@ test_flow (vlib_main_t * vm, unformat_input_t * input,
 	return clib_error_return (0, "Please specify at least one action");
 
       /* Adjust the flow type */
+      if (ethernet_set == true)
+	outer_type = VNET_FLOW_TYPE_ETHERNET;
       if (outer_ip4_set == true)
 	outer_type = VNET_FLOW_TYPE_IP4_N_TUPLE;
       else if (outer_ip6_set == true)
@@ -402,7 +469,9 @@ test_flow (vlib_main_t * vm, unformat_input_t * input,
       if (outer_type == VNET_FLOW_TYPE_UNKNOWN)
 	return clib_error_return (0, "Please specify a supported flow type");
 
-      if (outer_type == VNET_FLOW_TYPE_IP4_N_TUPLE)
+      if (outer_type == VNET_FLOW_TYPE_ETHERNET)
+	type = VNET_FLOW_TYPE_ETHERNET;
+      else if (outer_type == VNET_FLOW_TYPE_IP4_N_TUPLE)
 	{
 	  type = VNET_FLOW_TYPE_IP4_N_TUPLE;
 
@@ -450,6 +519,11 @@ test_flow (vlib_main_t * vm, unformat_input_t * input,
       //assign specific field values per flow type
       switch (type)
 	{
+	case VNET_FLOW_TYPE_ETHERNET:
+	  memset (&flow.ethernet, 0, sizeof (flow.ethernet));
+	  flow.ethernet.eth_hdr.type = eth_type;
+	  break;
+
 	case VNET_FLOW_TYPE_IP4_N_TUPLE:
 	case VNET_FLOW_TYPE_IP4_GTPC:
 	case VNET_FLOW_TYPE_IP4_GTPU:
@@ -532,7 +606,7 @@ test_flow (vlib_main_t * vm, unformat_input_t * input,
 
 	  if (flow.ip6_n_tuple.protocol == (ip_protocol_t) ~ 0)
 	    return clib_error_return (0, "Please specify ip protocol");
-	  if ((type != VNET_FLOW_TYPE_IP4_N_TUPLE) &&
+	  if ((type != VNET_FLOW_TYPE_IP6_N_TUPLE) &&
 	      (flow.ip6_n_tuple.protocol != IP_PROTOCOL_UDP))
 	    return clib_error_return (0,
 				      "For GTP related flow, ip protocol must be UDP");