X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Finterface_cli.c;h=54e0673544fb4387516b90d142ec927084f9fcfc;hb=40ee2003b;hp=8fb315b4846a103ea259fc6736aa0d4953cc0b8a;hpb=ba4a5bf884516769211e75d11884a1e458323a21;p=vpp.git diff --git a/src/vnet/interface_cli.c b/src/vnet/interface_cli.c index 8fb315b4846..54e0673544f 100644 --- a/src/vnet/interface_cli.c +++ b/src/vnet/interface_cli.c @@ -36,7 +36,6 @@ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ - /** * @file * @brief Interface CLI. @@ -44,7 +43,6 @@ * Source code for several CLI interface commands. * */ - #include #include #include @@ -53,7 +51,7 @@ #include #include #include - +#include static int compare_interface_names (void *a1, void *a2) { @@ -66,16 +64,15 @@ compare_interface_names (void *a1, void *a2) static clib_error_t * show_or_clear_hw_interfaces (vlib_main_t * vm, unformat_input_t * input, - vlib_cli_command_t * cmd) + vlib_cli_command_t * cmd, int is_show) { clib_error_t *error = 0; vnet_main_t *vnm = vnet_get_main (); vnet_interface_main_t *im = &vnm->interface_main; vnet_hw_interface_t *hi; u32 hw_if_index, *hw_if_indices = 0; - int i, verbose = -1, is_show, show_bond = 0; + int i, verbose = -1, show_bond = 0; - is_show = strstr (cmd->path, "show") != 0; while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) { /* See if user wants to show a specific interface. */ @@ -113,8 +110,8 @@ show_or_clear_hw_interfaces (vlib_main_t * vm, /* Gather interfaces. */ if (vec_len (hw_if_indices) == 0) - pool_foreach (hi, im->hw_interfaces, - vec_add1 (hw_if_indices, hi - im->hw_interfaces)); + pool_foreach (hi, im->hw_interfaces) + vec_add1 (hw_if_indices, hi - im->hw_interfaces); if (verbose < 0) verbose = 1; /* default to verbose (except bond) */ @@ -140,12 +137,12 @@ show_or_clear_hw_interfaces (vlib_main_t * vm, hi, verbose); /* *INDENT-OFF* */ - clib_bitmap_foreach (hw_idx, hi->bond_info, - ({ + clib_bitmap_foreach (hw_idx, hi->bond_info) + { shi = vnet_get_hw_interface(vnm, hw_idx); vlib_cli_output (vm, "%U\n", format_vnet_hw_interface, vnm, shi, verbose); - })); + } /* *INDENT-ON* */ } } @@ -169,6 +166,21 @@ done: return error; } +static clib_error_t * +show_hw_interfaces (vlib_main_t * vm, + unformat_input_t * input, vlib_cli_command_t * cmd) +{ + return show_or_clear_hw_interfaces (vm, input, cmd, 1 /* is_show */ ); +} + +static clib_error_t * +clear_hw_interfaces (vlib_main_t * vm, + unformat_input_t * input, vlib_cli_command_t * cmd) +{ + return show_or_clear_hw_interfaces (vm, input, cmd, 0 /* is_show */ ); +} + + /*? * Display more detailed information about all or a list of given interfaces. * The verboseness of the output can be controlled by the following optional @@ -230,7 +242,7 @@ VLIB_CLI_COMMAND (show_hw_interfaces_command, static) = { .path = "show hardware-interfaces", .short_help = "show hardware-interfaces [brief|verbose|detail] [bond] " "[ [ [..]]] [ [ [..]]]", - .function = show_or_clear_hw_interfaces, + .function = show_hw_interfaces, }; /* *INDENT-ON* */ @@ -251,7 +263,7 @@ VLIB_CLI_COMMAND (clear_hw_interface_counters_command, static) = { .path = "clear hardware-interfaces", .short_help = "clear hardware-interfaces " "[ [ [..]]] [ [ [..]]]", - .function = show_or_clear_hw_interfaces, + .function = clear_hw_interfaces, }; /* *INDENT-ON* */ @@ -328,14 +340,7 @@ show_sw_interfaces (vlib_main_t * vm, if (show_features) { vnet_interface_features_show (vm, sw_if_index, verbose); - - l2_input_config_t *l2_input = l2input_intf_config (sw_if_index); - u32 fb = l2_input->feature_bitmap; - /* intf input features are masked by bridge domain */ - if (l2_input->bridge) - fb &= l2input_bd_config (l2_input->bd_index)->feature_bitmap; - vlib_cli_output (vm, "\nl2-input:\n%U", format_l2_input_features, fb, - 1); + vlib_cli_output (vm, "%U", format_l2_input_features, sw_if_index, 1); l2_output_config_t *l2_output = l2output_intf_config (sw_if_index); vlib_cli_output (vm, "\nl2-output:"); @@ -388,12 +393,12 @@ show_sw_interfaces (vlib_main_t * vm, vec_new (vnet_sw_interface_t, pool_elts (im->sw_interfaces)); _vec_len (sorted_sis) = 0; /* *INDENT-OFF* */ - pool_foreach (si, im->sw_interfaces, - ({ + pool_foreach (si, im->sw_interfaces) + { int visible = vnet_swif_is_api_visible (si); if (visible) - vec_add1 (sorted_sis, si[0]);} - )); + vec_add1 (sorted_sis, si[0]); + } /* *INDENT-ON* */ /* Sort by name. */ vec_sort_with_function (sorted_sis, sw_interface_name_compare); @@ -434,19 +439,7 @@ show_sw_interfaces (vlib_main_t * vm, (si->flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP) ? "up" : "dn"); /* Display any L2 info */ - l2_input_config_t *l2_input = l2input_intf_config (si->sw_if_index); - if (l2_input->bridge) - { - bd_main_t *bdm = &bd_main; - u32 bd_id = l2input_main.bd_configs[l2_input->bd_index].bd_id; - vlib_cli_output (vm, " L2 bridge bd-id %d idx %d shg %d %s", - bd_id, bd_find_index (bdm, bd_id), l2_input->shg, - l2_input->bvi ? "bvi" : " "); - } - else if (l2_input->xconnect) - vlib_cli_output (vm, " L2 xconnect %U", - format_vnet_sw_if_index_name, vnm, - l2_input->output_sw_if_index); + vlib_cli_output (vm, "%U", format_l2_input, si->sw_if_index); /* *INDENT-OFF* */ /* Display any IP4 addressing info */ @@ -1212,12 +1205,12 @@ show_interface_sec_mac_addr_fn (vlib_main_t * vm, unformat_input_t * input, vec_new (vnet_sw_interface_t, pool_elts (im->sw_interfaces)); _vec_len (sorted_sis) = 0; /* *INDENT-OFF* */ - pool_foreach (si, im->sw_interfaces, - ({ + pool_foreach (si, im->sw_interfaces) + { int visible = vnet_swif_is_api_visible (si); if (visible) - vec_add1 (sorted_sis, si[0]);} - )); + vec_add1 (sorted_sis, si[0]); + } /* *INDENT-ON* */ /* Sort by name. */ vec_sort_with_function (sorted_sis, sw_interface_name_compare); @@ -1238,11 +1231,11 @@ show_interface_sec_mac_addr_fn (vlib_main_t * vm, unformat_input_t * input, if (ei && ei->secondary_addrs) { - mac_address_t *sec_addr; + ethernet_interface_address_t *sec_addr; vec_foreach (sec_addr, ei->secondary_addrs) { - vlib_cli_output (vm, " %U", format_mac_address_t, sec_addr); + vlib_cli_output (vm, " %U", format_mac_address_t, &sec_addr->mac); } } } @@ -1480,86 +1473,42 @@ VLIB_CLI_COMMAND (set_ip_directed_broadcast_command, static) = { }; /* *INDENT-ON* */ -static clib_error_t * -set_hw_interface_rx_mode (vnet_main_t * vnm, u32 hw_if_index, - u32 queue_id, vnet_hw_interface_rx_mode mode) -{ - vnet_hw_interface_t *hw = vnet_get_hw_interface (vnm, hw_if_index); - vnet_device_class_t *dev_class = - vnet_get_device_class (vnm, hw->dev_class_index); - clib_error_t *error; - vnet_hw_interface_rx_mode old_mode; - int rv; - - if (mode == VNET_HW_INTERFACE_RX_MODE_DEFAULT) - mode = hw->default_rx_mode; - - rv = vnet_hw_interface_get_rx_mode (vnm, hw_if_index, queue_id, &old_mode); - switch (rv) - { - case 0: - if (old_mode == mode) - return 0; /* same rx-mode, no change */ - break; - case VNET_API_ERROR_INVALID_INTERFACE: - return clib_error_return (0, "invalid interface"); - case VNET_API_ERROR_INVALID_QUEUE: - return clib_error_return (0, "invalid queue"); - default: - return clib_error_return (0, "unknown error"); - } - - if (dev_class->rx_mode_change_function) - { - error = dev_class->rx_mode_change_function (vnm, hw_if_index, queue_id, - mode); - if (error) - return (error); - } - - rv = vnet_hw_interface_set_rx_mode (vnm, hw_if_index, queue_id, mode); - switch (rv) - { - case 0: - break; - case VNET_API_ERROR_UNSUPPORTED: - return clib_error_return (0, "unsupported"); - case VNET_API_ERROR_INVALID_INTERFACE: - return clib_error_return (0, "invalid interface"); - case VNET_API_ERROR_INVALID_QUEUE: - return clib_error_return (0, "invalid queue"); - default: - return clib_error_return (0, "unknown error"); - } - - return 0; -} - clib_error_t * set_hw_interface_change_rx_mode (vnet_main_t * vnm, u32 hw_if_index, u8 queue_id_valid, u32 queue_id, - vnet_hw_interface_rx_mode mode) + vnet_hw_if_rx_mode mode) { clib_error_t *error = 0; vnet_hw_interface_t *hw; - int i; + u32 *queue_indices = 0; hw = vnet_get_hw_interface (vnm, hw_if_index); - if (queue_id_valid == 0) + if (queue_id_valid) { - for (i = 0; i < vec_len (hw->dq_runtime_index_by_queue); i++) - { - error = set_hw_interface_rx_mode (vnm, hw_if_index, i, mode); - if (error) - break; - } - hw->default_rx_mode = mode; + u32 queue_index; + queue_index = + vnet_hw_if_get_rx_queue_index_by_id (vnm, hw_if_index, queue_id); + if (queue_index == ~0) + return clib_error_return (0, "unknown queue %u on interface %s", + queue_id, hw->name); + vec_add1 (queue_indices, queue_index); } else - error = set_hw_interface_rx_mode (vnm, hw_if_index, queue_id, mode); + queue_indices = hw->rx_queue_indices; - return (error); + for (int i = 0; i < vec_len (queue_indices); i++) + { + int rv = vnet_hw_if_set_rx_queue_mode (vnm, queue_indices[i], mode); + if (rv) + goto done; + } + +done: + if (queue_indices != hw->rx_queue_indices) + vec_free (queue_indices); + vnet_hw_if_update_runtime_data (vnm, hw_if_index); + return error; } static clib_error_t * @@ -1571,7 +1520,7 @@ set_interface_rx_mode (vlib_main_t * vm, unformat_input_t * input, vnet_main_t *vnm = vnet_get_main (); u32 hw_if_index = (u32) ~ 0; u32 queue_id = (u32) ~ 0; - vnet_hw_interface_rx_mode mode = VNET_HW_INTERFACE_RX_MODE_UNKNOWN; + vnet_hw_if_rx_mode mode = VNET_HW_IF_RX_MODE_UNKNOWN; u8 queue_id_valid = 0; if (!unformat_user (input, unformat_line_input, line_input)) @@ -1585,11 +1534,11 @@ set_interface_rx_mode (vlib_main_t * vm, unformat_input_t * input, else if (unformat (line_input, "queue %d", &queue_id)) queue_id_valid = 1; else if (unformat (line_input, "polling")) - mode = VNET_HW_INTERFACE_RX_MODE_POLLING; + mode = VNET_HW_IF_RX_MODE_POLLING; else if (unformat (line_input, "interrupt")) - mode = VNET_HW_INTERFACE_RX_MODE_INTERRUPT; + mode = VNET_HW_IF_RX_MODE_INTERRUPT; else if (unformat (line_input, "adaptive")) - mode = VNET_HW_INTERFACE_RX_MODE_ADAPTIVE; + mode = VNET_HW_IF_RX_MODE_ADAPTIVE; else { error = clib_error_return (0, "parse error: '%U'", @@ -1604,7 +1553,7 @@ set_interface_rx_mode (vlib_main_t * vm, unformat_input_t * input, if (hw_if_index == (u32) ~ 0) return clib_error_return (0, "please specify valid interface name"); - if (mode == VNET_HW_INTERFACE_RX_MODE_UNKNOWN) + if (mode == VNET_HW_IF_RX_MODE_UNKNOWN) return clib_error_return (0, "please specify valid rx-mode"); error = set_hw_interface_change_rx_mode (vnm, hw_if_index, queue_id_valid, @@ -1660,42 +1609,36 @@ show_interface_rx_placement_fn (vlib_main_t * vm, unformat_input_t * input, { u8 *s = 0; vnet_main_t *vnm = vnet_get_main (); - vnet_device_input_runtime_t *rt; - vnet_device_and_queue_t *dq; - vlib_node_t *pn = vlib_get_node_by_name (vm, (u8 *) "device-input"); - uword si; - int index = 0; - - /* *INDENT-OFF* */ - foreach_vlib_main (({ - clib_bitmap_foreach (si, pn->sibling_bitmap, - ({ - rt = vlib_node_get_runtime_data (this_vlib_main, si); - - if (vec_len (rt->devices_and_queues)) - s = format (s, " node %U:\n", format_vlib_node_name, vm, si); - - vec_foreach (dq, rt->devices_and_queues) - { - vnet_hw_interface_t *hi = vnet_get_hw_interface (vnm, - dq->hw_if_index); - s = format (s, " %U queue %u (%U)\n", - format_vnet_sw_if_index_name, vnm, hi->sw_if_index, - dq->queue_id, - format_vnet_hw_interface_rx_mode, dq->mode); - } - })); - if (vec_len (s) > 0) - { - vlib_cli_output(vm, "Thread %u (%s):\n%v", index, - vlib_worker_threads[index].name, s); - vec_reset_length (s); - } - index++; - })); - /* *INDENT-ON* */ - + vnet_hw_if_rx_queue_t **all_queues = 0; + vnet_hw_if_rx_queue_t **qptr; + vnet_hw_if_rx_queue_t *q; + pool_foreach (q, vnm->interface_main.hw_if_rx_queues) + vec_add1 (all_queues, q); + vec_sort_with_function (all_queues, vnet_hw_if_rxq_cmp_cli_api); + u32 prev_node = ~0; + + vec_foreach (qptr, all_queues) + { + u32 current_thread = qptr[0]->thread_index; + u32 hw_if_index = qptr[0]->hw_if_index; + vnet_hw_interface_t *hw_if = vnet_get_hw_interface (vnm, hw_if_index); + u32 current_node = hw_if->input_node_index; + if (current_node != prev_node) + s = format (s, " node %U:\n", format_vlib_node_name, vm, current_node); + s = format (s, " %U queue %u (%U)\n", format_vnet_sw_if_index_name, + vnm, hw_if->sw_if_index, qptr[0]->queue_id, + format_vnet_hw_if_rx_mode, qptr[0]->mode); + if (qptr == all_queues + vec_len (all_queues) - 1 || + current_thread != qptr[1]->thread_index) + { + vlib_cli_output (vm, "Thread %u (%s):\n%v", current_thread, + vlib_worker_threads[current_thread].name, s); + vec_reset_length (s); + } + prev_node = current_node; + } vec_free (s); + vec_free (all_queues); return 0; } @@ -1731,16 +1674,14 @@ VLIB_CLI_COMMAND (show_interface_rx_placement, static) = { .function = show_interface_rx_placement_fn, }; /* *INDENT-ON* */ - clib_error_t * set_hw_interface_rx_placement (u32 hw_if_index, u32 queue_id, u32 thread_index, u8 is_main) { vnet_main_t *vnm = vnet_get_main (); vnet_device_main_t *vdm = &vnet_device_main; - clib_error_t *error = 0; - vnet_hw_interface_rx_mode mode = VNET_HW_INTERFACE_RX_MODE_UNKNOWN; - int rv; + vnet_hw_interface_t *hw; + u32 queue_index; if (is_main) thread_index = 0; @@ -1751,26 +1692,21 @@ set_hw_interface_rx_placement (u32 hw_if_index, u32 queue_id, return clib_error_return (0, "please specify valid worker thread or main"); - rv = vnet_hw_interface_get_rx_mode (vnm, hw_if_index, queue_id, &mode); - - if (rv) - return clib_error_return (0, "not found"); - - rv = vnet_hw_interface_unassign_rx_thread (vnm, hw_if_index, queue_id); - - if (rv) - return clib_error_return (0, "not found"); - - vnet_hw_interface_assign_rx_thread (vnm, hw_if_index, queue_id, - thread_index); - vnet_hw_interface_set_rx_mode (vnm, hw_if_index, queue_id, mode); + hw = vnet_get_hw_interface (vnm, hw_if_index); - return (error); + queue_index = + vnet_hw_if_get_rx_queue_index_by_id (vnm, hw_if_index, queue_id); + if (queue_index == ~0) + return clib_error_return (0, "unknown queue %u on interface %s", queue_id, + hw->name); + vnet_hw_if_set_rx_queue_thread_index (vnm, queue_index, thread_index); + vnet_hw_if_update_runtime_data (vnm, hw_if_index); + return 0; } static clib_error_t * -set_interface_rx_placement (vlib_main_t * vm, unformat_input_t * input, - vlib_cli_command_t * cmd) +set_interface_rx_placement (vlib_main_t *vm, unformat_input_t *input, + vlib_cli_command_t *cmd) { clib_error_t *error = 0; unformat_input_t _line_input, *line_input = &_line_input; @@ -1872,6 +1808,89 @@ VLIB_CLI_COMMAND (cmd_set_if_rx_placement,static) = { }; /* *INDENT-ON* */ +clib_error_t * +set_interface_rss_queues (vlib_main_t * vm, u32 hw_if_index, + clib_bitmap_t * bitmap) +{ + vnet_main_t *vnm = vnet_get_main (); + vnet_hw_interface_t *hi = vnet_get_hw_interface (vnm, hw_if_index); + + return vnet_hw_interface_set_rss_queues (vnm, hi, bitmap); +} + +static clib_error_t * +set_interface_rss_queues_fn (vlib_main_t * vm, + unformat_input_t * input, + vlib_cli_command_t * cmd) +{ + clib_error_t *error = 0; + unformat_input_t _line_input, *line_input = &_line_input; + vnet_main_t *vnm = vnet_get_main (); + u32 hw_if_index = (u32) ~ 0; + clib_bitmap_t *bitmap = NULL; + + if (!unformat_user (input, unformat_line_input, line_input)) + return 0; + + while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) + { + if (unformat + (line_input, "%U", unformat_vnet_hw_interface, vnm, &hw_if_index)) + ; + else + if (unformat (line_input, "list %U", unformat_bitmap_list, &bitmap)) + ; + else + { + error = clib_error_return (0, "parse error: '%U'", + format_unformat_error, line_input); + unformat_free (line_input); + goto done; + } + } + + unformat_free (line_input); + + if (hw_if_index == (u32) ~ 0) + { + error = clib_error_return (0, "please specify valid interface name"); + goto done; + } + + if (bitmap == NULL) + { + error = clib_error_return (0, "please specify the valid rss queues"); + goto done; + } + + error = set_interface_rss_queues (vm, hw_if_index, bitmap); + +done: + if (bitmap) + clib_bitmap_free (bitmap); + + return (error); +} + +/*? + * This command is used to set the rss queues of a given interface + * Not all the interfaces support this operation. + * To display the current rss queues, use the command + * 'show hardware-interfaces'. + * + * @cliexpar + * Example of how to set the rss queues to 0,2-5,7 of an interface: + * @cliexstart{set interface rss queues VirtualFunctionEthernet18/1/0 list 0,2-5,7} + * @cliexend +?*/ +/* *INDENT-OFF* */ +VLIB_CLI_COMMAND (cmd_set_interface_rss_queues,static) = { + .path = "set interface rss queues", + .short_help = "set interface rss queues >", + .function = set_interface_rss_queues_fn, +}; +/* *INDENT-ON* */ + static u8 * format_vnet_pcap (u8 * s, va_list * args) { @@ -1914,7 +1933,6 @@ vnet_pcap_dispatch_trace_configure (vnet_pcap_dispatch_trace_args_t * a) vnet_pcap_t *pp = &vm->pcap; pcap_main_t *pm = &pp->pcap_main; vnet_classify_main_t *cm = &vnet_classify_main; - vnet_classify_filter_set_t *set = 0; if (a->status) { @@ -1940,8 +1958,9 @@ vnet_pcap_dispatch_trace_configure (vnet_pcap_dispatch_trace_args_t * a) return VNET_API_ERROR_INVALID_VALUE; /* Disable capture with capture already disabled, not interesting */ - if (((pp->pcap_rx_enable + pp->pcap_tx_enable + pp->pcap_drop_enable) == 0) - && ((a->rx_enable + a->tx_enable + a->drop_enable == 0))) + if (((pp->pcap_rx_enable + pp->pcap_tx_enable + pp->pcap_drop_enable) == + 0) && + ((a->rx_enable + a->tx_enable + a->drop_enable == 0))) return VNET_API_ERROR_VALUE_EXIST; /* Change number of packets to capture while capturing */ @@ -1950,25 +1969,35 @@ vnet_pcap_dispatch_trace_configure (vnet_pcap_dispatch_trace_args_t * a) && (pm->n_packets_to_capture != a->packets_to_capture)) return VNET_API_ERROR_INVALID_VALUE_2; - set = pool_elt_at_index (cm->filter_sets, cm->filter_set_by_sw_if_index[0]); - /* Classify filter specified, but no classify filter configured */ if ((a->rx_enable + a->tx_enable + a->drop_enable) && a->filter && - (set->table_indices[0] == ~0)) + (!cm->classify_table_index_by_sw_if_index || + cm->classify_table_index_by_sw_if_index[0] == ~0)) return VNET_API_ERROR_NO_SUCH_LABEL; if (a->rx_enable + a->tx_enable + a->drop_enable) { + void *save_pcap_data; + /* Sanity check max bytes per pkt */ if (a->max_bytes_per_pkt < 32 || a->max_bytes_per_pkt > 9000) return VNET_API_ERROR_INVALID_MEMORY_SIZE; /* Clean up from previous run, if any */ - vec_free (pm->file_name); - vec_free (pm->pcap_data); + vec_reset_length (pm->pcap_data); + + /* Throw away the data buffer? */ + if (a->free_data) + vec_free (pm->pcap_data); + + save_pcap_data = pm->pcap_data; + memset (pm, 0, sizeof (*pm)); - vec_validate_aligned (vnet_trace_dummy, 2048, CLIB_CACHE_LINE_BYTES); + pm->pcap_data = save_pcap_data; + + vec_validate_aligned (vnet_trace_placeholder, 2048, + CLIB_CACHE_LINE_BYTES); if (pm->lock == 0) clib_spinlock_init (&(pm->lock)); @@ -1982,17 +2011,26 @@ vnet_pcap_dispatch_trace_configure (vnet_pcap_dispatch_trace_args_t * a) stem = format (stem, "tx"); if (a->drop_enable) stem = format (stem, "drop"); - a->filename = format (0, "/tmp/%s.pcap%c", stem, 0); + a->filename = format (0, "/tmp/%v.pcap%c", stem, 0); vec_free (stem); } pm->file_name = (char *) a->filename; pm->n_packets_captured = 0; pm->packet_type = PCAP_PACKET_TYPE_ethernet; + /* Preallocate the data vector? */ + if (a->preallocate_data) + { + vec_validate + (pm->pcap_data, a->packets_to_capture + * ((sizeof (pcap_packet_header_t) + a->max_bytes_per_pkt))); + vec_reset_length (pm->pcap_data); + } pm->n_packets_to_capture = a->packets_to_capture; pp->pcap_sw_if_index = a->sw_if_index; if (a->filter) - pp->filter_classify_table_index = set->table_indices[0]; + pp->filter_classify_table_index = + cm->classify_table_index_by_sw_if_index[0]; else pp->filter_classify_table_index = ~0; pp->pcap_rx_enable = a->rx_enable; @@ -2021,6 +2059,9 @@ vnet_pcap_dispatch_trace_configure (vnet_pcap_dispatch_trace_args_t * a) clib_error_report (error); return VNET_API_ERROR_SYSCALL_ERROR_1; } + vec_free (pm->file_name); + if (a->free_data) + vec_free (pm->pcap_data); return 0; } else @@ -2043,10 +2084,12 @@ pcap_trace_command_fn (vlib_main_t * vm, int rv; int rx_enable = 0; int tx_enable = 0; + int preallocate_data = 0; int drop_enable = 0; int status = 0; int filter = 0; - u32 sw_if_index = ~0; + int free_data = 0; + u32 sw_if_index = 0; /* default: any interface */ /* Get a line of input. */ if (!unformat_user (input, unformat_line_input, line_input)) @@ -2077,7 +2120,16 @@ pcap_trace_command_fn (vlib_main_t * vm, else if (unformat (line_input, "intfc %U", unformat_vnet_sw_interface, vnm, &sw_if_index)) ; - else if (unformat (line_input, "intfc any")) + else if (unformat (line_input, "interface %U", + unformat_vnet_sw_interface, vnm, &sw_if_index)) + ; + else if (unformat (line_input, "preallocate-data %=", + &preallocate_data, 1)) + ; + else if (unformat (line_input, "free-data %=", &free_data, 1)) + ; + else if (unformat (line_input, "intfc any") + || unformat (line_input, "interface any")) sw_if_index = 0; else if (unformat (line_input, "filter")) filter = 1; @@ -2094,6 +2146,8 @@ pcap_trace_command_fn (vlib_main_t * vm, a->filename = filename; a->rx_enable = rx_enable; a->tx_enable = tx_enable; + a->preallocate_data = preallocate_data; + a->free_data = free_data; a->drop_enable = drop_enable; a->status = status; a->packets_to_capture = max; @@ -2163,6 +2217,12 @@ pcap_trace_command_fn (vlib_main_t * vm, * - max-bytes-per-pkt - Maximum number of bytes to capture * for each packet. Must be >= 32, <= 9000. * + * - preallocate-data - Preallocate the data buffer, to avoid + * vector expansion delays during pcap capture + * + * - free-data - Free the data buffer. Ordinarily it's a feature + * to retain the data buffer so this option is seldom used. + * * - intfc |any - Used to specify a given interface, * or use 'any' to run packet capture on all interfaces. * 'any' is the default if not provided. Settings from a previous @@ -2212,7 +2272,9 @@ pcap_trace_command_fn (vlib_main_t * vm, VLIB_CLI_COMMAND (pcap_tx_trace_command, static) = { .path = "pcap trace", .short_help = - "pcap trace rx tx drop off [max ] [intfc |any] [file ] [status] [max-bytes-per-pkt ][filter]", + "pcap trace [rx] [tx] [drop] [off] [max ] [intfc |any]\n" + " [file ] [status] [max-bytes-per-pkt ][filter]\n" + " [preallocate-data][free-data]", .function = pcap_trace_command_fn, }; /* *INDENT-ON* */