[dpdk-stable] patch 'efd: fix write unlock during ring creation' has been queued to LTS release 17.11.5

Yongseok Koh yskoh at mellanox.com
Fri Nov 30 00:11:47 CET 2018


Hi,

FYI, your patch has been queued to LTS release 17.11.5

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 12/01/18. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the patch applied
to the branch. If the code is different (ie: not only metadata diffs), due for example to
a change in context or macro names, please double check it.

Thanks.

Yongseok

---
>From d6ec4aa1a7977bdf0282c6139851b868566bd71d Mon Sep 17 00:00:00 2001
From: Chaitanya Babu Talluri <tallurix.chaitanya.babu at intel.com>
Date: Wed, 14 Nov 2018 11:24:06 +0000
Subject: [PATCH] efd: fix write unlock during ring creation

[ upstream commit f493119397d0f5dbe33f67697ff09aa646e5f17c ]

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")

Signed-off-by: Chaitanya Babu Talluri <tallurix.chaitanya.babu at intel.com>
Acked-by: Reshma Pattan <reshma.pattan at intel.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit at intel.com>
---
 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 7d0b5cc6d..6b611b555 100644
--- a/lib/librte_efd/rte_efd.c
+++ b/lib/librte_efd/rte_efd.c
@@ -721,7 +721,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.11.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2018-11-29 15:01:50.144019875 -0800
+++ 0113-efd-fix-write-unlock-during-ring-creation.patch	2018-11-29 15:01:45.298957000 -0800
@@ -1,14 +1,15 @@
-From f493119397d0f5dbe33f67697ff09aa646e5f17c Mon Sep 17 00:00:00 2001
+From d6ec4aa1a7977bdf0282c6139851b868566bd71d Mon Sep 17 00:00:00 2001
 From: Chaitanya Babu Talluri <tallurix.chaitanya.babu at intel.com>
 Date: Wed, 14 Nov 2018 11:24:06 +0000
 Subject: [PATCH] efd: fix write unlock during ring creation
 
+[ upstream commit f493119397d0f5dbe33f67697ff09aa646e5f17c ]
+
 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 at dpdk.org
 
 Signed-off-by: Chaitanya Babu Talluri <tallurix.chaitanya.babu at intel.com>
 Acked-by: Reshma Pattan <reshma.pattan at intel.com>
@@ -18,10 +19,10 @@
  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
+index 7d0b5cc6d..6b611b555 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,
+@@ -721,7 +721,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");


More information about the stable mailing list