#include <vnet/fib/ip6_fib.h>
#include <vnet/l2/l2_output.h>
#include <vnet/l2/l2_input.h>
+#include <vnet/classify/vnet_classify.h>
static int
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. */
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
.path = "show hardware-interfaces",
.short_help = "show hardware-interfaces [brief|verbose|detail] [bond] "
"[<interface> [<interface> [..]]] [<sw_idx> [<sw_idx> [..]]]",
- .function = show_or_clear_hw_interfaces,
+ .function = show_hw_interfaces,
};
/* *INDENT-ON* */
.path = "clear hardware-interfaces",
.short_help = "clear hardware-interfaces "
"[<interface> [<interface> [..]]] [<sw_idx> [<sw_idx> [..]]]",
- .function = show_or_clear_hw_interfaces,
+ .function = clear_hw_interfaces,
};
/* *INDENT-ON* */
u8 show_addresses = 0;
u8 show_features = 0;
u8 show_tag = 0;
+ u8 show_vtr = 0;
int verbose = 0;
/*
show_features = 1;
else if (unformat (linput, "tag"))
show_tag = 1;
+ else if (unformat (linput, "vtr"))
+ show_vtr = 1;
else if (unformat (linput, "verbose"))
verbose = 1;
else
}
unformat_free (linput);
}
- if (show_features || show_tag)
+ if (show_features || show_tag || show_vtr)
{
if (sw_if_index == ~(u32) 0)
{
return 0;
}
+ /*
+ * Show vlan tag rewrite data for one interface.
+ */
+ if (show_vtr)
+ {
+ u32 vtr_op = L2_VTR_DISABLED;
+ u32 push_dot1q = 0, tag1 = 0, tag2 = 0;
+
+ if (l2vtr_get (vm, vnm, sw_if_index,
+ &vtr_op, &push_dot1q, &tag1, &tag2) != 0)
+ {
+ vlib_cli_output (vm, "%U: Problem getting vlan tag-rewrite data",
+ format_vnet_sw_if_index_name, vnm, sw_if_index);
+ return 0;
+ }
+ vlib_cli_output (vm, "%U: VTR %0U",
+ format_vnet_sw_if_index_name, vnm, sw_if_index,
+ format_vtr, vtr_op, push_dot1q, tag1, tag2);
+ return 0;
+ }
+
if (!show_addresses)
vlib_cli_output (vm, "%U\n", format_vnet_sw_interface, vnm, 0);
/* *INDENT-OFF* */
VLIB_CLI_COMMAND (show_sw_interfaces_command, static) = {
.path = "show interface",
- .short_help = "show interface [address|addr|features|feat] [<interface> [<interface> [..]]] [verbose]",
+ .short_help = "show interface [address|addr|features|feat|vtr] [<interface> [<interface> [..]]] [verbose]",
.function = show_sw_interfaces,
.is_mp_safe = 1,
};
continue;
}
- kp = clib_mem_alloc (sizeof (*kp));
- *kp = sup_and_sub_key;
-
template.type = VNET_SW_INTERFACE_TYPE_SUB;
template.flood_class = VNET_FLOOD_CLASS_NORMAL;
template.sup_sw_if_index = hi->sw_if_index;
if (error)
goto done;
+ kp = clib_mem_alloc (sizeof (*kp));
+ *kp = sup_and_sub_key;
+
hash_set (hi->sub_interface_sw_if_index_by_id, id, sw_if_index);
hash_set_mem (im->sw_if_index_by_sup_and_sub, kp, sw_if_index);
vlib_cli_output (vm, "%U\n", format_vnet_sw_if_index_name,
};
/* *INDENT-ON* */
+static clib_error_t *
+show_interface_sec_mac_addr_fn (vlib_main_t * vm, unformat_input_t * input,
+ vlib_cli_command_t * cmd)
+{
+ vnet_main_t *vnm = vnet_get_main ();
+ vnet_interface_main_t *im = &vnm->interface_main;
+ ethernet_main_t *em = ðernet_main;
+ u32 sw_if_index = ~0;
+ vnet_sw_interface_t *si, *sorted_sis = 0;
+
+ if (unformat (input, "%U", unformat_vnet_sw_interface, vnm, &sw_if_index))
+ {
+ si = pool_elt_at_index (im->sw_interfaces, sw_if_index);
+ vec_add1 (sorted_sis, si[0]);
+ }
+
+ /* if an interface name was not passed, get all interfaces */
+ if (vec_len (sorted_sis) == 0)
+ {
+ sorted_sis =
+ vec_new (vnet_sw_interface_t, pool_elts (im->sw_interfaces));
+ _vec_len (sorted_sis) = 0;
+ /* *INDENT-OFF* */
+ pool_foreach (si, im->sw_interfaces,
+ ({
+ int visible = vnet_swif_is_api_visible (si);
+ if (visible)
+ vec_add1 (sorted_sis, si[0]);}
+ ));
+ /* *INDENT-ON* */
+ /* Sort by name. */
+ vec_sort_with_function (sorted_sis, sw_interface_name_compare);
+ }
+
+ vec_foreach (si, sorted_sis)
+ {
+ vnet_sw_interface_t *sup_si;
+ ethernet_interface_t *ei;
+
+ sup_si = vnet_get_sup_sw_interface (vnm, si->sw_if_index);
+ ei = ethernet_get_interface (em, sup_si->hw_if_index);
+
+ vlib_cli_output (vm, "%U (%s):",
+ format_vnet_sw_if_index_name, vnm, si->sw_if_index,
+ (si->flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP) ?
+ "up" : "dn");
+
+ if (ei && ei->secondary_addrs)
+ {
+ mac_address_t *sec_addr;
+
+ vec_foreach (sec_addr, ei->secondary_addrs)
+ {
+ vlib_cli_output (vm, " %U", format_mac_address_t, sec_addr);
+ }
+ }
+ }
+
+ vec_free (sorted_sis);
+ return 0;
+}
+
+/*?
+ * This command is used to display interface secondary mac addresses.
+ *
+ * @cliexpar
+ * Example of how to display interface secondary mac addresses:
+ * @cliexstart{show interface secondary-mac-address}
+ * @cliexend
+?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (show_interface_sec_mac_addr, static) = {
+ .path = "show interface secondary-mac-address",
+ .short_help = "show interface secondary-mac-address [<interface>]",
+ .function = show_interface_sec_mac_addr_fn,
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+interface_add_del_mac_address (vlib_main_t * vm, unformat_input_t * input,
+ vlib_cli_command_t * cmd)
+{
+ vnet_main_t *vnm = vnet_get_main ();
+ vnet_sw_interface_t *si = NULL;
+ clib_error_t *error = 0;
+ u32 sw_if_index = ~0;
+ u8 mac[6] = { 0 };
+ u8 is_add, is_del;
+
+ is_add = is_del = 0;
+
+ if (!unformat_user (input, unformat_vnet_sw_interface, vnm, &sw_if_index))
+ {
+ error = clib_error_return (0, "unknown interface `%U'",
+ format_unformat_error, input);
+ goto done;
+ }
+ if (!unformat_user (input, unformat_ethernet_address, mac))
+ {
+ error = clib_error_return (0, "expected mac address `%U'",
+ format_unformat_error, input);
+ goto done;
+ }
+
+ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (input, "add"))
+ is_add = 1;
+ else if (unformat (input, "del"))
+ is_del = 1;
+ else
+ break;
+ }
+
+ if (is_add == is_del)
+ {
+ error = clib_error_return (0, "must choose one of add or del");
+ goto done;
+ }
+
+ si = vnet_get_sw_interface (vnm, sw_if_index);
+ error =
+ vnet_hw_interface_add_del_mac_address (vnm, si->hw_if_index, mac, is_add);
+
+done:
+ return error;
+}
+
+/*?
+ * The '<em>set interface secondary-mac-address </em>' command allows adding
+ * or deleting extra MAC addresses on a given interface without changing the
+ * default MAC address. This could allow packets sent to these MAC addresses
+ * to be received without setting the interface to promiscuous mode.
+ * Not all interfaces support this operation. The ones that do are mostly
+ * hardware NICs, though virtio does also.
+ *
+ * @cliexpar
+ * @parblock
+ * Example of how to add a secondary MAC Address on an interface:
+ * @cliexcmd{set interface secondary-mac-address GigabitEthernet0/8/0 aa:bb:cc:dd:ee:01 add}
+ * Example of how to delete a secondary MAC address from an interface:
+ * @cliexcmd{set interface secondary-mac-address GigabitEthernet0/8/0 aa:bb:cc:dd:ee:01 del}
+ * @endparblock
+?*/
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (interface_add_del_mac_address_cmd, static) = {
+ .path = "set interface secondary-mac-address",
+ .short_help = "set interface secondary-mac-address <interface> <mac-address> [(add|del)]",
+ .function = interface_add_del_mac_address,
+};
+/* *INDENT-ON* */
+
static clib_error_t *
set_interface_mac_address (vlib_main_t * vm, unformat_input_t * input,
vlib_cli_command_t * cmd)
};
/* *INDENT-ON* */
-static inline clib_error_t *
-pcap_trace_command_internal (vlib_main_t * vm,
+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, int rx_tx)
+ vlib_cli_command_t * cmd)
{
- unformat_input_t _line_input, *line_input = &_line_input;
- u8 *filename;
- u8 *chroot_filename = 0;
- u32 max = 0;
- int enabled = 0;
- int errorFlag = 0;
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;
- /* Get a line of input. */
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, "on"))
+ 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
{
- if (vm->pcap[rx_tx].pcap_enable == 0)
- {
- enabled = 1;
- vm->pcap[rx_tx].pcap_main.n_packets_to_capture =
- PCAP_DEF_PKT_TO_CAPTURE;
- }
- else
- {
- vlib_cli_output (vm, "pcap %s capture already on...",
- (rx_tx == VLIB_RX) ? "rx" : "tx");
- errorFlag = 1;
- break;
- }
+ error = clib_error_return (0, "parse error: '%U'",
+ format_unformat_error, line_input);
+ unformat_free (line_input);
+ goto done;
}
- else if (unformat (line_input, "off"))
+ }
+
+ 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
+ * '<em>show hardware-interfaces</em>'.
+ *
+ * @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 <interface> <list <queue-list>>",
+ .function = set_interface_rss_queues_fn,
+};
+/* *INDENT-ON* */
+
+static u8 *
+format_vnet_pcap (u8 * s, va_list * args)
+{
+ vnet_pcap_t *pp = va_arg (*args, vnet_pcap_t *);
+ int type = va_arg (*args, int);
+ int printed = 0;
+
+ if (type == 0)
+ {
+ if (pp->pcap_rx_enable)
{
- if (vm->pcap[rx_tx].pcap_enable)
- {
- vlib_cli_output
- (vm, "captured %d pkts...",
- vm->pcap[rx_tx].pcap_main.n_packets_captured);
- if (vm->pcap[rx_tx].pcap_main.n_packets_captured)
- {
- vm->pcap[rx_tx].pcap_main.n_packets_to_capture =
- vm->pcap[rx_tx].pcap_main.n_packets_captured;
- error = pcap_write (&vm->pcap[rx_tx].pcap_main);
- if (vm->pcap[rx_tx].pcap_main.file_descriptor >= 0)
- pcap_close (&vm->pcap[rx_tx].pcap_main);
- if (error)
- clib_error_report (error);
- else
- vlib_cli_output (vm, "saved to %s...",
- vm->pcap[rx_tx].pcap_main.file_name);
- }
-
- vm->pcap[rx_tx].pcap_enable = 0;
- }
- else
- {
- vlib_cli_output (vm, "pcap %s capture already off...",
- (rx_tx == VLIB_RX) ? "rx" : "tx");
- errorFlag = 1;
- break;
- }
+ s = format (s, "rx");
+ printed = 1;
}
- else if (unformat (line_input, "max %d", &max))
+ if (pp->pcap_tx_enable)
{
- if (vm->pcap[rx_tx].pcap_enable)
- {
- vlib_cli_output
- (vm,
- "can't change max value while pcap tx capture active...");
- errorFlag = 1;
- break;
- }
- vm->pcap[rx_tx].pcap_main.n_packets_to_capture = max;
+ if (printed)
+ s = format (s, " and ");
+ s = format (s, "tx");
+ printed = 1;
}
- else if (unformat (line_input, "intfc %U",
- unformat_vnet_sw_interface, vnm,
- &vm->pcap[rx_tx].pcap_sw_if_index))
- ;
-
- else if (unformat (line_input, "intfc any"))
+ if (pp->pcap_drop_enable)
{
- vm->pcap[rx_tx].pcap_sw_if_index = 0;
+ if (printed)
+ s = format (s, " and ");
+ s = format (s, "drop");
+ printed = 1;
}
- else if (unformat (line_input, "file %s", &filename))
- {
- if (vm->pcap[rx_tx].pcap_enable)
- {
- vlib_cli_output
- (vm, "can't change file while pcap tx capture active...");
- errorFlag = 1;
- break;
- }
+ return s;
+ }
+ s = format (s, "unknown type %d!", type);
+ return s;
+}
- /* Brain-police user path input */
- if (strstr ((char *) filename, "..")
- || index ((char *) filename, '/'))
- {
- vlib_cli_output (vm, "illegal characters in filename '%s'",
- filename);
- vlib_cli_output (vm, "Hint: .. and / are not allowed.");
- vec_free (filename);
- errorFlag = 1;
- break;
- }
- chroot_filename = format (0, "/tmp/%s%c", filename, 0);
- vec_free (filename);
+int
+vnet_pcap_dispatch_trace_configure (vnet_pcap_dispatch_trace_args_t * a)
+{
+ vlib_main_t *vm = vlib_get_main ();
+ 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)
+ {
+ if (pp->pcap_rx_enable || pp->pcap_tx_enable || pp->pcap_drop_enable)
+ {
+ vlib_cli_output
+ (vm, "pcap %U dispatch capture enabled: %d of %d pkts...",
+ format_vnet_pcap, pp, 0 /* print type */ ,
+ pm->n_packets_captured, pm->n_packets_to_capture);
+ vlib_cli_output (vm, "capture to file %s", pm->file_name);
}
- else if (unformat (line_input, "status"))
+ else
+ vlib_cli_output (vm, "pcap dispatch capture disabled");
+
+ return 0;
+ }
+
+ /* Consistency checks */
+
+ /* Enable w/ capture already enabled not allowed */
+ if ((pp->pcap_rx_enable + pp->pcap_tx_enable + pp->pcap_drop_enable)
+ && (a->rx_enable + a->tx_enable + a->drop_enable))
+ 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)))
+ return VNET_API_ERROR_VALUE_EXIST;
+
+ /* Change number of packets to capture while capturing */
+ if ((pp->pcap_rx_enable + pp->pcap_tx_enable + pp->pcap_drop_enable)
+ && (a->rx_enable + a->tx_enable + a->drop_enable)
+ && (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 || set->table_indices[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_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));
+
+ 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));
+
+ if (a->filename == 0)
{
- if (vm->pcap[rx_tx].pcap_sw_if_index == 0)
- {
- vlib_cli_output
- (vm, "max is %d for any interface to file %s",
- vm->pcap[rx_tx].pcap_main.n_packets_to_capture,
- vm->pcap[rx_tx].pcap_main.file_name ?
- (u8 *) vm->pcap[rx_tx].pcap_main.file_name :
- (u8 *) "/tmp/vpe.pcap");
- }
- else
- {
- vlib_cli_output (vm, "max is %d for interface %U to file %s",
- vm->pcap[rx_tx].pcap_main.n_packets_to_capture,
- format_vnet_sw_if_index_name, vnm,
- vm->pcap[rx_tx].pcap_sw_if_index,
- vm->pcap[rx_tx].
- pcap_main.file_name ? (u8 *) vm->pcap[rx_tx].
- pcap_main.file_name : (u8 *) "/tmp/vpe.pcap");
- }
+ u8 *stem = 0;
+
+ if (a->rx_enable)
+ stem = format (stem, "rx");
+ if (a->tx_enable)
+ stem = format (stem, "tx");
+ if (a->drop_enable)
+ stem = format (stem, "drop");
+ a->filename = format (0, "/tmp/%v.pcap%c", stem, 0);
+ vec_free (stem);
+ }
- if (vm->pcap[rx_tx].pcap_enable == 0)
- {
- vlib_cli_output (vm, "pcap %s capture is off...",
- (rx_tx == VLIB_RX) ? "rx" : "tx");
- }
- else
+ 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];
+ else
+ pp->filter_classify_table_index = ~0;
+ pp->pcap_rx_enable = a->rx_enable;
+ pp->pcap_tx_enable = a->tx_enable;
+ pp->pcap_drop_enable = a->drop_enable;
+ pp->max_bytes_per_pkt = a->max_bytes_per_pkt;
+ }
+ else
+ {
+ pp->pcap_rx_enable = 0;
+ pp->pcap_tx_enable = 0;
+ pp->pcap_drop_enable = 0;
+ pp->filter_classify_table_index = ~0;
+ if (pm->n_packets_captured)
+ {
+ clib_error_t *error;
+ pm->n_packets_to_capture = pm->n_packets_captured;
+ vlib_cli_output (vm, "Write %d packets to %s, and stop capture...",
+ pm->n_packets_captured, pm->file_name);
+ error = pcap_write (pm);
+ if (pm->flags & PCAP_MAIN_INIT_DONE)
+ pcap_close (pm);
+ /* Report I/O errors... */
+ if (error)
{
- vlib_cli_output (vm, "pcap %s capture is on: %d of %d pkts...",
- (rx_tx == VLIB_RX) ? "rx" : "tx",
- vm->pcap[rx_tx].pcap_main.n_packets_captured,
- vm->pcap[rx_tx].
- pcap_main.n_packets_to_capture);
+ clib_error_report (error);
+ return VNET_API_ERROR_SYSCALL_ERROR_1;
}
- break;
+ vec_free (pm->file_name);
+ if (a->free_data)
+ vec_free (pm->pcap_data);
+ return 0;
}
+ else
+ return VNET_API_ERROR_NO_SUCH_ENTRY;
+ }
+ return 0;
+}
+
+static clib_error_t *
+pcap_trace_command_fn (vlib_main_t * vm,
+ unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+ unformat_input_t _line_input, *line_input = &_line_input;
+ vnet_pcap_dispatch_trace_args_t _a, *a = &_a;
+ vnet_main_t *vnm = vnet_get_main ();
+ u8 *filename = 0;
+ u32 max = 1000;
+ u32 max_bytes_per_pkt = 512;
+ int rv;
+ int rx_enable = 0;
+ int tx_enable = 0;
+ int preallocate_data = 0;
+ int drop_enable = 0;
+ int status = 0;
+ int filter = 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))
+ return 0;
+
+ while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (line_input, "rx"))
+ rx_enable = 1;
+ else if (unformat (line_input, "tx"))
+ tx_enable = 1;
+ else if (unformat (line_input, "drop"))
+ drop_enable = 1;
+ else if (unformat (line_input, "off"))
+ rx_enable = tx_enable = drop_enable = 0;
+ else if (unformat (line_input, "max-bytes-per-pkt %u",
+ &max_bytes_per_pkt))
+ ;
+ else if (unformat (line_input, "max %d", &max))
+ ;
+ else if (unformat (line_input, "packets-to-capture %d", &max))
+ ;
+ else if (unformat (line_input, "file %U", unformat_vlib_tmpfile,
+ &filename))
+ ;
+ else if (unformat (line_input, "status %=", &status, 1))
+ ;
+ else if (unformat (line_input, "intfc %U",
+ unformat_vnet_sw_interface, vnm, &sw_if_index))
+ ;
+ 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;
else
{
- error = clib_error_return (0, "unknown input `%U'",
- format_unformat_error, line_input);
- errorFlag = 1;
- break;
+ return clib_error_return (0, "unknown input `%U'",
+ format_unformat_error, line_input);
}
}
+
unformat_free (line_input);
+ /* no need for memset (a, 0, sizeof (*a)), set all fields here. */
+ 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;
+ a->sw_if_index = sw_if_index;
+ a->filter = filter;
+ a->max_bytes_per_pkt = max_bytes_per_pkt;
+
+ rv = vnet_pcap_dispatch_trace_configure (a);
- if (errorFlag == 0)
+ switch (rv)
{
- /* Since no error, save configured values. */
- if (chroot_filename)
- {
- if (vm->pcap[rx_tx].pcap_main.file_name)
- vec_free (vm->pcap[rx_tx].pcap_main.file_name);
- vec_add1 (chroot_filename, 0);
- vm->pcap[rx_tx].pcap_main.file_name = (char *) chroot_filename;
- }
+ case 0:
+ break;
- if (max)
- vm->pcap[rx_tx].pcap_main.n_packets_to_capture = max;
+ case VNET_API_ERROR_INVALID_VALUE:
+ return clib_error_return (0, "dispatch trace already enabled...");
- if (enabled)
- {
- if (vm->pcap[rx_tx].pcap_main.file_name == 0)
- vm->pcap[rx_tx].pcap_main.file_name
- = (char *) format (0, "/tmp/vpe.pcap%c", 0);
-
- vm->pcap[rx_tx].pcap_main.n_packets_captured = 0;
- vm->pcap[rx_tx].pcap_main.packet_type = PCAP_PACKET_TYPE_ethernet;
- if (vm->pcap[rx_tx].pcap_main.lock == 0)
- clib_spinlock_init (&(vm->pcap[rx_tx].pcap_main.lock));
- vm->pcap[rx_tx].pcap_enable = 1;
- vlib_cli_output (vm, "pcap %s capture on...",
- rx_tx == VLIB_RX ? "rx" : "tx");
- }
- }
- else if (chroot_filename)
- vec_free (chroot_filename);
+ case VNET_API_ERROR_VALUE_EXIST:
+ return clib_error_return (0, "dispatch trace already disabled...");
- return error;
-}
+ case VNET_API_ERROR_INVALID_VALUE_2:
+ return clib_error_return
+ (0, "can't change number of records to capture while tracing...");
-static clib_error_t *
-pcap_rx_trace_command_fn (vlib_main_t * vm,
- unformat_input_t * input, vlib_cli_command_t * cmd)
-{
- return pcap_trace_command_internal (vm, input, cmd, VLIB_RX);
-}
+ case VNET_API_ERROR_SYSCALL_ERROR_1:
+ return clib_error_return (0, "I/O writing trace capture...");
-static clib_error_t *
-pcap_tx_trace_command_fn (vlib_main_t * vm,
- unformat_input_t * input, vlib_cli_command_t * cmd)
-{
- return pcap_trace_command_internal (vm, input, cmd, VLIB_TX);
-}
+ case VNET_API_ERROR_NO_SUCH_ENTRY:
+ return clib_error_return (0, "No packets captured...");
+
+ case VNET_API_ERROR_INVALID_MEMORY_SIZE:
+ return clib_error_return (0,
+ "Max bytes per pkt must be > 32, < 9000...");
+
+ case VNET_API_ERROR_NO_SUCH_LABEL:
+ return clib_error_return
+ (0, "No classify filter configured, see 'classify filter...'");
+ default:
+ vlib_cli_output (vm, "WARNING: trace configure returned %d", rv);
+ break;
+ }
+ return 0;
+}
/*?
* This command is used to start or stop a packet capture, or show
- * the status of packet capture. Note that both "pcap rx trace" and
- * "pcap tx trace" are implemented. The command syntax is identical,
- * simply substitute rx for tx as needed.
+ * the status of packet capture.
*
* This command has the following optional parameters:
*
- * - <b>on|off</b> - Used to start or stop a packet capture.
+ *
+ * - <b>rx</b> - Capture received packets
+ *
+ * - <b>tx</b> - Capture transmitted packets
+ *
+ * - <b>drop</b> - Capture dropped packets
+ *
+ * - <b>off</b> - Stop capturing packets, write results to the specified file
*
* - <b>max <nn></b> - Depth of local buffer. Once '<em>nn</em>' number
* of packets have been received, buffer is flushed to file. Once another
* to file, overwriting previous write. If not entered, value defaults
* to 100. Can only be updated if packet capture is off.
*
- * - <b>intfc <interface>|any</b> - Used to specify a given interface,
+ * - <b>max-bytes-per-pkt <nnnn></b> - Maximum number of bytes to capture
+ * for each packet. Must be >= 32, <= 9000.
+ *
+ * - <b>preallocate-data</b> - Preallocate the data buffer, to avoid
+ * vector expansion delays during pcap capture
+ *
+ * - <b>free-data</b> - Free the data buffer. Ordinarily it's a feature
+ * to retain the data buffer so this option is seldom used.
+ *
+ * - <b>intfc <interface-name>|any</b> - Used to specify a given interface,
* or use '<em>any</em>' to run packet capture on all interfaces.
* '<em>any</em>' is the default if not provided. Settings from a previous
* packet capture are preserved, so '<em>any</em>' can be used to reset
* the interface setting.
*
+ * - <b>filter</b> - Use the pcap rx / tx / drop trace filter, which
+ * must be configured. Use <b>classify filter pcap...</b> to configure the
+ * filter. The filter will only be executed if the per-interface or
+ * any-interface tests fail.
+ *
* - <b>file <name></b> - Used to specify the output filename. The file will
* be placed in the '<em>/tmp</em>' directory, so only the filename is
* supported. Directory should not be entered. If file already exists, file
- * will be overwritten. If no filename is provided, '<em>/tmp/vpe.pcap</em>'
- * will be used. Can only be updated if packet capture is off.
+ * will be overwritten. If no filename is provided, the file will be
+ * named "/tmp/rx.pcap", "/tmp/tx.pcap", "/tmp/rxandtx.pcap", etc.
+ * Can only be updated if packet capture is off.
*
* - <b>status</b> - Displays the current status and configured attributes
* associated with a packet capture. If packet capture is in progress,
*
* @cliexpar
* Example of how to display the status of a tx packet capture when off:
- * @cliexstart{pcap tx trace status}
+ * @cliexstart{pcap trace status}
* max is 100, for any interface to file /tmp/vpe.pcap
* pcap tx capture is off...
* @cliexend
* Example of how to start a tx packet capture:
- * @cliexstart{pcap tx trace on max 35 intfc GigabitEthernet0/8/0 file vppTest.pcap}
- * pcap tx capture on...
+ * @cliexstart{pcap trace tx max 35 intfc GigabitEthernet0/8/0 file vppTest.pcap}
* @cliexend
* Example of how to display the status of a tx packet capture in progress:
- * @cliexstart{pcap tx trace status}
+ * @cliexstart{pcap trace status}
* max is 35, for interface GigabitEthernet0/8/0 to file /tmp/vppTest.pcap
* pcap tx capture is on: 20 of 35 pkts...
* @cliexend
* Example of how to stop a tx packet capture:
- * @cliexstart{vppctl pcap tx trace off}
+ * @cliexstart{pcap trace off}
* captured 21 pkts...
* saved to /tmp/vppTest.pcap...
* @cliexend
/* *INDENT-OFF* */
VLIB_CLI_COMMAND (pcap_tx_trace_command, static) = {
- .path = "pcap tx trace",
- .short_help =
- "pcap tx trace [on|off] [max <nn>] [intfc <interface>|any] [file <name>] [status]",
- .function = pcap_tx_trace_command_fn,
-};
-VLIB_CLI_COMMAND (pcap_rx_trace_command, static) = {
- .path = "pcap rx trace",
+ .path = "pcap trace",
.short_help =
- "pcap rx trace [on|off] [max <nn>] [intfc <interface>|any] [file <name>] [status]",
- .function = pcap_rx_trace_command_fn,
+ "pcap trace [rx] [tx] [drop] [off] [max <nn>] [intfc <interface>|any]\n"
+ " [file <name>] [status] [max-bytes-per-pkt <nnnn>][filter]\n"
+ " [preallocate-data][free-data]",
+ .function = pcap_trace_command_fn,
};
/* *INDENT-ON* */
-
/*
* fd.io coding-style-patch-verification: ON
*