[dpdk-stable] [PATCH] lib: fix write unlock during ring creation

[dpdk-stable] [PATCH] lib: fix write unlock during ring creation

[Chaitanya Babu Talluri]

In rte_efd_create() write lock has already been unlocked
before ring creation itself.
So second unlock after the ring creation has been removed
and added freeing of tail queue entry and efd table.

Fixes: 56b6ef874f80 ("efd: new Elastic Flow Distributor library")
Cc: stable@dpdk.org

Signed-off-by: Chaitanya Babu Talluri <tallurix.chaitanya.babu@intel.com>
---
 lib/librte_efd/rte_efd.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/librte_efd/rte_efd.c b/lib/librte_efd/rte_efd.c
index a780e2fe8..0c7ce9612 100644
--- a/lib/librte_efd/rte_efd.c
+++ b/lib/librte_efd/rte_efd.c
@@ -687,12 +687,13 @@ rte_efd_create(const char *name, uint32_t max_num_rules, uint32_t key_len,
 	rte_rwlock_write_unlock(RTE_EAL_TAILQ_RWLOCK);
 
 	snprintf(ring_name, sizeof(ring_name), "HT_%s", table->name);
-	/* Create ring (Dummy slot index is not enqueued) */
+	/*  Create ring (Dummy slot index is not enqueued) */
 	r = rte_ring_create(ring_name, rte_align32pow2(table->max_num_rules),
 			offline_cpu_socket, 0);
 	if (r == NULL) {
 		RTE_LOG(ERR, EFD, "memory allocation failed\n");
-		goto error_unlock_exit;
+		rte_efd_free(table);
+		return NULL;
 	}
 
 	/* Populate free slots ring. Entry zero is reserved for key misses. */
-- 
2.13.6

Re: [dpdk-stable] [PATCH] lib: fix write unlock during ring creation

[Pattan, Reshma]

> -----Original Message-----
> From: Chaitanya Babu, TalluriX
> Sent: Tuesday, November 13, 2018 12:55 PM
> To: dev@dpdk.org
> Cc: Marohn, Byron <byron.marohn@intel.com>; Pattan, Reshma
> <reshma.pattan@intel.com>; De Lara Guarch, Pablo
> <pablo.de.lara.guarch@intel.com>; Chaitanya Babu, TalluriX
> <tallurix.chaitanya.babu@intel.com>; stable@dpdk.org
> Subject: [PATCH] lib: fix write unlock during ring creation

Heading should have lib/efd:
> 
> In rte_efd_create() write lock has already been unlocked before ring creation
> itself.
> So second unlock after the ring creation has been removed and added freeing of
> tail queue entry and efd table.

Changes do not have free of  tailq entry, so remove the mention of it from commit message.

> -	/* Create ring (Dummy slot index is not enqueued) */
> +	/*  Create ring (Dummy slot index is not enqueued) */

Undo this change. Unrelated.

Other than these looks ok.

Acked-by: Reshma Pattan <reshma.pattan@intel.com>

Thanks,
Reshma

Re: [dpdk-stable] [PATCH] lib: fix write unlock during ring creation

[Thomas Monjalon]

13/11/2018 17:58, Pattan, Reshma:
> Heading should have lib/efd:

No, heading should have "efd:"
When in doubts, please look at the git history.

[dpdk-stable] [PATCH v2] lib/efd: fix write unlock during ring creation

[Chaitanya Babu Talluri]

In rte_efd_create() write lock has already been unlocked
before ring creation itself.
So second unlock after the ring creation has been removed.

Fixes: 56b6ef874f80 ("efd: new Elastic Flow Distributor library")
Cc: stable@dpdk.org

Signed-off-by: Chaitanya Babu Talluri <tallurix.chaitanya.babu@intel.com>
Acked-by: Reshma Pattan <reshma.pattan@intel.com>
---
v2: Updated commit message.
---
 lib/librte_efd/rte_efd.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/librte_efd/rte_efd.c b/lib/librte_efd/rte_efd.c
index a780e2fe8..e6e5cfda2 100644
--- a/lib/librte_efd/rte_efd.c
+++ b/lib/librte_efd/rte_efd.c
@@ -692,7 +692,8 @@ rte_efd_create(const char *name, uint32_t max_num_rules, uint32_t key_len,
 			offline_cpu_socket, 0);
 	if (r == NULL) {
 		RTE_LOG(ERR, EFD, "memory allocation failed\n");
-		goto error_unlock_exit;
+		rte_efd_free(table);
+		return NULL;
 	}
 
 	/* Populate free slots ring. Entry zero is reserved for key misses. */
-- 
2.13.6

Re: [dpdk-stable] [PATCH v2] lib/efd: fix write unlock during ring creation

[Ferruh Yigit]

On 11/14/2018 11:24 AM, Chaitanya Babu Talluri wrote:
> In rte_efd_create() write lock has already been unlocked
> before ring creation itself.
> So second unlock after the ring creation has been removed.
> 
> Fixes: 56b6ef874f80 ("efd: new Elastic Flow Distributor library")
> Cc: stable@dpdk.org
> 
> Signed-off-by: Chaitanya Babu Talluri <tallurix.chaitanya.babu@intel.com>
> Acked-by: Reshma Pattan <reshma.pattan@intel.com>

Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>

Re: [dpdk-stable] [dpdk-dev] [PATCH v2] lib/efd: fix write unlock during ring creation

[Thomas Monjalon]

16/11/2018 14:39, Ferruh Yigit:
> On 11/14/2018 11:24 AM, Chaitanya Babu Talluri wrote:
> > In rte_efd_create() write lock has already been unlocked
> > before ring creation itself.
> > So second unlock after the ring creation has been removed.
> > 
> > Fixes: 56b6ef874f80 ("efd: new Elastic Flow Distributor library")
> > Cc: stable@dpdk.org
> > 
> > Signed-off-by: Chaitanya Babu Talluri <tallurix.chaitanya.babu@intel.com>
> > Acked-by: Reshma Pattan <reshma.pattan@intel.com>
> 
> Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>

Applied, thanks