ixgbe: fix Tx hang when RS distance exceeds HW limit

[dpdk.git] / app / test / test_pmd_perf.c

diff --git a/app/test/test_pmd_perf.c b/app/test/test_pmd_perf.c
index 49a494d..ef9262c 100644 (file)
--- a/app/test/test_pmd_perf.c
+++ b/app/test/test_pmd_perf.c
@@ -47,7 +47,6 @@
 #define NB_ETHPORTS_USED                (1)
 #define NB_SOCKETS                      (2)
 #define MEMPOOL_CACHE_SIZE 250
-#define MBUF_DATA_SIZE (2048 + RTE_PKTMBUF_HEADROOM)
 #define MAX_PKT_BURST                   (32)
 #define RTE_TEST_RX_DESC_DEFAULT        (128)
 #define RTE_TEST_TX_DESC_DEFAULT        (512)
@@ -290,8 +289,8 @@ init_mbufpool(unsigned nb_mbuf)
                        snprintf(s, sizeof(s), "mbuf_pool_%d", socketid);
                        mbufpool[socketid] =
                                rte_pktmbuf_pool_create(s, nb_mbuf,
-                                       MEMPOOL_CACHE_SIZE, 0, MBUF_DATA_SIZE,
-                                       socketid);
+                                       MEMPOOL_CACHE_SIZE, 0,
+                                       RTE_MBUF_DEFAULT_BUF_SIZE, socketid);
                        if (mbufpool[socketid] == NULL)
                                rte_exit(EXIT_FAILURE,
                                        "Cannot init mbuf pool on socket %d\n",
@@ -842,10 +841,10 @@ test_set_rxtx_conf(cmdline_fixed_string_t mode)
                port_conf.rxmode.enable_scatter = 0;
                return 0;
        } else if (!strcmp(mode, "scalar")) {
-               /* bulk alloc rx, simple tx */
-               tx_conf.txq_flags = 0xf01;
-               tx_conf.tx_rs_thresh = 128;
-               tx_conf.tx_free_thresh = 128;
+               /* bulk alloc rx, full-featured tx */
+               tx_conf.txq_flags = 0;
+               tx_conf.tx_rs_thresh = 32;
+               tx_conf.tx_free_thresh = 32;
                port_conf.rxmode.hw_ip_checksum = 1;
                port_conf.rxmode.enable_scatter = 0;
                return 0;