These handlers allow an application to create a mempool based on the
non-blocking ring, with any combination of single/multi producer/consumer.
Also, add a note to the programmer's guide's "known issues" section.
Signed-off-by: Gage Eads <gage.e...@intel.com>
Acked-by: Andrew Rybchenko <arybche...@solarflare.com>
---
doc/guides/prog_guide/env_abstraction_layer.rst | 2 +-
drivers/mempool/ring/rte_mempool_ring.c | 58 +++++++++++++++++++++++--
2 files changed, 56 insertions(+), 4 deletions(-)
diff --git a/doc/guides/prog_guide/env_abstraction_layer.rst
b/doc/guides/prog_guide/env_abstraction_layer.rst
index 9497b879c..b6ac236d6 100644
--- a/doc/guides/prog_guide/env_abstraction_layer.rst
+++ b/doc/guides/prog_guide/env_abstraction_layer.rst
@@ -541,7 +541,7 @@ Known Issues
5. It MUST not be used by multi-producer/consumer pthreads, whose scheduling
policies are SCHED_FIFO or SCHED_RR.
- Alternatively, x86_64 applications can use the non-blocking stack mempool
handler. When considering this handler, note that:
+ Alternatively, x86_64 applications can use the non-blocking ring or stack
mempool handlers. When considering one of them, note that:
- it is limited to the x86_64 platform, because it uses an instruction
(16-byte compare-and-swap) that is not available on other platforms.
- it has worse average-case performance than the non-preemptive rte_ring,
but software caching (e.g. the mempool cache) can mitigate this by reducing the
number of handler operations.
diff --git a/drivers/mempool/ring/rte_mempool_ring.c
b/drivers/mempool/ring/rte_mempool_ring.c
index bc123fc52..013dac3bc 100644
--- a/drivers/mempool/ring/rte_mempool_ring.c
+++ b/drivers/mempool/ring/rte_mempool_ring.c
@@ -1,5 +1,5 @@
/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2010-2016 Intel Corporation
+ * Copyright(c) 2010-2019 Intel Corporation
*/
#include <stdio.h>
@@ -47,11 +47,11 @@ common_ring_get_count(const struct rte_mempool *mp)
static int
-common_ring_alloc(struct rte_mempool *mp)
+__common_ring_alloc(struct rte_mempool *mp, int rg_flags)
{
- int rg_flags = 0, ret;
char rg_name[RTE_RING_NAMESIZE];
struct rte_ring *r;
+ int ret;
ret = snprintf(rg_name, sizeof(rg_name),
RTE_MEMPOOL_MZ_FORMAT, mp->name);
@@ -82,6 +82,18 @@ common_ring_alloc(struct rte_mempool *mp)
return 0;
}
+static int
+common_ring_alloc(struct rte_mempool *mp)
+{
+ return __common_ring_alloc(mp, 0);
+}
+
+static int
+common_ring_alloc_nb(struct rte_mempool *mp)
+{
+ return __common_ring_alloc(mp, RING_F_NB);
+}
+
static void
common_ring_free(struct rte_mempool *mp)
{
@@ -130,7 +142,47 @@ static const struct rte_mempool_ops ops_sp_mc = {
.get_count = common_ring_get_count,
};
+static const struct rte_mempool_ops ops_mp_mc_nb = {
+ .name = "ring_mp_mc_nb",
+ .alloc = common_ring_alloc_nb,
+ .free = common_ring_free,
+ .enqueue = common_ring_mp_enqueue,
+ .dequeue = common_ring_mc_dequeue,
+ .get_count = common_ring_get_count,
+};
+
+static const struct rte_mempool_ops ops_sp_sc_nb = {
+ .name = "ring_sp_sc_nb",
+ .alloc = common_ring_alloc_nb,
+ .free = common_ring_free,
+ .enqueue = common_ring_sp_enqueue,
+ .dequeue = common_ring_sc_dequeue,
+ .get_count = common_ring_get_count,
+};
+
+static const struct rte_mempool_ops ops_mp_sc_nb = {
+ .name = "ring_mp_sc_nb",
+ .alloc = common_ring_alloc_nb,
+ .free = common_ring_free,
+ .enqueue = common_ring_mp_enqueue,
+ .dequeue = common_ring_sc_dequeue,
+ .get_count = common_ring_get_count,
+};
+
+static const struct rte_mempool_ops ops_sp_mc_nb = {
+ .name = "ring_sp_mc_nb",
+ .alloc = common_ring_alloc_nb,
+ .free = common_ring_free,
+ .enqueue = common_ring_sp_enqueue,
+ .dequeue = common_ring_mc_dequeue,
+ .get_count = common_ring_get_count,
+};
+
MEMPOOL_REGISTER_OPS(ops_mp_mc);
MEMPOOL_REGISTER_OPS(ops_sp_sc);
MEMPOOL_REGISTER_OPS(ops_mp_sc);
MEMPOOL_REGISTER_OPS(ops_sp_mc);
+MEMPOOL_REGISTER_OPS(ops_mp_mc_nb);
+MEMPOOL_REGISTER_OPS(ops_sp_sc_nb);
+MEMPOOL_REGISTER_OPS(ops_mp_sc_nb);
+MEMPOOL_REGISTER_OPS(ops_sp_mc_nb);
--
2.13.6
