X-Git-Url: https://gerrit.fd.io/r/gitweb?p=vpp.git;a=blobdiff_plain;f=src%2Fvnet%2Fdevices%2Ftap%2Fcli.c;h=68b8cef2a211834fc89d4feecf03d931f165c05d;hp=42fa8d73f3561b1ddf653247ed76128979702c24;hb=b49bc1ae6;hpb=0ba86cb1bdcc273ebc3d5a92f765639a64894a7a

diff --git a/src/vnet/devices/tap/cli.c b/src/vnet/devices/tap/cli.c
index 42fa8d73f35..68b8cef2a21 100644
--- a/src/vnet/devices/tap/cli.c
+++ b/src/vnet/devices/tap/cli.c
@@ -42,6 +42,7 @@ tap_create_command_fn (vlib_main_t * vm, unformat_input_t * input,
   args.id = ~0;
   args.tap_flags = 0;
   args.rv = -1;
+  args.num_rx_queues = 1;
 
   /* Get a line of input. */
   if (unformat_user (input, unformat_line_input, line_input))
@@ -56,7 +57,8 @@ tap_create_command_fn (vlib_main_t * vm, unformat_input_t * input,
 	  else if (unformat (line_input, "host-ns %s", &args.host_namespace))
 	    ;
 	  else if (unformat (line_input, "host-mac-addr %U",
-			     unformat_ethernet_address, args.host_mac_addr))
+			     unformat_ethernet_address,
+			     args.host_mac_addr.bytes))
 	    ;
 	  else if (unformat (line_input, "host-bridge %s", &args.host_bridge))
 	    ;
@@ -74,6 +76,8 @@ tap_create_command_fn (vlib_main_t * vm, unformat_input_t * input,
 	  else if (unformat (line_input, "host-ip6-gw %U",
 			     unformat_ip6_address, &args.host_ip6_gw))
 	    args.host_ip6_gw_set = 1;
+	  else if (unformat (line_input, "num-rx-queues %d", &tmp))
+	    args.num_rx_queues = tmp;
 	  else if (unformat (line_input, "rx-ring-size %d", &tmp))
 	    args.rx_ring_sz = tmp;
 	  else if (unformat (line_input, "tx-ring-size %d", &tmp))
@@ -86,8 +90,14 @@ tap_create_command_fn (vlib_main_t * vm, unformat_input_t * input,
 	    args.tap_flags &= ~TAP_FLAG_GSO;
 	  else if (unformat (line_input, "gso"))
 	    args.tap_flags |= TAP_FLAG_GSO;
+	  else if (unformat (line_input, "csum-offload"))
+	    args.tap_flags |= TAP_FLAG_CSUM_OFFLOAD;
+	  else if (unformat (line_input, "persist"))
+	    args.tap_flags |= TAP_FLAG_PERSIST;
+	  else if (unformat (line_input, "attach"))
+	    args.tap_flags |= TAP_FLAG_ATTACH;
 	  else if (unformat (line_input, "hw-addr %U",
-			     unformat_ethernet_address, args.mac_addr))
+			     unformat_ethernet_address, args.mac_addr.bytes))
 	    args.mac_addr_set = 1;
 	  else
 	    {
@@ -125,7 +135,8 @@ VLIB_CLI_COMMAND (tap_create_command, static) = {
     "[host-bridge <bridge-name>] [host-ip4-addr <ip4addr/mask>] "
     "[host-ip6-addr <ip6-addr>] [host-ip4-gw <ip4-addr>] "
     "[host-ip6-gw <ip6-addr>] [host-mac-addr <host-mac-address>] "
-    "[host-if-name <name>] [host-mtu-size <size>] [no-gso|gso]",
+    "[host-if-name <name>] [host-mtu-size <size>] [no-gso|gso|csum-offload] "
+    "[persist] [attach]",
   .function = tap_create_command_fn,
 };
 /* *INDENT-ON* */
@@ -179,14 +190,15 @@ VLIB_CLI_COMMAND (tap_delete__command, static) =
 /* *INDENT-ON* */
 
 static clib_error_t *
-tap_gso_command_fn (vlib_main_t * vm, unformat_input_t * input,
-		    vlib_cli_command_t * cmd)
+tap_offload_command_fn (vlib_main_t * vm, unformat_input_t * input,
+			vlib_cli_command_t * cmd)
 {
   unformat_input_t _line_input, *line_input = &_line_input;
   u32 sw_if_index = ~0;
   vnet_main_t *vnm = vnet_get_main ();
-  int enable = 1;
-  int rv;
+  int gso_enable = 0, gso_disable = 0;
+  int csum_offload_enable = 0, csum_offload_disable = 0;
+  int rv = 0;
 
   /* Get a line of input. */
   if (!unformat_user (input, unformat_line_input, line_input))
@@ -199,10 +211,14 @@ tap_gso_command_fn (vlib_main_t * vm, unformat_input_t * input,
       else if (unformat (line_input, "%U", unformat_vnet_sw_interface,
 			 vnm, &sw_if_index))
 	;
-      else if (unformat (line_input, "enable"))
-	enable = 1;
-      else if (unformat (line_input, "disable"))
-	enable = 0;
+      else if (unformat (line_input, "gso-enable"))
+	gso_enable = 1;
+      else if (unformat (line_input, "gso-disable"))
+	gso_disable = 1;
+      else if (unformat (line_input, "csum-offload-enable"))
+	csum_offload_enable = 1;
+      else if (unformat (line_input, "csum-offload-disable"))
+	csum_offload_disable = 1;
       else
 	return clib_error_return (0, "unknown input `%U'",
 				  format_unformat_error, input);
@@ -213,7 +229,15 @@ tap_gso_command_fn (vlib_main_t * vm, unformat_input_t * input,
     return clib_error_return (0,
 			      "please specify interface name or sw_if_index");
 
-  rv = tap_gso_enable_disable (vm, sw_if_index, enable);
+  if (gso_enable)
+    rv = tap_gso_enable_disable (vm, sw_if_index, 1);
+  else if (csum_offload_enable)
+    rv = tap_csum_offload_enable_disable (vm, sw_if_index, 1);
+  else if (gso_disable)
+    rv = tap_gso_enable_disable (vm, sw_if_index, 0);
+  else if (csum_offload_disable)
+    rv = tap_csum_offload_enable_disable (vm, sw_if_index, 0);
+
   if (rv == VNET_API_ERROR_INVALID_SW_IF_INDEX)
     return clib_error_return (0, "not a tap interface");
   else if (rv != 0)
@@ -223,11 +247,12 @@ tap_gso_command_fn (vlib_main_t * vm, unformat_input_t * input,
 }
 
 /* *INDENT-OFF* */
-VLIB_CLI_COMMAND (tap_gso__command, static) =
+VLIB_CLI_COMMAND (tap_offload_command, static) =
 {
-  .path = "set tap gso",
-  .short_help = "set tap gso {<interface> | sw_if_index <sw_idx>} <enable|disable>",
-  .function = tap_gso_command_fn,
+  .path = "set tap offload",
+  .short_help = "set tap offload {<interface> | sw_if_index <sw_idx>}"
+    " <gso-enable | gso-disable | csum-offload-enable | csum-offload-disable>",
+  .function = tap_offload_command_fn,
 };
 /* *INDENT-ON* */