#include <vppinfra/linux/sysfs.c>
#include <vnet/ethernet/ethernet.h>
+#include <dpdk/buffer.h>
#include <dpdk/device/dpdk.h>
#include <vnet/classify/vnet_classify.h>
#include <vnet/mpls/packet.h>
*/
+#if 0
static clib_error_t *
get_hqos (u32 hw_if_index, u32 subport_id, dpdk_device_t ** xd,
dpdk_device_config_t ** devconf)
rte_eth_dev_info_get ((*xd)->port_id, &dev_info);
-#if RTE_VERSION < RTE_VERSION_NUM(18, 5, 0, 0)
- pci_dev = dev_info.pci_dev;
-#else
- pci_dev = RTE_DEV_TO_PCI (dev_info.device);
-#endif
+ pci_dev = dpdk_get_pci_device (&dev_info);
if (pci_dev)
- { /* bonded interface has no pci info */
+ {
vlib_pci_addr_t pci_addr;
pci_addr.domain = pci_dev->addr.domain;
done:
return error;
}
-
-static inline clib_error_t *
-pcap_trace_command_internal (vlib_main_t * vm,
- unformat_input_t * input,
- vlib_cli_command_t * cmd, int rx_tx)
-{
-#define PCAP_DEF_PKT_TO_CAPTURE (100)
-
- unformat_input_t _line_input, *line_input = &_line_input;
- dpdk_main_t *dm = &dpdk_main;
- u8 *filename;
- u8 *chroot_filename = 0;
- u32 max = 0;
- int enabled = 0;
- int errorFlag = 0;
- clib_error_t *error = 0;
-
- /* 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 (dm->pcap[rx_tx].pcap_enable == 0)
- {
- enabled = 1;
- }
- else
- {
- vlib_cli_output (vm, "pcap tx capture already on...");
- errorFlag = 1;
- break;
- }
- }
- else if (unformat (line_input, "off"))
- {
- if (dm->pcap[rx_tx].pcap_enable)
- {
- vlib_cli_output
- (vm, "captured %d pkts...",
- dm->pcap[rx_tx].pcap_main.n_packets_captured);
- if (dm->pcap[rx_tx].pcap_main.n_packets_captured)
- {
- dm->pcap[rx_tx].pcap_main.n_packets_to_capture =
- dm->pcap[rx_tx].pcap_main.n_packets_captured;
- error = pcap_write (&dm->pcap[rx_tx].pcap_main);
- if (error)
- clib_error_report (error);
- else
- vlib_cli_output (vm, "saved to %s...",
- dm->pcap[rx_tx].pcap_filename);
- }
-
- dm->pcap[rx_tx].pcap_enable = 0;
- }
- else
- {
- vlib_cli_output (vm, "pcap tx capture already off...");
- errorFlag = 1;
- break;
- }
- }
- else if (unformat (line_input, "max %d", &max))
- {
- if (dm->pcap[rx_tx].pcap_enable)
- {
- vlib_cli_output
- (vm,
- "can't change max value while pcap tx capture active...");
- errorFlag = 1;
- break;
- }
- dm->pcap[rx_tx].pcap_main.n_packets_to_capture = max;
- }
- else if (unformat (line_input, "intfc %U",
- unformat_vnet_sw_interface, dm->vnet_main,
- &dm->pcap[rx_tx].pcap_sw_if_index))
- ;
-
- else if (unformat (line_input, "intfc any"))
- {
- dm->pcap[rx_tx].pcap_sw_if_index = 0;
- }
- else if (unformat (line_input, "file %s", &filename))
- {
- if (dm->pcap[rx_tx].pcap_enable)
- {
- vlib_cli_output
- (vm, "can't change file while pcap tx capture active...");
- errorFlag = 1;
- break;
- }
-
- /* 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);
- }
- else if (unformat (line_input, "status"))
- {
- if (dm->pcap[rx_tx].pcap_sw_if_index == 0)
- {
- vlib_cli_output
- (vm, "max is %d for any interface to file %s",
- dm->pcap_pkts_to_capture ?
- dm->pcap[rx_tx].pcap_pkts_to_capture
- : PCAP_DEF_PKT_TO_CAPTURE,
- dm->pcap_filename ?
- dm->pcap[rx_tx].pcap_filename : (u8 *) "/tmp/vpe.pcap");
- }
- else
- {
- vlib_cli_output (vm, "max is %d for interface %U to file %s",
- dm->pcap[rx_tx].pcap_pkts_to_capture
- ? dm->pcap_pkts_to_capture
- : PCAP_DEF_PKT_TO_CAPTURE,
- format_vnet_sw_if_index_name, dm->vnet_main,
- dm->pcap_sw_if_index,
- dm->pcap[rx_tx].pcap_filename
- ? dm->pcap[rx_tx].pcap_filename : (u8 *)
- "/tmp/vpe.pcap");
- }
-
- if (dm->pcap[rx_tx].pcap_enable == 0)
- {
- vlib_cli_output (vm, "pcap %s capture is off...",
- (rx_tx == VLIB_RX) ? "rx" : "tx");
- }
- else
- {
- vlib_cli_output (vm, "pcap %s capture is on: %d of %d pkts...",
- (rx_tx == VLIB_RX) ? "rx" : "tx",
- dm->pcap[rx_tx].pcap_main.n_packets_captured,
- dm->pcap[rx_tx].
- pcap_main.n_packets_to_capture);
- }
- break;
- }
-
- else
- {
- error = clib_error_return (0, "unknown input `%U'",
- format_unformat_error, line_input);
- errorFlag = 1;
- break;
- }
- }
- unformat_free (line_input);
-
-
- if (errorFlag == 0)
- {
- /* Since no error, save configured values. */
- if (chroot_filename)
- {
- if (dm->pcap[rx_tx].pcap_filename)
- vec_free (dm->pcap[rx_tx].pcap_filename);
- vec_add1 (chroot_filename, 0);
- dm->pcap[rx_tx].pcap_filename = chroot_filename;
- }
-
- if (max)
- dm->pcap[rx_tx].pcap_pkts_to_capture = max;
-
-
- if (enabled)
- {
- if (dm->pcap[rx_tx].pcap_filename == 0)
- dm->pcap[rx_tx].pcap_filename = format (0, "/tmp/vpe.pcap%c", 0);
-
- memset (&dm->pcap[rx_tx].pcap_main, 0,
- sizeof (dm->pcap[rx_tx].pcap_main));
- dm->pcap[rx_tx].pcap_main.file_name =
- (char *) dm->pcap[rx_tx].pcap_filename;
- dm->pcap[rx_tx].pcap_main.n_packets_to_capture
- = PCAP_DEF_PKT_TO_CAPTURE;
- if (dm->pcap[rx_tx].pcap_pkts_to_capture)
- dm->pcap[rx_tx].pcap_main.n_packets_to_capture
- = dm->pcap[rx_tx].pcap_pkts_to_capture;
-
- dm->pcap[rx_tx].pcap_main.packet_type = PCAP_PACKET_TYPE_ethernet;
- dm->pcap[rx_tx].pcap_enable = 1;
- vlib_cli_output (vm, "pcap tx capture on...");
- }
- }
- else if (chroot_filename)
- vec_free (chroot_filename);
-
- return error;
-}
-
-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);
-}
-
-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);
-}
-
-
-/*?
- * 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.
- *
- * This command has the following optional parameters:
- *
- * - <b>on|off</b> - Used to start or stop a packet capture.
- *
- * - <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
- * '<em>nn</em>' number of packets have been received, buffer is flushed
- * 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,
- * 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>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.
- *
- * - <b>status</b> - Displays the current status and configured attributes
- * associated with a packet capture. If packet capture is in progress,
- * '<em>status</em>' also will return the number of packets currently in
- * the local buffer. All additional attributes entered on command line
- * with '<em>status</em>' will be ingnored and not applied.
- *
- * @cliexpar
- * Example of how to display the status of a tx packet capture when off:
- * @cliexstart{pcap tx 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...
- * @cliexend
- * Example of how to display the status of a tx packet capture in progress:
- * @cliexstart{pcap tx 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}
- * 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",
- .short_help =
- "pcap rx trace [on|off] [max <nn>] [intfc <interface>|any] [file <name>] [status]",
- .function = pcap_rx_trace_command_fn,
-};
-/* *INDENT-ON* */
-
+#endif
static clib_error_t *
show_dpdk_buffer (vlib_main_t * vm, unformat_input_t * input,
vlib_cli_command_t * cmd)
{
- struct rte_mempool *rmp;
- int i;
+ vlib_buffer_main_t *bm = vm->buffer_main;
+ vlib_buffer_pool_t *bp;
- for (i = 0; i < vec_len (dpdk_main.pktmbuf_pools); i++)
- {
- rmp = dpdk_main.pktmbuf_pools[i];
- if (rmp)
- {
- unsigned count = rte_mempool_avail_count (rmp);
- unsigned free_count = rte_mempool_in_use_count (rmp);
+ vec_foreach (bp, bm->buffer_pools)
+ {
+ struct rte_mempool *rmp = dpdk_mempool_by_buffer_pool_index[bp->index];
+ if (rmp)
+ {
+ unsigned count = rte_mempool_avail_count (rmp);
+ unsigned free_count = rte_mempool_in_use_count (rmp);
- vlib_cli_output (vm,
- "name=\"%s\" available = %7d allocated = %7d total = %7d\n",
- rmp->name, (u32) count, (u32) free_count,
- (u32) (count + free_count));
- }
- else
- {
- vlib_cli_output (vm, "rte_mempool is NULL (!)\n");
- }
- }
+ vlib_cli_output (vm,
+ "name=\"%s\" available = %7d allocated = %7d total = %7d\n",
+ rmp->name, (u32) count, (u32) free_count,
+ (u32) (count + free_count));
+ }
+ else
+ {
+ vlib_cli_output (vm, "rte_mempool is NULL (!)\n");
+ }
+ }
return 0;
}
* @cliexpar
* @parblock
*
- * Example of how to display how many DPDK buffer test command has allcoated:
+ * Example of how to display how many DPDK buffer test command has allocated:
* @cliexstart{test dpdk buffer}
* Currently 0 buffers allocated
* @cliexend
};
/* *INDENT-ON* */
+#if 0
static int
dpdk_device_queue_sort (void *a1, void *a2)
{
cpu < (dm->hqos_cpu_first_index + dm->hqos_cpu_count))
vlib_cli_output (vm, "Thread %u (%s at lcore %u):", cpu,
vlib_worker_threads[cpu].name,
- vlib_worker_threads[cpu].lcore_id);
+ vlib_worker_threads[cpu].cpu_id);
vec_foreach (dq, dm->devices_by_hqos_cpu[cpu])
{
rte_eth_dev_info_get (xd->port_id, &dev_info);
-#if RTE_VERSION < RTE_VERSION_NUM(18, 5, 0, 0)
- pci_dev = dev_info.pci_dev;
-#else
- pci_dev = RTE_DEV_TO_PCI (dev_info.device);
-#endif
+ pci_dev = dpdk_get_pci_device (&dev_info);
if (pci_dev)
{ /* bonded interface has no pci info */
}
/*?
- * This command is used to set the packet fields required for classifiying the
+ * This command is used to set the packet fields required for classifying the
* incoming packet. As a result of classification process, packet field
* information will be mapped to 5 tuples (subport, pipe, traffic class, pipe,
* color) and stored in packet mbuf.
rte_eth_dev_info_get (xd->port_id, &dev_info);
-#if RTE_VERSION < RTE_VERSION_NUM(18, 5, 0, 0)
- pci_dev = dev_info.pci_dev;
-#else
- pci_dev = RTE_DEV_TO_PCI (dev_info.device);
-#endif
+ pci_dev = dpdk_get_pci_device (&dev_info);
if (pci_dev)
{ /* bonded interface has no pci info */
.function = show_dpdk_hqos_queue_stats,
};
/* *INDENT-ON* */
+#endif
static clib_error_t *
show_dpdk_version_command_fn (vlib_main_t * vm,
* the list of arguments passed to DPDK when started.
*
* @cliexpar
- * Example of how to display how many DPDK buffer test command has allcoated:
+ * Example of how to display how many DPDK buffer test command has allocated:
* @cliexstart{show dpdk version}
* DPDK Version: DPDK 16.11.0
* DPDK EAL init args: -c 1 -n 4 --huge-dir /run/vpp/hugepages --file-prefix vpp -w 0000:00:08.0 -w 0000:00:09.0 --master-lcore 0 --socket-mem 256
};
/* *INDENT-ON* */
-#if CLI_DEBUG
-
-static clib_error_t *
-dpdk_validate_buffers_fn (vlib_main_t * vm, unformat_input_t * input,
- vlib_cli_command_t * cmd_arg)
-{
- u32 n_invalid_bufs = 0, uninitialized = 0;
- u32 is_poison = 0, is_test = 0;
- while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
- {
- if (unformat (input, "poison"))
- is_poison = 1;
- else if (unformat (input, "trajectory"))
- is_test = 1;
- else
- return clib_error_return (0, "unknown input `%U'",
- format_unformat_error, input);
- }
-
- if (VLIB_BUFFER_TRACE_TRAJECTORY == 0)
- {
- vlib_cli_output (vm, "Trajectory not enabled. Recompile with "
- "VLIB_BUFFER_TRACE_TRAJECTORY 1");
- return 0;
- }
- if (is_poison)
- {
- dpdk_buffer_poison_trajectory_all ();
- }
- if (is_test)
- {
- n_invalid_bufs = dpdk_buffer_validate_trajectory_all (&uninitialized);
- if (!n_invalid_bufs)
- vlib_cli_output (vm, "All buffers are valid %d uninitialized",
- uninitialized);
- else
- vlib_cli_output (vm, "Found %d invalid buffers and %d uninitialized",
- n_invalid_bufs, uninitialized);
- }
- return 0;
-}
-
-/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (test_dpdk_buffers_command, static) =
-{
- .path = "test dpdk buffers",
- .short_help = "test dpdk buffers [poison] [trajectory]",
- .function = dpdk_validate_buffers_fn,
-};
-/* *INDENT-ON* */
-
-#endif
-
clib_error_t *
dpdk_cli_init (vlib_main_t * vm)
{
Code Review / vpp.git / blobdiff