X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fvmxnet3%2Fcli.c;h=fd97c36aee2e089ac2aa047d2d9084ce03b9e5a1;hb=2985e0af6;hp=566b0d680793b4f87b4ea42d45ee0440413d0eba;hpb=f9dafebc44c7b52605eed393a418f47ca3ce6990;p=vpp.git diff --git a/src/plugins/vmxnet3/cli.c b/src/plugins/vmxnet3/cli.c index 566b0d68079..fd97c36aee2 100644 --- a/src/plugins/vmxnet3/cli.c +++ b/src/plugins/vmxnet3/cli.c @@ -32,7 +32,7 @@ vmxnet3_create_command_fn (vlib_main_t * vm, unformat_input_t * input, { unformat_input_t _line_input, *line_input = &_line_input; vmxnet3_create_if_args_t args; - u32 tmp; + u32 size; /* Get a line of input. */ if (!unformat_user (input, unformat_line_input, line_input)) @@ -43,12 +43,20 @@ vmxnet3_create_command_fn (vlib_main_t * vm, unformat_input_t * input, { if (unformat (line_input, "%U", unformat_vlib_pci_addr, &args.addr)) ; + else if (unformat (line_input, "gso")) + args.enable_gso = 1; else if (unformat (line_input, "elog")) args.enable_elog = 1; - else if (unformat (line_input, "rx-queue-size %u", &tmp)) - args.rxq_size = tmp; - else if (unformat (line_input, "tx-queue-size %u", &tmp)) - args.txq_size = tmp; + else if (unformat (line_input, "bind")) + args.bind = 1; + else if (unformat (line_input, "rx-queue-size %u", &size)) + args.rxq_size = size; + else if (unformat (line_input, "tx-queue-size %u", &size)) + args.txq_size = size; + else if (unformat (line_input, "num-tx-queues %u", &size)) + args.txq_num = size; + else if (unformat (line_input, "num-rx-queues %u", &size)) + args.rxq_num = size; else return clib_error_return (0, "unknown input `%U'", format_unformat_error, input); @@ -65,7 +73,9 @@ vmxnet3_create_command_fn (vlib_main_t * vm, unformat_input_t * input, VLIB_CLI_COMMAND (vmxnet3_create_command, static) = { .path = "create interface vmxnet3", .short_help = "create interface vmxnet3 " - "[rx-queue-size ] [tx-queue-size ]", + " [rx-queue-size ] [tx-queue-size ]" + " [num-tx-queues ] [num-rx-queues ] [bind]" + " [gso]", .function = vmxnet3_create_command_fn, }; /* *INDENT-ON* */ @@ -102,7 +112,7 @@ vmxnet3_delete_command_fn (vlib_main_t * vm, unformat_input_t * input, return clib_error_return (0, "please specify interface name or sw_if_index"); - hw = vnet_get_sup_hw_interface (vnm, sw_if_index); + hw = vnet_get_sup_hw_interface_api_visible_or_null (vnm, sw_if_index); if (hw == NULL || vmxnet3_device_class.index != hw->dev_class_index) return clib_error_return (0, "not a vmxnet3 interface"); @@ -159,7 +169,7 @@ vmxnet3_test_command_fn (vlib_main_t * vm, unformat_input_t * input, return clib_error_return (0, "please specify interface name or sw_if_index"); - hw = vnet_get_sup_hw_interface (vnm, sw_if_index); + hw = vnet_get_sup_hw_interface_api_visible_or_null (vnm, sw_if_index); if (hw == NULL || vmxnet3_device_class.index != hw->dev_class_index) return clib_error_return (0, "not a vmxnet3 interface"); @@ -211,6 +221,7 @@ show_vmxnet3 (vlib_main_t * vm, u32 * hw_if_indices, u8 show_descr, format_vnet_hw_if_index_name, vnm, hw_if_indices[i], hw_if_indices[i]); vlib_cli_output (vm, " Version: %u", vd->version); + vlib_cli_output (vm, " GSO enable: %u", vd->gso_enable); vlib_cli_output (vm, " PCI Address: %U", format_vlib_pci_addr, &vd->pci_addr); vlib_cli_output (vm, " Mac Address: %U", format_ethernet_address, @@ -319,9 +330,9 @@ show_vmxnet3 (vlib_main_t * vm, u32 * hw_if_indices, u8 show_descr, } } - vec_foreach_index (qid, vd->rxqs) + vec_foreach_index (qid, vd->txqs) { - txq = vec_elt_at_index (vd->txqs, 0); + txq = vec_elt_at_index (vd->txqs, qid); vlib_cli_output (vm, " Queue %u (TX)", qid); vlib_cli_output (vm, " TX completion next index %u", txq->tx_comp_ring.next);