mbuf: fix performance with 128-byte cache line

[dpdk.git] / app / test-pmd / testpmd.c

diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index 2e302bb..1319917 100644 (file)
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -173,6 +173,9 @@ uint16_t tx_pkt_seg_lengths[RTE_MAX_SEGS_PER_PKT] = {
 };
 uint8_t  tx_pkt_nb_segs = 1; /**< Number of segments in TXONLY packets */
 
+enum tx_pkt_split tx_pkt_split = TX_PKT_SPLIT_OFF;
+/**< Split policy for packets to TX. */
+
 uint16_t nb_pkt_per_burst = DEF_PKT_BURST; /**< Number of packets per burst. */
 uint16_t mb_mempool_cache = DEF_MBUF_CACHE; /**< Size of mbuf mempool cache. */
 
@@ -751,9 +754,7 @@ fwd_port_stats_display(portid_t port_id, struct rte_eth_stats *stats)
                        printf("  Bad-ipcsum: %-14"PRIu64" Bad-l4csum: %-14"PRIu64" \n",
                               port->rx_bad_ip_csum, port->rx_bad_l4_csum);
                if (((stats->ierrors - stats->imissed) + stats->rx_nombuf) > 0) {
-                       printf("  RX-badcrc:  %-14"PRIu64" RX-badlen:  %-14"PRIu64
-                              "RX-error: %-"PRIu64"\n",
-                              stats->ibadcrc, stats->ibadlen, stats->ierrors);
+                       printf("  RX-error: %-"PRIu64"\n",  stats->ierrors);
                        printf("  RX-nombufs: %-14"PRIu64"\n", stats->rx_nombuf);
                }
 
@@ -772,9 +773,7 @@ fwd_port_stats_display(portid_t port_id, struct rte_eth_stats *stats)
                        printf("  Bad-ipcsum:%14"PRIu64"    Bad-l4csum:%14"PRIu64"\n",
                               port->rx_bad_ip_csum, port->rx_bad_l4_csum);
                if (((stats->ierrors - stats->imissed) + stats->rx_nombuf) > 0) {
-                       printf("  RX-badcrc:              %14"PRIu64"    RX-badlen: %14"PRIu64
-                              "    RX-error:%"PRIu64"\n",
-                              stats->ibadcrc, stats->ibadlen, stats->ierrors);
+                       printf("  RX-error:%"PRIu64"\n", stats->ierrors);
                        printf("  RX-nombufs:             %14"PRIu64"\n",
                               stats->rx_nombuf);
                }
@@ -785,15 +784,6 @@ fwd_port_stats_display(portid_t port_id, struct rte_eth_stats *stats)
                       (uint64_t) (stats->opackets + port->tx_dropped));
        }
 
-       /* 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:    %-14"PRIu64" RX-XON:     %-14"PRIu64"\n",
-                      stats->rx_pause_xoff, stats->rx_pause_xon);
-               printf("  TX-XOFF:    %-14"PRIu64" TX-XON:     %-14"PRIu64"\n",
-                      stats->tx_pause_xoff, stats->tx_pause_xon);
-       }
-
 #ifdef RTE_TEST_PMD_RECORD_BURST_STATS
        if (port->rx_stream)
                pkt_burst_stats_display("RX",
@@ -802,11 +792,6 @@ fwd_port_stats_display(portid_t port_id, struct rte_eth_stats *stats)
                pkt_burst_stats_display("TX",
                        &port->tx_stream->tx_burst_stats);
 #endif
-       /* stats fdir */
-       if (fdir_conf.mode != RTE_FDIR_MODE_NONE)
-               printf("  Fdirmiss:%14"PRIu64"    Fdirmatch:%14"PRIu64"\n",
-                      stats->fdirmiss,
-                      stats->fdirmatch);
 
        if (port->rx_queue_stats_mapping_enabled) {
                printf("\n");
@@ -1150,10 +1135,6 @@ stop_packet_forwarding(void)
                port->stats.oerrors = 0;
                stats.rx_nombuf -= port->stats.rx_nombuf;
                port->stats.rx_nombuf = 0;
-               stats.fdirmatch -= port->stats.fdirmatch;
-               port->stats.rx_nombuf = 0;
-               stats.fdirmiss -= port->stats.fdirmiss;
-               port->stats.rx_nombuf = 0;
 
                total_recv += stats.ipackets;
                total_xmit += stats.opackets;
@@ -1531,7 +1512,7 @@ attach_port(char *identifier)
        nb_ports = rte_eth_dev_count();
 
        /* set_default_fwd_ports_config(); */
-       bzero(fwd_ports_ids, sizeof(fwd_ports_ids));
+       memset(fwd_ports_ids, 0, sizeof(fwd_ports_ids));
        i = 0;
        FOREACH_PORT(j, ports) {
                fwd_ports_ids[i] = j;
@@ -1566,7 +1547,7 @@ detach_port(uint8_t port_id)
        nb_ports = rte_eth_dev_count();
 
        /* set_default_fwd_ports_config(); */
-       bzero(fwd_ports_ids, sizeof(fwd_ports_ids));
+       memset(fwd_ports_ids, 0, sizeof(fwd_ports_ids));
        i = 0;
        FOREACH_PORT(pi, ports) {
                fwd_ports_ids[i] = pi;
@@ -1589,13 +1570,16 @@ pmd_test_exit(void)
        if (test_done == 0)
                stop_packet_forwarding();
 
-       FOREACH_PORT(pt_id, ports) {
-               printf("Stopping port %d...", pt_id);
-               fflush(stdout);
-               rte_eth_dev_close(pt_id);
-               printf("done\n");
+       if (ports != NULL) {
+               no_link_check = 1;
+               FOREACH_PORT(pt_id, ports) {
+                       printf("\nShutting down port %d...\n", pt_id);
+                       fflush(stdout);
+                       stop_port(pt_id);
+                       close_port(pt_id);
+               }
        }
-       printf("bye...\n");
+       printf("\nBye...\n");
 }
 
 typedef void (*cmd_func_t)(void);
@@ -2003,12 +1987,35 @@ init_port(void)
                ports[pid].enabled = 1;
 }
 
+static void
+force_quit(void)
+{
+       pmd_test_exit();
+       prompt_exit();
+}
+
+static void
+signal_handler(int signum)
+{
+       if (signum == SIGINT || signum == SIGTERM) {
+               printf("\nSignal %d received, preparing to exit...\n",
+                               signum);
+               force_quit();
+               /* exit with the expected status */
+               signal(signum, SIG_DFL);
+               kill(getpid(), signum);
+       }
+}
+
 int
 main(int argc, char** argv)
 {
        int  diag;
        uint8_t port_id;
 
+       signal(SIGINT, signal_handler);
+       signal(SIGTERM, signal_handler);
+
        diag = rte_eal_init(argc, argv);
        if (diag < 0)
                rte_panic("Cannot init EAL\n");
@@ -2060,6 +2067,7 @@ main(int argc, char** argv)
                start_packet_forwarding(0);
                printf("Press enter to exit\n");
                rc = read(0, &c, 1);
+               pmd_test_exit();
                if (rc < 0)
                        return 1;
        }