app/testpmd: remove references to deprecated statistics
[dpdk.git] / app / test-pmd / config.c
index 695162e..e2030b0 100644 (file)
 
 static char *flowtype_to_str(uint16_t flow_type);
 
+static const struct {
+       enum tx_pkt_split split;
+       const char *name;
+} tx_split_name[] = {
+       {
+               .split = TX_PKT_SPLIT_OFF,
+               .name = "off",
+       },
+       {
+               .split = TX_PKT_SPLIT_ON,
+               .name = "on",
+       },
+       {
+               .split = TX_PKT_SPLIT_RND,
+               .name = "rand",
+       },
+};
+
 struct rss_type_info {
        char str[32];
        uint64_t rss_type;
@@ -154,9 +172,7 @@ nic_stats_display(portid_t port_id)
                printf("  RX-packets: %-10"PRIu64" RX-missed: %-10"PRIu64" RX-bytes:  "
                       "%-"PRIu64"\n",
                       stats.ipackets, stats.imissed, stats.ibytes);
-               printf("  RX-badcrc:  %-10"PRIu64" RX-badlen: %-10"PRIu64" RX-errors: "
-                      "%-"PRIu64"\n",
-                      stats.ibadcrc, stats.ibadlen, stats.ierrors);
+               printf("  RX-errors: %-"PRIu64"\n", stats.ierrors);
                printf("  RX-nombuf:  %-10"PRIu64"\n",
                       stats.rx_nombuf);
                printf("  TX-packets: %-10"PRIu64" TX-errors: %-10"PRIu64" TX-bytes:  "
@@ -167,9 +183,7 @@ nic_stats_display(portid_t port_id)
                printf("  RX-packets:              %10"PRIu64"    RX-errors: %10"PRIu64
                       "    RX-bytes: %10"PRIu64"\n",
                       stats.ipackets, stats.ierrors, stats.ibytes);
-               printf("  RX-badcrc:               %10"PRIu64"    RX-badlen: %10"PRIu64
-                      "  RX-errors:  %10"PRIu64"\n",
-                      stats.ibadcrc, stats.ibadlen, stats.ierrors);
+               printf("  RX-errors:  %10"PRIu64"\n", stats.ierrors);
                printf("  RX-nombuf:               %10"PRIu64"\n",
                       stats.rx_nombuf);
                printf("  TX-packets:              %10"PRIu64"    TX-errors: %10"PRIu64
@@ -177,12 +191,6 @@ nic_stats_display(portid_t port_id)
                       stats.opackets, stats.oerrors, stats.obytes);
        }
 
-       /* stats fdir */
-       if (fdir_conf.mode != RTE_FDIR_MODE_NONE)
-               printf("  Fdirmiss:   %-10"PRIu64" Fdirmatch: %-10"PRIu64"\n",
-                      stats.fdirmiss,
-                      stats.fdirmatch);
-
        if (port->rx_queue_stats_mapping_enabled) {
                printf("\n");
                for (i = 0; i < RTE_ETHDEV_QUEUE_STAT_CNTRS; i++) {
@@ -201,14 +209,6 @@ nic_stats_display(portid_t port_id)
                }
        }
 
-       /* Display statistics of XON/XOFF pause frames, if any. */
-       if ((stats.tx_pause_xon  | stats.rx_pause_xon |
-            stats.tx_pause_xoff | stats.rx_pause_xoff) > 0) {
-               printf("  RX-XOFF:    %-10"PRIu64" RX-XON:    %-10"PRIu64"\n",
-                      stats.rx_pause_xoff, stats.rx_pause_xon);
-               printf("  TX-XOFF:    %-10"PRIu64" TX-XON:    %-10"PRIu64"\n",
-                      stats.tx_pause_xoff, stats.tx_pause_xon);
-       }
        printf("  %s############################%s\n",
               nic_stats_border, nic_stats_border);
 }
@@ -316,6 +316,69 @@ nic_stats_mapping_display(portid_t port_id)
               nic_stats_mapping_border, nic_stats_mapping_border);
 }
 
+void
+rx_queue_infos_display(portid_t port_id, uint16_t queue_id)
+{
+       struct rte_eth_rxq_info qinfo;
+       int32_t rc;
+       static const char *info_border = "*********************";
+
+       rc = rte_eth_rx_queue_info_get(port_id, queue_id, &qinfo);
+       if (rc != 0) {
+               printf("Failed to retrieve information for port: %hhu, "
+                       "RX queue: %hu\nerror desc: %s(%d)\n",
+                       port_id, queue_id, strerror(-rc), rc);
+               return;
+       }
+
+       printf("\n%s Infos for port %-2u, RX queue %-2u %s",
+              info_border, port_id, queue_id, info_border);
+
+       printf("\nMempool: %s", (qinfo.mp == NULL) ? "NULL" : qinfo.mp->name);
+       printf("\nRX prefetch threshold: %hhu", qinfo.conf.rx_thresh.pthresh);
+       printf("\nRX host threshold: %hhu", qinfo.conf.rx_thresh.hthresh);
+       printf("\nRX writeback threshold: %hhu", qinfo.conf.rx_thresh.wthresh);
+       printf("\nRX free threshold: %hu", qinfo.conf.rx_free_thresh);
+       printf("\nRX drop packets: %s",
+               (qinfo.conf.rx_drop_en != 0) ? "on" : "off");
+       printf("\nRX deferred start: %s",
+               (qinfo.conf.rx_deferred_start != 0) ? "on" : "off");
+       printf("\nRX scattered packets: %s",
+               (qinfo.scattered_rx != 0) ? "on" : "off");
+       printf("\nNumber of RXDs: %hu", qinfo.nb_desc);
+       printf("\n");
+}
+
+void
+tx_queue_infos_display(portid_t port_id, uint16_t queue_id)
+{
+       struct rte_eth_txq_info qinfo;
+       int32_t rc;
+       static const char *info_border = "*********************";
+
+       rc = rte_eth_tx_queue_info_get(port_id, queue_id, &qinfo);
+       if (rc != 0) {
+               printf("Failed to retrieve information for port: %hhu, "
+                       "TX queue: %hu\nerror desc: %s(%d)\n",
+                       port_id, queue_id, strerror(-rc), rc);
+               return;
+       }
+
+       printf("\n%s Infos for port %-2u, TX queue %-2u %s",
+              info_border, port_id, queue_id, info_border);
+
+       printf("\nTX prefetch threshold: %hhu", qinfo.conf.tx_thresh.pthresh);
+       printf("\nTX host threshold: %hhu", qinfo.conf.tx_thresh.hthresh);
+       printf("\nTX writeback threshold: %hhu", qinfo.conf.tx_thresh.wthresh);
+       printf("\nTX RS threshold: %hu", qinfo.conf.tx_rs_thresh);
+       printf("\nTX free threshold: %hu", qinfo.conf.tx_free_thresh);
+       printf("\nTX flags: %#x", qinfo.conf.txq_flags);
+       printf("\nTX deferred start: %s",
+               (qinfo.conf.tx_deferred_start != 0) ? "on" : "off");
+       printf("\nNumber of TXDs: %hu", qinfo.nb_desc);
+       printf("\n");
+}
+
 void
 port_infos_display(portid_t port_id)
 {
@@ -404,6 +467,20 @@ port_infos_display(portid_t port_id)
                        printf("  %s\n", (p ? p : "unknown"));
                }
        }
+
+       printf("Max possible RX queues: %u\n", dev_info.max_rx_queues);
+       printf("Max possible number of RXDs per queue: %hu\n",
+               dev_info.rx_desc_lim.nb_max);
+       printf("Min possible number of RXDs per queue: %hu\n",
+               dev_info.rx_desc_lim.nb_min);
+       printf("RXDs number alignment: %hu\n", dev_info.rx_desc_lim.nb_align);
+
+       printf("Max possible TX queues: %u\n", dev_info.max_tx_queues);
+       printf("Max possible number of TXDs per queue: %hu\n",
+               dev_info.tx_desc_lim.nb_max);
+       printf("Min possible number of TXDs per queue: %hu\n",
+               dev_info.tx_desc_lim.nb_min);
+       printf("TXDs number alignment: %hu\n", dev_info.tx_desc_lim.nb_align);
 }
 
 int
@@ -1274,7 +1351,7 @@ icmp_echo_config_setup(void)
                        fs->rx_port = fwd_ports_ids[rxp];
                        fs->rx_queue = rxq;
                        fs->tx_port = fs->rx_port;
-                       fs->tx_queue = lc_id;
+                       fs->tx_queue = rxq;
                        fs->peer_addr = fs->tx_port;
                        if (verbose_level > 0)
                                printf("  stream=%d port=%d rxq=%d txq=%d\n",
@@ -1505,6 +1582,49 @@ set_nb_pkt_per_burst(uint16_t nb)
               (unsigned int) nb_pkt_per_burst);
 }
 
+static const char *
+tx_split_get_name(enum tx_pkt_split split)
+{
+       uint32_t i;
+
+       for (i = 0; i != RTE_DIM(tx_split_name); i++) {
+               if (tx_split_name[i].split == split)
+                       return tx_split_name[i].name;
+       }
+       return NULL;
+}
+
+void
+set_tx_pkt_split(const char *name)
+{
+       uint32_t i;
+
+       for (i = 0; i != RTE_DIM(tx_split_name); i++) {
+               if (strcmp(tx_split_name[i].name, name) == 0) {
+                       tx_pkt_split = tx_split_name[i].split;
+                       return;
+               }
+       }
+       printf("unknown value: \"%s\"\n", name);
+}
+
+void
+show_tx_pkt_segments(void)
+{
+       uint32_t i, n;
+       const char *split;
+
+       n = tx_pkt_nb_segs;
+       split = tx_split_get_name(tx_pkt_split);
+
+       printf("Number of segments: %u\n", n);
+       printf("Segment sizes: ");
+       for (i = 0; i != n - 1; i++)
+               printf("%hu,", tx_pkt_seg_lengths[i]);
+       printf("%hu\n", tx_pkt_seg_lengths[i]);
+       printf("Split packet: %s\n", split);
+}
+
 void
 set_tx_pkt_segments(unsigned *seg_lengths, unsigned nb_segs)
 {