[v2] event: fix check in ring init() in event ring code
Checks
Commit Message
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.richardson@intel.com
Cc: stable@dpdk.org
Signed-off-by: Harry van Haaren <harry.van.haaren@intel.com>
Acked-by: Jerin Jacob <jerin.jacob@caviumnetworks.com>
---
v2:
- Removed _ from headline for check git log (Jerin)
- Added memzone free (good catch, thanks Jerin)
- Return NULL instead of 0 (Jerin)
- Added Jerin's Ack
Cc: thomas@monjalon.net
Cc: jerin.jacob@caviumnetworks.com
Please consider this for RC3, as it fixes the unit tests
on 32-bit systems.
---
lib/librte_eventdev/rte_event_ring.c | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
Comments
02/08/2018 16:43, Harry van Haaren:
> 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.richardson@intel.com
> Cc: stable@dpdk.org
>
> Signed-off-by: Harry van Haaren <harry.van.haaren@intel.com>
> Acked-by: Jerin Jacob <jerin.jacob@caviumnetworks.com>
>
> ---
>
> v2:
> - Removed _ from headline for check git log (Jerin)
This is not the spirit of this check.
You are expected to not use function names at all,
in order to provide a title readable by someone who does not know
the function or structure names of this area.
In this case, it can be:
event: fix ring init failure handling
> - Added memzone free (good catch, thanks Jerin)
> - Return NULL instead of 0 (Jerin)
> - Added Jerin's Ack
>
> Cc: thomas@monjalon.net
> Cc: jerin.jacob@caviumnetworks.com
>
> Please consider this for RC3, as it fixes the unit tests
> on 32-bit systems.
Applied, thanks
@@ -82,11 +82,16 @@ 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");
+ if (rte_memzone_free(mz) != 0)
+ RTE_LOG(ERR, RING, "Cannot free memzone\n");
+ rte_free(te);
+ rte_rwlock_write_unlock(RTE_EAL_TAILQ_RWLOCK);
+ return NULL;
+ }
te->data = (void *) r;
r->r.memzone = mz;