git.droids-corp.org / dpdk.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
app/testpmd: fix stack overflow for EEPROM display
[dpdk.git] / app / test-pmd / testpmd.c
diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index c189422..e1da961 100644 (file)
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -36,7 +36,6 @@
 #include <rte_alarm.h>
 #include <rte_per_lcore.h>
 #include <rte_lcore.h>
-#include <rte_atomic.h>
 #include <rte_branch_prediction.h>
 #include <rte_mempool.h>
 #include <rte_malloc.h>
@@ -55,7 +54,9 @@
 #include <rte_pdump.h>
 #endif
 #include <rte_flow.h>
+#ifdef RTE_LIB_METRICS
 #include <rte_metrics.h>
+#endif
 #ifdef RTE_LIB_BITRATESTATS
 #include <rte_bitrate.h>
 #endif
@@ -83,7 +84,13 @@
 #endif
 
 #define EXTMEM_HEAP_NAME "extmem"
-#define EXTBUF_ZONE_SIZE RTE_PGSIZE_2M
+/*
+ * Zone size with the malloc overhead (max of debug and release variants)
+ * must fit into the smallest supported hugepage size (2M),
+ * so that an IOVA-contiguous zone of this size can always be allocated
+ * if there are free 2M hugepages.
+ */
+#define EXTBUF_ZONE_SIZE (RTE_PGSIZE_2M - 4 * RTE_CACHE_LINE_SIZE)
 
 uint16_t verbose_level = 0; /**< Silent by default. */
 int testpmd_logtype; /**< Log type for testpmd logs */
@@ -448,7 +455,7 @@ uint32_t bypass_timeout = RTE_PMD_IXGBE_BYPASS_TMT_OFF;
 uint8_t latencystats_enabled;
 
 /*
- * Lcore ID to serive latency statistics.
+ * Lcore ID to service latency statistics.
  */
 lcoreid_t latencystats_lcore_id = -1;
 
@@ -518,8 +525,10 @@ lcoreid_t bitrate_lcore_id;
 uint8_t bitrate_enabled;
 #endif
 
+#ifdef RTE_LIB_GRO
 struct gro_status gro_ports[RTE_MAX_ETHPORTS];
 uint8_t gro_flush_cycles = GRO_DEFAULT_FLUSH_CYCLES;
+#endif
 
 /*
  * hexadecimal bitmask of RX mq mode can be enabled.
@@ -578,25 +587,6 @@ eth_rx_metadata_negotiate_mp(uint16_t port_id)
        }
 }
 
-static void
-flow_pick_transfer_proxy_mp(uint16_t port_id)
-{
-       struct rte_port *port = &ports[port_id];
-       int ret;
-
-       port->flow_transfer_proxy = port_id;
-
-       if (!is_proc_primary())
-               return;
-
-       ret = rte_flow_pick_transfer_proxy(port_id, &port->flow_transfer_proxy,
-                                          NULL);
-       if (ret != 0) {
-               fprintf(stderr, "Error picking flow transfer proxy for port %u: %s - ignore\n",
-                       port_id, rte_strerror(-ret));
-       }
-}
-
 static int
 eth_dev_configure_mp(uint16_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q,
                      const struct rte_eth_conf *dev_conf)
@@ -658,8 +648,10 @@ static void fill_xstats_display_info(void);
  */
 static int all_ports_started(void);
 
+#ifdef RTE_LIB_GSO
 struct gso_status gso_ports[RTE_MAX_ETHPORTS];
 uint16_t gso_max_segment_size = RTE_ETHER_MAX_LEN - RTE_ETHER_CRC_LEN;
+#endif
 
 /* Holds the registered mbuf dynamic flags names. */
 char dynf_names[64][RTE_MBUF_DYN_NAMESIZE];
@@ -1075,12 +1067,11 @@ setup_extbuf(uint32_t nb_mbufs, uint16_t mbuf_sz, unsigned int socket_id,
                        ext_num = 0;
                        break;
                }
-               mz = rte_memzone_reserve_aligned(mz_name, EXTBUF_ZONE_SIZE,
-                                                socket_id,
-                                                RTE_MEMZONE_IOVA_CONTIG |
-                                                RTE_MEMZONE_1GB |
-                                                RTE_MEMZONE_SIZE_HINT_ONLY,
-                                                EXTBUF_ZONE_SIZE);
+               mz = rte_memzone_reserve(mz_name, EXTBUF_ZONE_SIZE,
+                                        socket_id,
+                                        RTE_MEMZONE_IOVA_CONTIG |
+                                        RTE_MEMZONE_1GB |
+                                        RTE_MEMZONE_SIZE_HINT_ONLY);
                if (mz == NULL) {
                        /*
                         * The caller exits on external buffer creation
@@ -1569,7 +1560,6 @@ init_config_port_offloads(portid_t pid, uint32_t socket_id)
        int i;
 
        eth_rx_metadata_negotiate_mp(pid);
-       flow_pick_transfer_proxy_mp(pid);
 
        port->dev_conf.txmode = tx_mode;
        port->dev_conf.rxmode = rx_mode;
@@ -1633,8 +1623,12 @@ init_config(void)
        struct rte_mempool *mbp;
        unsigned int nb_mbuf_per_pool;
        lcoreid_t  lc_id;
+#ifdef RTE_LIB_GRO
        struct rte_gro_param gro_param;
+#endif
+#ifdef RTE_LIB_GSO
        uint32_t gso_types;
+#endif
 
        /* Configuration of logical cores. */
        fwd_lcores = rte_zmalloc("testpmd: fwd_lcores",
@@ -1717,8 +1711,10 @@ init_config(void)
 
        init_port_config();
 
+#ifdef RTE_LIB_GSO
        gso_types = RTE_ETH_TX_OFFLOAD_TCP_TSO | RTE_ETH_TX_OFFLOAD_VXLAN_TNL_TSO |
                RTE_ETH_TX_OFFLOAD_GRE_TNL_TSO | RTE_ETH_TX_OFFLOAD_UDP_TSO;
+#endif
        /*
         * Records which Mbuf pool to use by each logical core, if needed.
         */
@@ -1729,6 +1725,7 @@ init_config(void)
                if (mbp == NULL)
                        mbp = mbuf_pool_find(0, 0);
                fwd_lcores[lc_id]->mbp = mbp;
+#ifdef RTE_LIB_GSO
                /* initialize GSO context */
                fwd_lcores[lc_id]->gso_ctx.direct_pool = mbp;
                fwd_lcores[lc_id]->gso_ctx.indirect_pool = mbp;
@@ -1736,10 +1733,12 @@ init_config(void)
                fwd_lcores[lc_id]->gso_ctx.gso_size = RTE_ETHER_MAX_LEN -
                        RTE_ETHER_CRC_LEN;
                fwd_lcores[lc_id]->gso_ctx.flag = 0;
+#endif
        }
 
        fwd_config_setup();
 
+#ifdef RTE_LIB_GRO
        /* create a gro context for each lcore */
        gro_param.gro_types = RTE_GRO_TCP_IPV4;
        gro_param.max_flow_num = GRO_MAX_FLUSH_CYCLES;
@@ -1753,6 +1752,7 @@ init_config(void)
                                        "rte_gro_ctx_create() failed\n");
                }
        }
+#endif
 }
 
 
@@ -2521,9 +2521,9 @@ setup_hairpin_queues(portid_t pi, portid_t p_pi, uint16_t cnt_pi)
                        continue;
 
                /* Fail to setup rx queue, return */
-               if (rte_atomic16_cmpset(&(port->port_status),
-                                       RTE_PORT_HANDLING,
-                                       RTE_PORT_STOPPED) == 0)
+               if (port->port_status == RTE_PORT_HANDLING)
+                       port->port_status = RTE_PORT_STOPPED;
+               else
                        fprintf(stderr,
                                "Port %d can not be set back to stopped\n", pi);
                fprintf(stderr, "Fail to configure port %d hairpin queues\n",
@@ -2544,9 +2544,9 @@ setup_hairpin_queues(portid_t pi, portid_t p_pi, uint16_t cnt_pi)
                        continue;
 
                /* Fail to setup rx queue, return */
-               if (rte_atomic16_cmpset(&(port->port_status),
-                                       RTE_PORT_HANDLING,
-                                       RTE_PORT_STOPPED) == 0)
+               if (port->port_status == RTE_PORT_HANDLING)
+                       port->port_status = RTE_PORT_STOPPED;
+               else
                        fprintf(stderr,
                                "Port %d can not be set back to stopped\n", pi);
                fprintf(stderr, "Fail to configure port %d hairpin queues\n",
@@ -2729,8 +2729,9 @@ start_port(portid_t pid)
 
                need_check_link_status = 0;
                port = &ports[pi];
-               if (rte_atomic16_cmpset(&(port->port_status), RTE_PORT_STOPPED,
-                                                RTE_PORT_HANDLING) == 0) {
+               if (port->port_status == RTE_PORT_STOPPED)
+                       port->port_status = RTE_PORT_HANDLING;
+               else {
                        fprintf(stderr, "Port %d is now not stopped\n", pi);
                        continue;
                }
@@ -2766,8 +2767,9 @@ start_port(portid_t pid)
                                                     nb_txq + nb_hairpinq,
                                                     &(port->dev_conf));
                        if (diag != 0) {
-                               if (rte_atomic16_cmpset(&(port->port_status),
-                               RTE_PORT_HANDLING, RTE_PORT_STOPPED) == 0)
+                               if (port->port_status == RTE_PORT_HANDLING)
+                                       port->port_status = RTE_PORT_STOPPED;
+                               else
                                        fprintf(stderr,
                                                "Port %d can not be set back to stopped\n",
                                                pi);
@@ -2828,9 +2830,9 @@ start_port(portid_t pid)
                                        continue;
 
                                /* Fail to setup tx queue, return */
-                               if (rte_atomic16_cmpset(&(port->port_status),
-                                                       RTE_PORT_HANDLING,
-                                                       RTE_PORT_STOPPED) == 0)
+                               if (port->port_status == RTE_PORT_HANDLING)
+                                       port->port_status = RTE_PORT_STOPPED;
+                               else
                                        fprintf(stderr,
                                                "Port %d can not be set back to stopped\n",
                                                pi);
@@ -2880,9 +2882,9 @@ start_port(portid_t pid)
                                        continue;
 
                                /* Fail to setup rx queue, return */
-                               if (rte_atomic16_cmpset(&(port->port_status),
-                                                       RTE_PORT_HANDLING,
-                                                       RTE_PORT_STOPPED) == 0)
+                               if (port->port_status == RTE_PORT_HANDLING)
+                                       port->port_status = RTE_PORT_STOPPED;
+                               else
                                        fprintf(stderr,
                                                "Port %d can not be set back to stopped\n",
                                                pi);
@@ -2917,16 +2919,18 @@ start_port(portid_t pid)
                                pi, rte_strerror(-diag));
 
                        /* Fail to setup rx queue, return */
-                       if (rte_atomic16_cmpset(&(port->port_status),
-                               RTE_PORT_HANDLING, RTE_PORT_STOPPED) == 0)
+                       if (port->port_status == RTE_PORT_HANDLING)
+                               port->port_status = RTE_PORT_STOPPED;
+                       else
                                fprintf(stderr,
                                        "Port %d can not be set back to stopped\n",
                                        pi);
                        continue;
                }
 
-               if (rte_atomic16_cmpset(&(port->port_status),
-                       RTE_PORT_HANDLING, RTE_PORT_STARTED) == 0)
+               if (port->port_status == RTE_PORT_HANDLING)
+                       port->port_status = RTE_PORT_STARTED;
+               else
                        fprintf(stderr, "Port %d can not be set into started\n",
                                pi);
 
@@ -3028,8 +3032,9 @@ stop_port(portid_t pid)
                }
 
                port = &ports[pi];
-               if (rte_atomic16_cmpset(&(port->port_status), RTE_PORT_STARTED,
-                                               RTE_PORT_HANDLING) == 0)
+               if (port->port_status == RTE_PORT_STARTED)
+                       port->port_status = RTE_PORT_HANDLING;
+               else
                        continue;
 
                if (hairpin_mode & 0xf) {
@@ -3055,8 +3060,9 @@ stop_port(portid_t pid)
                        RTE_LOG(ERR, EAL, "rte_eth_dev_stop failed for port %u\n",
                                pi);
 
-               if (rte_atomic16_cmpset(&(port->port_status),
-                       RTE_PORT_HANDLING, RTE_PORT_STOPPED) == 0)
+               if (port->port_status == RTE_PORT_HANDLING)
+                       port->port_status = RTE_PORT_STOPPED;
+               else
                        fprintf(stderr, "Port %d can not be set into stopped\n",
                                pi);
                need_check_link_status = 1;
@@ -3119,8 +3125,7 @@ close_port(portid_t pid)
                }
 
                port = &ports[pi];
-               if (rte_atomic16_cmpset(&(port->port_status),
-                       RTE_PORT_CLOSED, RTE_PORT_CLOSED) == 1) {
+               if (port->port_status == RTE_PORT_CLOSED) {
                        fprintf(stderr, "Port %d is already closed\n", pi);
                        continue;
                }
@@ -4224,8 +4229,10 @@ main(int argc, char** argv)
                                port_id, rte_strerror(-ret));
        }
 
+#ifdef RTE_LIB_METRICS
        /* Init metrics library */
        rte_metrics_init(rte_socket_id());
+#endif
 
 #ifdef RTE_LIB_LATENCYSTATS
        if (latencystats_enabled != 0) {
DPDK repo used for reviews