X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fdevices%2Ftap%2Fcli.c;h=40086a588aa1c0f9e8a352709cc1727c6e0fe221;hb=206acf84d;hp=c17599afdadc9d5dca9aaf5cbaa253b0bed89fbf;hpb=7866c4595b65f54f491ffc4e92b1f8cf94d6f142;p=vpp.git diff --git a/src/vnet/devices/tap/cli.c b/src/vnet/devices/tap/cli.c index c17599afdad..40086a588aa 100644 --- a/src/vnet/devices/tap/cli.c +++ b/src/vnet/devices/tap/cli.c @@ -37,8 +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)) @@ -53,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)) ; @@ -71,12 +76,30 @@ 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)) + args.host_mtu_set = 1; + else if (unformat (line_input, "no-gso")) + 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 { @@ -94,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); @@ -109,7 +136,9 @@ VLIB_CLI_COMMAND (tap_create_command, static) = { "[rx-ring-size ] [tx-ring-size ] [host-ns ] " "[host-bridge ] [host-ip4-addr ] " "[host-ip6-addr ] [host-ip4-gw ] " - "[host-ip6-gw ] [host-if-name ]", + "[host-ip6-gw ] [host-mac-addr ] " + "[host-if-name ] [host-mtu-size ] [no-gso|gso|csum-offload] " + "[persist] [attach] [tun]", .function = tap_create_command_fn, }; /* *INDENT-ON* */ @@ -162,6 +191,73 @@ VLIB_CLI_COMMAND (tap_delete__command, static) = }; /* *INDENT-ON* */ +static clib_error_t * +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 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)) + return clib_error_return (0, "Missing "); + + while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (line_input, "sw_if_index %d", &sw_if_index)) + ; + else if (unformat (line_input, "%U", unformat_vnet_sw_interface, + vnm, &sw_if_index)) + ; + 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); + } + unformat_free (line_input); + + if (sw_if_index == ~0) + return clib_error_return (0, + "please specify interface name or sw_if_index"); + + 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) + return clib_error_return (0, "error on configuring GSO on tap interface"); + + return 0; +} + +/* *INDENT-OFF* */ +VLIB_CLI_COMMAND (tap_offload_command, static) = +{ + .path = "set tap offload", + .short_help = "set tap offload { | sw_if_index }" + " ", + .function = tap_offload_command_fn, +}; +/* *INDENT-ON* */ + static clib_error_t * tap_show_command_fn (vlib_main_t * vm, unformat_input_t * input, vlib_cli_command_t * cmd) @@ -172,29 +268,6 @@ tap_show_command_fn (vlib_main_t * vm, unformat_input_t * input, int show_descr = 0; clib_error_t *error = 0; u32 hw_if_index, *hw_if_indices = 0; - virtio_vring_t *vring; - int i, j; - struct feat_struct - { - u8 bit; - char *str; - }; - struct feat_struct *feat_entry; - - static struct feat_struct feat_array[] = { -#define _(s,b) { .str = #s, .bit = b, }, - foreach_virtio_net_features -#undef _ - {.str = NULL} - }; - - struct feat_struct *flag_entry; - static struct feat_struct flags_array[] = { -#define _(b,e,s) { .bit = b, .str = s, }, - foreach_virtio_if_flag -#undef _ - {.str = NULL} - }; while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) { @@ -220,80 +293,8 @@ tap_show_command_fn (vlib_main_t * vm, unformat_input_t * input, /* *INDENT-ON* */ } - for (hw_if_index = 0; hw_if_index < vec_len (hw_if_indices); hw_if_index++) - { - vnet_hw_interface_t *hi = - vnet_get_hw_interface (vnm, hw_if_indices[hw_if_index]); - vif = pool_elt_at_index (mm->interfaces, hi->dev_instance); - vlib_cli_output (vm, "interface %U", format_vnet_sw_if_index_name, - vnm, vif->sw_if_index); - if (vif->host_if_name) - vlib_cli_output (vm, " name \"%s\"", vif->host_if_name); - if (vif->net_ns) - vlib_cli_output (vm, " host-ns \"%s\"", vif->net_ns); - vlib_cli_output (vm, " flags 0x%x", vif->flags); - flag_entry = (struct feat_struct *) &flags_array; - while (flag_entry->str) - { - if (vif->flags & (1ULL << flag_entry->bit)) - vlib_cli_output (vm, " %s (%d)", flag_entry->str, - flag_entry->bit); - flag_entry++; - } - vlib_cli_output (vm, " fd %d", vif->fd); - vlib_cli_output (vm, " tap-fd %d", vif->tap_fd); - vlib_cli_output (vm, " features 0x%lx", vif->features); - feat_entry = (struct feat_struct *) &feat_array; - while (feat_entry->str) - { - if (vif->features & (1ULL << feat_entry->bit)) - vlib_cli_output (vm, " %s (%d)", feat_entry->str, - feat_entry->bit); - feat_entry++; - } - vlib_cli_output (vm, " remote-features 0x%lx", vif->remote_features); - feat_entry = (struct feat_struct *) &feat_array; - while (feat_entry->str) - { - if (vif->remote_features & (1ULL << feat_entry->bit)) - vlib_cli_output (vm, " %s (%d)", feat_entry->str, - feat_entry->bit); - feat_entry++; - } - vec_foreach_index (i, vif->vrings) - { - // RX = 0, TX = 1 - vring = vec_elt_at_index (vif->vrings, i); - vlib_cli_output (vm, " Virtqueue (%s)", (i & 1) ? "TX" : "RX"); - vlib_cli_output (vm, " qsz %d, last_used_idx %d, desc_in_use %d", - vring->size, vring->last_used_idx, - vring->desc_in_use); - vlib_cli_output (vm, - " avail.flags 0x%x avail.idx %d used.flags 0x%x used.idx %d", - vring->avail->flags, vring->avail->idx, - vring->used->flags, vring->used->idx); - vlib_cli_output (vm, " kickfd %d, callfd %d", vring->kick_fd, - vring->call_fd); - if (show_descr) - { - vlib_cli_output (vm, "\n descriptor table:\n"); - vlib_cli_output (vm, - " id addr len flags next user_addr\n"); - vlib_cli_output (vm, - " ===== ================== ===== ====== ===== ==================\n"); - vring = vif->vrings; - for (j = 0; j < vring->size; j++) - { - struct vring_desc *desc = &vring->desc[j]; - vlib_cli_output (vm, - " %-5d 0x%016lx %-5d 0x%04x %-5d 0x%016lx\n", - j, desc->addr, - desc->len, - desc->flags, desc->next, desc->addr); - } - } - } - } + virtio_show (vm, hw_if_indices, show_descr, VIRTIO_IF_TYPE_TAP); + done: vec_free (hw_if_indices); return error; @@ -307,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) {