app/testpmd: support no IOVA contiguous mempools

providing a command line parameter to set the mempool flags accordingly.
This mode is relevant only when creating an empty mempool and then
populating with memory.

Signed-off-by: Shahaf Shuler <shahafs@mellanox.com>
Acked-by: Anatoly Burakov <anatoly.burakov@intel.com>

diff --git a/app/test-pmd/parameters.c b/app/test-pmd/parameters.c
index 7b6b609..7f18b3e 100644 (file)
--- a/app/test-pmd/parameters.c
+++ b/app/test-pmd/parameters.c
@@ -202,6 +202,8 @@ usage(char* progname)
        printf("  --noisy-lkup-num-writes=N: do N random writes per packet\n");
        printf("  --noisy-lkup-num-reads=N: do N random reads per packet\n");
        printf("  --noisy-lkup-num-writes=N: do N random reads and writes per packet\n");
+       printf("  --no-iova-contig: mempool memory can be IOVA non contiguous. "
+              "valid only with --mp-alloc=anon\n");
 }
 
 #ifdef RTE_LIBRTE_CMDLINE
@@ -651,6 +653,7 @@ launch_args_parse(int argc, char** argv)
                { "noisy-lkup-num-writes",      1, 0, 0 },
                { "noisy-lkup-num-reads",       1, 0, 0 },
                { "noisy-lkup-num-reads-writes", 1, 0, 0 },
+               { "no-iova-contig",             0, 0, 0 },
                { 0, 0, 0, 0 },
        };
 
@@ -1242,6 +1245,8 @@ launch_args_parse(int argc, char** argv)
                                        rte_exit(EXIT_FAILURE,
                                                 "noisy-lkup-num-reads-writes must be >= 0\n");
                        }
+                       if (!strcmp(lgopts[opt_idx].name, "no-iova-contig"))
+                               mempool_flags = MEMPOOL_F_NO_IOVA_CONTIG;
                        break;
                case 'h':
                        usage(argv[0]);
@@ -1258,4 +1263,12 @@ launch_args_parse(int argc, char** argv)
        /* Set offload configuration from command line parameters. */
        rx_mode.offloads = rx_offloads;
        tx_mode.offloads = tx_offloads;
+
+       if (mempool_flags & MEMPOOL_F_NO_IOVA_CONTIG &&
+           mp_alloc_type != MP_ALLOC_ANON) {
+               TESTPMD_LOG(WARNING, "cannot use no-iova-contig without "
+                                 "mp-alloc=anon. mempool no-iova-contig is "
+                                 "ignored\n");
+               mempool_flags = 0;
+       }
 }

diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index b7f70b0..3b5ef0b 100644 (file)
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -189,6 +189,7 @@ struct fwd_engine * fwd_engines[] = {
 };
 
 struct rte_mempool *mempools[RTE_MAX_NUMA_NODES];
+uint16_t mempool_flags;
 
 struct fwd_config cur_fwd_config;
 struct fwd_engine *cur_fwd_eng = &io_fwd_engine; /**< IO mode by default. */
@@ -867,7 +868,7 @@ mbuf_pool_create(uint16_t mbuf_seg_size, unsigned nb_mbuf,
                        rte_mp = rte_mempool_create_empty(pool_name, nb_mbuf,
                                mb_size, (unsigned int) mb_mempool_cache,
                                sizeof(struct rte_pktmbuf_pool_private),
-                               socket_id, 0);
+                               socket_id, mempool_flags);
                        if (rte_mp == NULL)
                                goto err;
 

diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h
index a45988e..e2117e6 100644 (file)
--- a/app/test-pmd/testpmd.h
+++ b/app/test-pmd/testpmd.h
@@ -264,6 +264,8 @@ extern struct fwd_engine ieee1588_fwd_engine;
 
 extern struct fwd_engine * fwd_engines[]; /**< NULL terminated array. */
 
+extern uint16_t mempool_flags;
+
 /**
  * Forwarding Configuration
  *

diff --git a/doc/guides/testpmd_app_ug/run_app.rst b/doc/guides/testpmd_app_ug/run_app.rst
index b717b8c..7b43416 100644 (file)
--- a/doc/guides/testpmd_app_ug/run_app.rst
+++ b/doc/guides/testpmd_app_ug/run_app.rst
@@ -427,3 +427,8 @@ The commandline options are:
 
     Set the number of r/w accesses to be done in noisy neighbour simulation memory buffer to N.
     Only available with the noisy forwarding mode. The default value is 0.
+
+*   ``--no-iova-contig``
+
+    Enable to create mempool which is not IOVA contiguous. Valid only with --mp-alloc=anon.
+    The default value is 0.