From: Bruce Richardson <bruce.richardson@intel.com>
To: dev@dpdk.org
Cc: david.marchand@redhat.com, probb@iol.unh.edu,
mb@smartsharesystems.com, stable@dpdk.org,
Bruce Richardson <bruce.richardson@intel.com>
Subject: [PATCH v6 01/11] mempool: fix default ops for an empty mempool
Date: Wed, 16 Aug 2023 16:34:29 +0100 [thread overview]
Message-ID: <20230816153439.551501-2-bruce.richardson@intel.com> (raw)
In-Reply-To: <20230816153439.551501-1-bruce.richardson@intel.com>
From: David Marchand <david.marchand@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: stable@dpdk.org
Signed-off-by: David Marchand <david.marchand@redhat.com>
Reviewed-by: Bruce Richardson <bruce.richardson@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
next parent reply other threads:[~2023-08-16 15:35 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20230721115125.55137-1-bruce.richardson@intel.com>
[not found] ` <20230816153439.551501-1-bruce.richardson@intel.com>
2023-08-16 15:34 ` Bruce Richardson [this message]
2023-08-16 16:32 ` Morten Brørup
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230816153439.551501-2-bruce.richardson@intel.com \
--to=bruce.richardson@intel.com \
--cc=david.marchand@redhat.com \
--cc=dev@dpdk.org \
--cc=mb@smartsharesystems.com \
--cc=probb@iol.unh.edu \
--cc=stable@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).