X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;ds=inline;f=src%2Fplugins%2Fdpdk%2Fdevice%2Fcli.c;h=416d973604fa7356f96777d21aa80a2e6d598a9d;hb=03598c4bcc639cbfc9afa13c5b4e52440f9eae2b;hp=aeeb772d4fb44c5d8444fa672516f3585d7e5ded;hpb=12059c9b6da0536a74d3003cebed61225a8a8ee7;p=vpp.git diff --git a/src/plugins/dpdk/device/cli.c b/src/plugins/dpdk/device/cli.c index aeeb772d4fb..416d973604f 100644 --- a/src/plugins/dpdk/device/cli.c +++ b/src/plugins/dpdk/device/cli.c @@ -12,13 +12,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + +#include +#include + #include #include #include #include #include +#include #include +#include #include #include #include @@ -34,6 +40,7 @@ */ +#if 0 static clib_error_t * get_hqos (u32 hw_if_index, u32 subport_id, dpdk_device_t ** xd, dpdk_device_config_t ** devconf) @@ -41,6 +48,7 @@ get_hqos (u32 hw_if_index, u32 subport_id, dpdk_device_t ** xd, dpdk_main_t *dm = &dpdk_main; vnet_hw_interface_t *hw; struct rte_eth_dev_info dev_info; + struct rte_pci_device *pci_dev; uword *p = 0; clib_error_t *error = NULL; @@ -60,15 +68,18 @@ get_hqos (u32 hw_if_index, u32 subport_id, dpdk_device_t ** xd, hw = vnet_get_hw_interface (dm->vnet_main, hw_if_index); *xd = vec_elt_at_index (dm->devices, hw->dev_instance); - rte_eth_dev_info_get ((*xd)->device_index, &dev_info); - if (dev_info.pci_dev) - { /* bonded interface has no pci info */ + rte_eth_dev_info_get ((*xd)->port_id, &dev_info); + + pci_dev = dpdk_get_pci_device (&dev_info); + + if (pci_dev) + { vlib_pci_addr_t pci_addr; - pci_addr.domain = dev_info.pci_dev->addr.domain; - pci_addr.bus = dev_info.pci_dev->addr.bus; - pci_addr.slot = dev_info.pci_dev->addr.devid; - pci_addr.function = dev_info.pci_dev->addr.function; + pci_addr.domain = pci_dev->addr.domain; + pci_addr.bus = pci_dev->addr.bus; + pci_addr.slot = pci_dev->addr.devid; + pci_addr.function = pci_dev->addr.function; p = hash_get (dm->conf->device_config_index_by_pci_addr, pci_addr.as_u32); @@ -82,304 +93,135 @@ get_hqos (u32 hw_if_index, u32 subport_id, dpdk_device_t ** xd, done: return error; } +#endif static clib_error_t * -pcap_trace_command_fn (vlib_main_t * vm, - unformat_input_t * input, vlib_cli_command_t * cmd) +show_dpdk_buffer (vlib_main_t * vm, unformat_input_t * input, + vlib_cli_command_t * cmd) { -#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->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->tx_pcap_enable) - { - vlib_cli_output (vm, "captured %d pkts...", - dm->pcap_main.n_packets_captured + 1); - if (dm->pcap_main.n_packets_captured) - { - dm->pcap_main.n_packets_to_capture = - dm->pcap_main.n_packets_captured; - error = pcap_write (&dm->pcap_main); - if (error) - clib_error_report (error); - else - vlib_cli_output (vm, "saved to %s...", dm->pcap_filename); - } - - dm->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->tx_pcap_enable) - { - vlib_cli_output (vm, - "can't change max value while pcap tx capture active..."); - errorFlag = 1; - break; - } - } - else if (unformat (line_input, "intfc %U", - unformat_vnet_sw_interface, dm->vnet_main, - &dm->pcap_sw_if_index)) - ; - - else if (unformat (line_input, "intfc any")) - { - dm->pcap_sw_if_index = 0; - } - else if (unformat (line_input, "file %s", &filename)) - { - if (dm->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: Only filename, do not enter directory structure."); - 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_sw_if_index == 0) - { - vlib_cli_output (vm, "max is %d for any interface to file %s", - dm-> - pcap_pkts_to_capture ? dm->pcap_pkts_to_capture - : PCAP_DEF_PKT_TO_CAPTURE, - dm-> - pcap_filename ? dm->pcap_filename : (u8 *) - "/tmp/vpe.pcap"); - } - else - { - vlib_cli_output (vm, "max is %d for interface %U to file %s", - dm-> - 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_filename ? dm->pcap_filename : (u8 *) - "/tmp/vpe.pcap"); - } - - if (dm->tx_pcap_enable == 0) - { - vlib_cli_output (vm, "pcap tx capture is off..."); - } - else - { - vlib_cli_output (vm, "pcap tx capture is on: %d of %d pkts...", - dm->pcap_main.n_packets_captured, - dm->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_filename) - vec_free (dm->pcap_filename); - vec_add1 (chroot_filename, 0); - dm->pcap_filename = chroot_filename; - } - - if (max) - dm->pcap_pkts_to_capture = max; - - - if (enabled) - { - if (dm->pcap_filename == 0) - dm->pcap_filename = format (0, "/tmp/vpe.pcap%c", 0); - - memset (&dm->pcap_main, 0, sizeof (dm->pcap_main)); - dm->pcap_main.file_name = (char *) dm->pcap_filename; - dm->pcap_main.n_packets_to_capture = PCAP_DEF_PKT_TO_CAPTURE; - if (dm->pcap_pkts_to_capture) - dm->pcap_main.n_packets_to_capture = dm->pcap_pkts_to_capture; - - dm->pcap_main.packet_type = PCAP_PACKET_TYPE_ethernet; - dm->tx_pcap_enable = 1; - vlib_cli_output (vm, "pcap tx capture on..."); - } - } - else if (chroot_filename) - vec_free (chroot_filename); + vlib_buffer_main_t *bm = vm->buffer_main; + vlib_buffer_pool_t *bp; + 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); - return error; + 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; } /*? - * This command is used to start or stop a packet capture, or show - * the status of packet capture. - * - * This command has the following optional parameters: - * - * - on|off - Used to start or stop a packet capture. - * - * - max - Depth of local buffer. Once 'nn' number - * of packets have been received, buffer is flushed to file. Once another - * 'nn' 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. - * - * - 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 - * packet capture are preserved, so 'any' can be used to reset - * the interface setting. - * - * - file - Used to specify the output filename. The file will - * be placed in the '/tmp' 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, '/tmp/vpe.pcap' - * will be used. Can only be updated if packet capture is off. - * - * - status - Displays the current status and configured attributes - * associated with a packet capture. If packet capture is in progress, - * 'status' also will return the number of packets currently in - * the local buffer. All additional attributes entered on command line - * with 'status' will be ingnored and not applied. + * This command displays statistics of each DPDK mempool. * * @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... + * Example of how to display DPDK buffer data: + * @cliexstart{show dpdk buffer} + * name="mbuf_pool_socket0" available = 15104 allocated = 1280 total = 16384 * @cliexend ?*/ /* *INDENT-OFF* */ -VLIB_CLI_COMMAND (pcap_trace_command, static) = { - .path = "pcap tx trace", - .short_help = - "pcap tx trace [on|off] [max ] [intfc |any] [file ] [status]", - .function = pcap_trace_command_fn, +VLIB_CLI_COMMAND (cmd_show_dpdk_buffer,static) = { + .path = "show dpdk buffer", + .short_help = "show dpdk buffer", + .function = show_dpdk_buffer, + .is_mp_safe = 1, }; /* *INDENT-ON* */ - static clib_error_t * -show_dpdk_buffer (vlib_main_t * vm, unformat_input_t * input, - vlib_cli_command_t * cmd) +show_dpdk_physmem (vlib_main_t * vm, unformat_input_t * input, + vlib_cli_command_t * cmd) { - struct rte_mempool *rmp; - int i; + clib_error_t *err = 0; + u32 pipe_max_size; + int fds[2]; + u8 *s = 0; + int n, n_try; + FILE *f; + + err = clib_sysfs_read ("/proc/sys/fs/pipe-max-size", "%u", &pipe_max_size); + + if (err) + return err; - for (i = 0; i < vec_len (dpdk_main.pktmbuf_pools); i++) + if (pipe (fds) == -1) + return clib_error_return_unix (0, "pipe"); + +#ifndef F_SETPIPE_SZ +#define F_SETPIPE_SZ (1024 + 7) +#endif + + if (fcntl (fds[1], F_SETPIPE_SZ, pipe_max_size) == -1) { - rmp = dpdk_main.pktmbuf_pools[i]; - if (rmp) - { - unsigned count = rte_mempool_avail_count (rmp); - unsigned free_count = rte_mempool_in_use_count (rmp); + err = clib_error_return_unix (0, "fcntl(F_SETPIPE_SZ)"); + goto error; + } - 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 + if (fcntl (fds[0], F_SETFL, O_NONBLOCK) == -1) + { + err = clib_error_return_unix (0, "fcntl(F_SETFL)"); + goto error; + } + + if ((f = fdopen (fds[1], "a")) == 0) + { + err = clib_error_return_unix (0, "fdopen"); + goto error; + } + + rte_dump_physmem_layout (f); + fflush (f); + + n = n_try = 4096; + while (n == n_try) + { + uword len = vec_len (s); + vec_resize (s, len + n_try); + + n = read (fds[0], s + len, n_try); + if (n < 0 && errno != EAGAIN) { - vlib_cli_output (vm, "rte_mempool is NULL (!)\n"); + err = clib_error_return_unix (0, "read"); + goto error; } + _vec_len (s) = len + (n < 0 ? 0 : n); } - return 0; + + vlib_cli_output (vm, "%v", s); + +error: + close (fds[0]); + close (fds[1]); + vec_free (s); + return err; } /*? - * This command displays statistics of each DPDK mempool. + * This command displays DPDK physmem layout * * @cliexpar - * Example of how to display DPDK buffer data: - * @cliexstart{show dpdk buffer} - * name="mbuf_pool_socket0" available = 15104 allocated = 1280 total = 16384 + * Example of how to display DPDK physmem layout: + * @cliexstart{show dpdk physmem} * @cliexend ?*/ /* *INDENT-OFF* */ -VLIB_CLI_COMMAND (cmd_show_dpdk_bufferr,static) = { - .path = "show dpdk buffer", - .short_help = "show dpdk buffer", - .function = show_dpdk_buffer, +VLIB_CLI_COMMAND (cmd_show_dpdk_physmem,static) = { + .path = "show dpdk physmem", + .short_help = "show dpdk physmem", + .function = show_dpdk_physmem, .is_mp_safe = 1, }; /* *INDENT-ON* */ @@ -447,7 +289,7 @@ test_dpdk_buffer (vlib_main_t * vm, unformat_input_t * input, * @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 @@ -566,6 +408,7 @@ VLIB_CLI_COMMAND (cmd_set_dpdk_if_desc,static) = { }; /* *INDENT-ON* */ +#if 0 static int dpdk_device_queue_sort (void *a1, void *a2) { @@ -603,7 +446,7 @@ show_dpdk_if_hqos_placement (vlib_main_t * vm, unformat_input_t * input, 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]) { @@ -1094,6 +937,7 @@ set_dpdk_if_hqos_pktfield (vlib_main_t * vm, unformat_input_t * input, /* Device specific data */ struct rte_eth_dev_info dev_info; + struct rte_pci_device *pci_dev; dpdk_device_config_t *devconf = 0; vnet_hw_interface_t *hw; dpdk_device_t *xd; @@ -1159,15 +1003,18 @@ set_dpdk_if_hqos_pktfield (vlib_main_t * vm, unformat_input_t * input, hw = vnet_get_hw_interface (dm->vnet_main, hw_if_index); xd = vec_elt_at_index (dm->devices, hw->dev_instance); - rte_eth_dev_info_get (xd->device_index, &dev_info); - if (dev_info.pci_dev) - { /* bonded interface has no pci info */ + rte_eth_dev_info_get (xd->port_id, &dev_info); + + pci_dev = dpdk_get_pci_device (&dev_info); + + if (pci_dev) + { vlib_pci_addr_t pci_addr; - pci_addr.domain = dev_info.pci_dev->addr.domain; - pci_addr.bus = dev_info.pci_dev->addr.bus; - pci_addr.slot = dev_info.pci_dev->addr.devid; - pci_addr.function = dev_info.pci_dev->addr.function; + pci_addr.domain = pci_dev->addr.domain; + pci_addr.bus = pci_dev->addr.bus; + pci_addr.slot = pci_dev->addr.devid; + pci_addr.function = pci_dev->addr.function; p = hash_get (dm->conf->device_config_index_by_pci_addr, pci_addr.as_u32); @@ -1233,20 +1080,20 @@ set_dpdk_if_hqos_pktfield (vlib_main_t * vm, unformat_input_t * input, xd->hqos_wt[worker_thread_first + i].hqos_field0_slabpos = offset; xd->hqos_wt[worker_thread_first + i].hqos_field0_slabmask = mask; xd->hqos_wt[worker_thread_first + i].hqos_field0_slabshr = - __builtin_ctzll (mask); + count_trailing_zeros (mask); break; case 1: xd->hqos_wt[worker_thread_first + i].hqos_field1_slabpos = offset; xd->hqos_wt[worker_thread_first + i].hqos_field1_slabmask = mask; xd->hqos_wt[worker_thread_first + i].hqos_field1_slabshr = - __builtin_ctzll (mask); + count_trailing_zeros (mask); break; case 2: default: xd->hqos_wt[worker_thread_first + i].hqos_field2_slabpos = offset; xd->hqos_wt[worker_thread_first + i].hqos_field2_slabmask = mask; xd->hqos_wt[worker_thread_first + i].hqos_field2_slabshr = - __builtin_ctzll (mask); + count_trailing_zeros (mask); } done: @@ -1256,7 +1103,7 @@ done: } /*? - * 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. @@ -1319,6 +1166,7 @@ show_dpdk_if_hqos (vlib_main_t * vm, unformat_input_t * input, u32 hw_if_index = (u32) ~ 0; u32 profile_id, subport_id, i; struct rte_eth_dev_info dev_info; + struct rte_pci_device *pci_dev; dpdk_device_config_t *devconf = 0; vlib_thread_registration_t *tr; uword *p = 0; @@ -1350,15 +1198,18 @@ show_dpdk_if_hqos (vlib_main_t * vm, unformat_input_t * input, hw = vnet_get_hw_interface (dm->vnet_main, hw_if_index); xd = vec_elt_at_index (dm->devices, hw->dev_instance); - rte_eth_dev_info_get (xd->device_index, &dev_info); - if (dev_info.pci_dev) - { /* bonded interface has no pci info */ + rte_eth_dev_info_get (xd->port_id, &dev_info); + + pci_dev = dpdk_get_pci_device (&dev_info); + + if (pci_dev) + { vlib_pci_addr_t pci_addr; - pci_addr.domain = dev_info.pci_dev->addr.domain; - pci_addr.bus = dev_info.pci_dev->addr.bus; - pci_addr.slot = dev_info.pci_dev->addr.devid; - pci_addr.function = dev_info.pci_dev->addr.function; + pci_addr.domain = pci_dev->addr.domain; + pci_addr.bus = pci_dev->addr.bus; + pci_addr.slot = pci_dev->addr.devid; + pci_addr.function = pci_dev->addr.function; p = hash_get (dm->conf->device_config_index_by_pci_addr, pci_addr.as_u32); @@ -1716,6 +1567,7 @@ show_dpdk_hqos_queue_stats (vlib_main_t * vm, unformat_input_t * input, dpdk_device_t *xd; uword *p = 0; struct rte_eth_dev_info dev_info; + struct rte_pci_device *pci_dev; dpdk_device_config_t *devconf = 0; u32 qindex; struct rte_sched_queue_stats stats; @@ -1760,15 +1612,18 @@ show_dpdk_hqos_queue_stats (vlib_main_t * vm, unformat_input_t * input, hw = vnet_get_hw_interface (dm->vnet_main, hw_if_index); xd = vec_elt_at_index (dm->devices, hw->dev_instance); - rte_eth_dev_info_get (xd->device_index, &dev_info); - if (dev_info.pci_dev) + rte_eth_dev_info_get (xd->port_id, &dev_info); + + 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 = dev_info.pci_dev->addr.domain; - pci_addr.bus = dev_info.pci_dev->addr.bus; - pci_addr.slot = dev_info.pci_dev->addr.devid; - pci_addr.function = dev_info.pci_dev->addr.function; + pci_addr.domain = pci_dev->addr.domain; + pci_addr.bus = pci_dev->addr.bus; + pci_addr.slot = pci_dev->addr.devid; + pci_addr.function = pci_dev->addr.function; p = hash_get (dm->conf->device_config_index_by_pci_addr, pci_addr.as_u32); @@ -1853,6 +1708,7 @@ VLIB_CLI_COMMAND (cmd_show_dpdk_hqos_queue_stats, static) = { .function = show_dpdk_hqos_queue_stats, }; /* *INDENT-ON* */ +#endif static clib_error_t * show_dpdk_version_command_fn (vlib_main_t * vm, @@ -1871,7 +1727,7 @@ 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 @@ -1885,6 +1741,12 @@ VLIB_CLI_COMMAND (show_vpe_version_command, static) = { }; /* *INDENT-ON* */ +/* Dummy function to get us linked in. */ +void +dpdk_cli_reference (void) +{ +} + clib_error_t * dpdk_cli_init (vlib_main_t * vm) {