X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fdevices%2Ftap%2Fcli.c;h=40086a588aa1c0f9e8a352709cc1727c6e0fe221;hb=206acf84d;hp=c74d24a12a9f891fc849bf92a2ba21769ac2cb01;hpb=97d54ed43eb69f6ea731c02305ebe0ca0b1a5cc4;p=vpp.git diff --git a/src/vnet/devices/tap/cli.c b/src/vnet/devices/tap/cli.c index c74d24a12a9..40086a588aa 100644 --- a/src/vnet/devices/tap/cli.c +++ b/src/vnet/devices/tap/cli.c @@ -37,9 +37,12 @@ tap_create_command_fn (vlib_main_t * vm, unformat_input_t * input, unformat_input_t _line_input, *line_input = &_line_input; tap_create_if_args_t args = { 0 }; int ip_addr_set = 0; + u32 tmp; 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)) @@ -54,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)) ; @@ -72,10 +76,12 @@ 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, "rx-ring-size %d", &args.rx_ring_sz)) - ; - else if (unformat (line_input, "tx-ring-size %d", &args.tx_ring_sz)) - ; + 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)) + args.tx_ring_sz = tmp; else if (unformat (line_input, "host-mtu-size %d", &args.host_mtu_size)) @@ -84,8 +90,16 @@ 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, "tun")) + args.tap_flags |= TAP_FLAG_TUN; 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 { @@ -103,6 +117,10 @@ tap_create_command_fn (vlib_main_t * vm, unformat_input_t * input, tap_create_if (vm, &args); + if (!args.rv) + vlib_cli_output (vm, "%U\n", format_vnet_sw_if_index_name, + vnet_get_main (), args.sw_if_index); + vec_free (args.host_if_name); vec_free (args.host_namespace); vec_free (args.host_bridge); @@ -119,7 +137,8 @@ VLIB_CLI_COMMAND (tap_create_command, static) = { "[host-bridge ] [host-ip4-addr ] " "[host-ip6-addr ] [host-ip4-gw ] " "[host-ip6-gw ] [host-mac-addr ] " - "[host-if-name ] [host-mtu-size ] [no-gso|gso]", + "[host-if-name ] [host-mtu-size ] [no-gso|gso|csum-offload] " + "[persist] [attach] [tun]", .function = tap_create_command_fn, }; /* *INDENT-ON* */ @@ -173,14 +192,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)) @@ -193,10 +213,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); @@ -207,7 +231,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) @@ -217,11 +249,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 { | sw_if_index } ", - .function = tap_gso_command_fn, + .path = "set tap offload", + .short_help = "set tap offload { | sw_if_index }" + " ", + .function = tap_offload_command_fn, }; /* *INDENT-ON* */ @@ -275,6 +308,56 @@ VLIB_CLI_COMMAND (tap_show_command, static) = { }; /* *INDENT-ON* */ +static clib_error_t * +tun_show_command_fn (vlib_main_t * vm, unformat_input_t * input, + vlib_cli_command_t * cmd) +{ + virtio_main_t *mm = &virtio_main; + virtio_if_t *vif; + vnet_main_t *vnm = vnet_get_main (); + int show_descr = 0; + clib_error_t *error = 0; + u32 hw_if_index, *hw_if_indices = 0; + + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat + (input, "%U", unformat_vnet_hw_interface, vnm, &hw_if_index)) + vec_add1 (hw_if_indices, hw_if_index); + else if (unformat (input, "descriptors")) + show_descr = 1; + else + { + error = clib_error_return (0, "unknown input `%U'", + format_unformat_error, input); + goto done; + } + } + + if (vec_len (hw_if_indices) == 0) + { + /* *INDENT-OFF* */ + pool_foreach (vif, mm->interfaces, + vec_add1 (hw_if_indices, vif->hw_if_index); + ); + /* *INDENT-ON* */ + } + + virtio_show (vm, hw_if_indices, show_descr, VIRTIO_IF_TYPE_TUN); + +done: + vec_free (hw_if_indices); + return error; +} + +/* *INDENT-OFF* */ +VLIB_CLI_COMMAND (tun_show_command, static) = { + .path = "show tun", + .short_help = "show tun {] [descriptors]", + .function = tun_show_command_fn, +}; +/* *INDENT-ON* */ + clib_error_t * tap_cli_init (vlib_main_t * vm) {