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 prev parent reply other threads:[~2023-08-16 15:35 UTC|newest]
Thread overview: 93+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-21 11:51 [RFC PATCH 0/5] replace build code for unit tests Bruce Richardson
2023-07-21 11:51 ` [RFC PATCH 1/5] app/test: add new macros for various test types Bruce Richardson
2023-07-21 11:51 ` [RFC PATCH 2/5] app/test: tag tests with the test type Bruce Richardson
2023-07-21 11:51 ` [RFC PATCH 3/5] app/test: build using per-file dependency matrix Bruce Richardson
2023-07-21 11:51 ` [RFC PATCH 4/5] app/test: define unit tests suites based on test macros Bruce Richardson
2023-07-21 11:51 ` [RFC PATCH 5/5] app/test: add fast test suite to new build infrastructure Bruce Richardson
2023-08-08 8:46 ` [RFC PATCH 0/5] replace build code for unit tests David Marchand
2023-08-09 14:53 ` Patrick Robb
2023-08-09 15:05 ` Bruce Richardson
2023-08-09 15:39 ` Patrick Robb
2023-08-14 15:16 ` [PATCH v2 0/8] expand list of optional libraries Bruce Richardson
2023-08-14 15:16 ` [PATCH v2 1/8] app/test: add new macros for various test types Bruce Richardson
2023-08-14 15:16 ` [PATCH v2 2/8] app/test: tag tests with the test type Bruce Richardson
2023-08-14 15:16 ` [PATCH v2 3/8] app/test: make telemetry data test buildable on windows Bruce Richardson
2023-08-14 15:16 ` [PATCH v2 4/8] app/test: build using per-file dependency matrix Bruce Richardson
2023-08-14 15:16 ` [PATCH v2 5/8] app/test: define unit tests suites based on test macros Bruce Richardson
2023-08-14 15:16 ` [PATCH v2 6/8] examples/l3fwd: make eventdev an optional dependency Bruce Richardson
2023-08-14 15:16 ` [PATCH v2 7/8] build: make most device classes optional Bruce Richardson
2023-08-14 15:16 ` [PATCH v2 8/8] build: expand list of optional libraries Bruce Richardson
2023-08-14 15:22 ` [PATCH v2 0/8] " Bruce Richardson
2023-08-14 18:20 ` [PATCH v3 " Bruce Richardson
2023-08-14 18:20 ` [PATCH v3 1/8] app/test: add new macros for various test types Bruce Richardson
2023-08-14 18:20 ` [PATCH v3 2/8] app/test: tag tests with the test type Bruce Richardson
2023-08-14 18:20 ` [PATCH v3 3/8] app/test: make telemetry data test buildable on windows Bruce Richardson
2023-08-14 18:21 ` [PATCH v3 4/8] app/test: build using per-file dependency matrix Bruce Richardson
2023-08-14 18:21 ` [PATCH v3 5/8] app/test: define unit tests suites based on test macros Bruce Richardson
2023-08-14 18:21 ` [PATCH v3 6/8] examples/l3fwd: make eventdev an optional dependency Bruce Richardson
2023-08-14 18:21 ` [PATCH v3 7/8] build: make most device classes optional Bruce Richardson
2023-08-14 18:21 ` [PATCH v3 8/8] build: expand list of optional libraries Bruce Richardson
2023-08-14 18:33 ` [PATCH v3 0/8] " Morten Brørup
2023-08-15 13:13 ` [PATCH v4 " Bruce Richardson
2023-08-15 13:13 ` [PATCH v4 1/8] app/test: add new macros for various test types Bruce Richardson
2023-08-15 13:13 ` [PATCH v4 2/8] app/test: tag tests with the test type Bruce Richardson
2023-08-15 13:13 ` [PATCH v4 3/8] app/test: make telemetry data test buildable on windows Bruce Richardson
2023-08-15 13:13 ` [PATCH v4 4/8] app/test: build using per-file dependency matrix Bruce Richardson
2023-08-15 13:13 ` [PATCH v4 5/8] app/test: define unit tests suites based on test macros Bruce Richardson
2023-08-15 13:13 ` [PATCH v4 6/8] examples/l3fwd: make eventdev an optional dependency Bruce Richardson
2023-08-15 13:13 ` [PATCH v4 7/8] build: make most device classes optional Bruce Richardson
2023-08-15 13:13 ` [PATCH v4 8/8] build: expand list of optional libraries Bruce Richardson
2023-08-15 13:15 ` [PATCH v4 0/8] " Bruce Richardson
2023-08-15 15:10 ` [PATCH v5 00/10] " Bruce Richardson
2023-08-15 15:10 ` [PATCH v5 01/10] app/test: add new macros for various test types Bruce Richardson
2023-08-15 15:10 ` [PATCH v5 02/10] app/test: tag tests with the test type Bruce Richardson
2023-08-16 14:56 ` David Marchand
2023-08-16 15:05 ` Bruce Richardson
2023-08-15 15:10 ` [PATCH v5 03/10] app/test: make telemetry data test buildable on windows Bruce Richardson
2023-08-21 15:50 ` Tyler Retzlaff
2023-08-15 15:10 ` [PATCH v5 04/10] app/test: build using per-file dependency matrix Bruce Richardson
2023-08-15 19:05 ` Patrick Robb
2023-08-16 10:56 ` Bruce Richardson
2023-08-16 12:55 ` Bruce Richardson
2023-08-16 14:40 ` David Marchand
2023-08-16 18:29 ` Patrick Robb
2023-08-16 19:26 ` David Marchand
2023-08-16 20:38 ` Patrick Robb
2023-08-18 7:07 ` David Marchand
2023-08-18 22:33 ` Patrick Robb
2023-08-18 23:26 ` Patrick Robb
2023-08-21 7:12 ` David Marchand
2023-08-21 14:32 ` Patrick Robb
2023-08-17 7:27 ` David Marchand
2023-08-17 8:46 ` Bruce Richardson
2023-08-17 18:30 ` Patrick Robb
2023-08-15 15:10 ` [PATCH v5 05/10] app/test: define unit tests suites based on test macros Bruce Richardson
2023-08-16 11:02 ` Bruce Richardson
2023-08-16 11:15 ` David Marchand
2023-08-16 11:40 ` David Marchand
2023-08-16 12:33 ` Bruce Richardson
2023-08-16 13:16 ` Olivier Matz
2023-08-16 13:35 ` Morten Brørup
2023-08-16 13:44 ` Bruce Richardson
2023-08-16 14:57 ` David Marchand
2023-08-16 15:06 ` Bruce Richardson
2023-08-15 15:10 ` [PATCH v5 06/10] app/test: add test case for scripted telemetry commands Bruce Richardson
2023-08-15 15:10 ` [PATCH v5 07/10] app/test: add debug test suite Bruce Richardson
2023-08-15 15:10 ` [PATCH v5 08/10] examples/l3fwd: make eventdev an optional dependency Bruce Richardson
2023-08-15 15:10 ` [PATCH v5 09/10] build: make most device classes optional Bruce Richardson
2023-08-15 15:12 ` [PATCH v5 10/10] build: expand list of optional libraries Bruce Richardson
2023-08-16 15:34 ` [PATCH v6 00/11] " Bruce Richardson
2023-08-16 15:34 ` Bruce Richardson [this message]
2023-08-16 16:32 ` [PATCH v6 01/11] mempool: fix default ops for an empty mempool Morten Brørup
2023-08-16 15:34 ` [PATCH v6 02/11] app/test: add new macros for various test types Bruce Richardson
2023-08-16 15:34 ` [PATCH v6 03/11] app/test: tag tests with the test type Bruce Richardson
2023-08-16 15:34 ` [PATCH v6 04/11] app/test: make telemetry data test buildable on windows Bruce Richardson
2023-08-21 15:52 ` Tyler Retzlaff
2023-08-16 15:34 ` [PATCH v6 05/11] app/test: build using per-file dependency matrix Bruce Richardson
2023-08-16 15:34 ` [PATCH v6 06/11] app/test: define unit tests suites based on test macros Bruce Richardson
2023-08-16 15:34 ` [PATCH v6 07/11] app/test: add test case for scripted telemetry commands Bruce Richardson
2023-08-16 15:34 ` [PATCH v6 08/11] app/test: add debug test suite Bruce Richardson
2023-08-16 15:34 ` [PATCH v6 09/11] examples/l3fwd: make eventdev an optional dependency Bruce Richardson
2023-08-16 15:34 ` [PATCH v6 10/11] build: make most device classes optional Bruce Richardson
2023-08-16 15:34 ` [PATCH v6 11/11] build: expand list of optional libraries Bruce Richardson
2023-08-23 7:33 ` [PATCH v6 00/11] " David Marchand
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).