app/testpmd: fix GENEVE parsing in checksum mode

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

diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index 55eb293..fe2ce19 100644 (file)
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -84,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 */
@@ -449,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;
 
@@ -902,8 +908,7 @@ create_extmem(uint32_t nb_mbufs, uint32_t mbuf_sz, struct extmem_param *param,
 
        return 0;
 fail:
-       if (iovas)
-               free(iovas);
+       free(iovas);
        if (addr)
                munmap(addr, mem_sz);
 
@@ -1061,12 +1066,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
@@ -2722,6 +2726,13 @@ start_port(portid_t pid)
                if (pid != pi && pid != (portid_t)RTE_PORT_ALL)
                        continue;
 
+               if (port_is_bonding_slave(pi)) {
+                       fprintf(stderr,
+                               "Please remove port %d from bonded device.\n",
+                               pi);
+                       continue;
+               }
+
                need_check_link_status = 0;
                port = &ports[pi];
                if (port->port_status == RTE_PORT_STOPPED)