This commit fixes a bug in a 32-bit environment where the
generic ring_init() would fail, but given the interaction
with memzones the next iteration of the event_ring_autotest
would actually *pass* because the ring in question would
exist already an be looked-up.
This commit rightly error checks the result of ring_init(),
and calls rte_free() on the memory as required.
Fixes: dc39e2f359b5 ("eventdev: add ring structure for events")
Cc: bruce.richard...@intel.com
Cc: sta...@dpdk.org
Signed-off-by: Harry van Haaren <harry.van.haa...@intel.com>
---
Cc: tho...@monjalon.net
Cc: jerin.ja...@caviumnetworks.com
Please consider this for RC3, as it fixes the unit tests
on 32-bit systems.
---
lib/librte_eventdev/rte_event_ring.c | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/lib/librte_eventdev/rte_event_ring.c
b/lib/librte_eventdev/rte_event_ring.c
index eb67751..5791928 100644
--- a/lib/librte_eventdev/rte_event_ring.c
+++ b/lib/librte_eventdev/rte_event_ring.c
@@ -82,11 +82,14 @@ rte_event_ring_create(const char *name, unsigned int count,
int socket_id,
mz = rte_memzone_reserve(mz_name, ring_size, socket_id, mz_flags);
if (mz != NULL) {
r = mz->addr;
- /*
- * no need to check return value here, we already checked the
- * arguments above
- */
- rte_event_ring_init(r, name, requested_count, flags);
+ /* Check return value in case rte_ring_init() fails on size */
+ int err = rte_event_ring_init(r, name, requested_count, flags);
+ if (err) {
+ RTE_LOG(ERR, RING, "Ring init failed\n");
+ rte_free(te);
+ rte_rwlock_write_unlock(RTE_EAL_TAILQ_RWLOCK);
+ return 0;
+ }
te->data = (void *) r;
r->r.memzone = mz;
--
2.7.4
