[PATCH v6 01/11] mempool: fix default ops for an empty mempool

[Bruce Richardson]

From: David Marchand <david.march...@redhat.com>

An empty mempool's ops were not initialised to a default value wrt to
what the application requested via the flags parameter.  As
rte_mempool_create() relies on rte_mempool_create_empty(), simply move
this ops initialisation to rte_mempool_create_empty().

Fixes: aa10457eb4c2 ("mempool: make mempool populate and free api public")
Cc: sta...@dpdk.org

Signed-off-by: David Marchand <david.march...@redhat.com>
Reviewed-by: Bruce Richardson <bruce.richard...@intel.com>
---
 lib/mempool/rte_mempool.c | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/lib/mempool/rte_mempool.c b/lib/mempool/rte_mempool.c
index 4d337fca8d..7a7a9bf6db 100644
--- a/lib/mempool/rte_mempool.c
+++ b/lib/mempool/rte_mempool.c
@@ -914,6 +914,22 @@ rte_mempool_create_empty(const char *name, unsigned n, 
unsigned elt_size,
        STAILQ_INIT(&mp->elt_list);
        STAILQ_INIT(&mp->mem_list);
 
+       /*
+        * Since we have 4 combinations of the SP/SC/MP/MC examine the flags to
+        * set the correct index into the table of ops structs.
+        */
+       if ((flags & RTE_MEMPOOL_F_SP_PUT) && (flags & RTE_MEMPOOL_F_SC_GET))
+               ret = rte_mempool_set_ops_byname(mp, "ring_sp_sc", NULL);
+       else if (flags & RTE_MEMPOOL_F_SP_PUT)
+               ret = rte_mempool_set_ops_byname(mp, "ring_sp_mc", NULL);
+       else if (flags & RTE_MEMPOOL_F_SC_GET)
+               ret = rte_mempool_set_ops_byname(mp, "ring_mp_sc", NULL);
+       else
+               ret = rte_mempool_set_ops_byname(mp, "ring_mp_mc", NULL);
+
+       if (ret)
+               goto exit_unlock;
+
        /*
         * local_cache pointer is set even if cache_size is zero.
         * The local_cache points to just past the elt_pa[] array.
@@ -954,7 +970,6 @@ rte_mempool_create(const char *name, unsigned n, unsigned 
elt_size,
        rte_mempool_obj_cb_t *obj_init, void *obj_init_arg,
        int socket_id, unsigned flags)
 {
-       int ret;
        struct rte_mempool *mp;
 
        mp = rte_mempool_create_empty(name, n, elt_size, cache_size,
@@ -962,22 +977,6 @@ rte_mempool_create(const char *name, unsigned n, unsigned 
elt_size,
        if (mp == NULL)
                return NULL;
 
-       /*
-        * Since we have 4 combinations of the SP/SC/MP/MC examine the flags to
-        * set the correct index into the table of ops structs.
-        */
-       if ((flags & RTE_MEMPOOL_F_SP_PUT) && (flags & RTE_MEMPOOL_F_SC_GET))
-               ret = rte_mempool_set_ops_byname(mp, "ring_sp_sc", NULL);
-       else if (flags & RTE_MEMPOOL_F_SP_PUT)
-               ret = rte_mempool_set_ops_byname(mp, "ring_sp_mc", NULL);
-       else if (flags & RTE_MEMPOOL_F_SC_GET)
-               ret = rte_mempool_set_ops_byname(mp, "ring_mp_sc", NULL);
-       else
-               ret = rte_mempool_set_ops_byname(mp, "ring_mp_mc", NULL);
-
-       if (ret)
-               goto fail;
-
        /* call the mempool priv initializer */
        if (mp_init)
                mp_init(mp, mp_init_arg);
-- 
2.39.2