[dpdk-stable] patch 'crypto/aesni_mb: fix queue pair free' has been queued to stable release 18.08.1

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 18.08.1

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/08/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.

Kevin Traynor

---
>From 2394c7d7d54cfd28d597cff43e6e654679e290c9 Mon Sep 17 00:00:00 2001
From: Fan Zhang <roy.fan.zhang at intel.com>
Date: Tue, 16 Oct 2018 10:45:54 +0100
Subject: [PATCH] crypto/aesni_mb: fix queue pair free

[ upstream commit 1fd1aa0c91bf138a4e7f6f7ce60c8d850da73564 ]

This patch fixes the queue pair free for AESNI-MB PMD. Originally
the queue pair ring name are different than the object name,
caused the aesni_mb_pmd_qp_release() cannot find the ring to
release. This patch uses the same name between queue pair object
name and ring name.

Fixes: a831c318c54d ("crypto/aesni_mb: free ring memory on queue release")

Signed-off-by: Fan Zhang <roy.fan.zhang at intel.com>
---
 drivers/crypto/aesni_mb/rte_aesni_mb_pmd_ops.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_ops.c b/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_ops.c
index ab26e5ae4..200023fd8 100644
--- a/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_ops.c
+++ b/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_ops.c
@@ -450,12 +450,10 @@ aesni_mb_pmd_qp_set_unique_name(struct rte_cryptodev *dev,
 static struct rte_ring *
 aesni_mb_pmd_qp_create_processed_ops_ring(struct aesni_mb_qp *qp,
-		const char *str, unsigned int ring_size, int socket_id)
+		unsigned int ring_size, int socket_id)
 {
 	struct rte_ring *r;
 	char ring_name[RTE_CRYPTODEV_NAME_MAX_LEN];
 
-	unsigned int n = snprintf(ring_name, sizeof(ring_name),
-				"%s_%s",
-				qp->name, str);
+	unsigned int n = snprintf(ring_name, sizeof(ring_name), "%s", qp->name);
 
 	if (n >= sizeof(ring_name))
@@ -515,5 +513,5 @@ aesni_mb_pmd_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id,
 
 	qp->ingress_queue = aesni_mb_pmd_qp_create_processed_ops_ring(qp,
-			"ingress", qp_conf->nb_descriptors, socket_id);
+			qp_conf->nb_descriptors, socket_id);
 	if (qp->ingress_queue == NULL) {
 		ret = -1;
-- 
2.19.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2018-11-29 13:11:35.867655142 +0000
+++ 0032-crypto-aesni_mb-fix-queue-pair-free.patch	2018-11-29 13:11:34.000000000 +0000
@@ -1,8 +1,10 @@
-From 1fd1aa0c91bf138a4e7f6f7ce60c8d850da73564 Mon Sep 17 00:00:00 2001
+From 2394c7d7d54cfd28d597cff43e6e654679e290c9 Mon Sep 17 00:00:00 2001
 From: Fan Zhang <roy.fan.zhang at intel.com>
 Date: Tue, 16 Oct 2018 10:45:54 +0100
 Subject: [PATCH] crypto/aesni_mb: fix queue pair free
 
+[ upstream commit 1fd1aa0c91bf138a4e7f6f7ce60c8d850da73564 ]
+
 This patch fixes the queue pair free for AESNI-MB PMD. Originally
 the queue pair ring name are different than the object name,
 caused the aesni_mb_pmd_qp_release() cannot find the ring to
@@ -10,7 +12,6 @@
 name and ring name.
 
 Fixes: a831c318c54d ("crypto/aesni_mb: free ring memory on queue release")
-Cc: stable at dpdk.org
 
 Signed-off-by: Fan Zhang <roy.fan.zhang at intel.com>
 ---
@@ -18,10 +19,10 @@
  1 file changed, 3 insertions(+), 5 deletions(-)
 
 diff --git a/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_ops.c b/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_ops.c
-index 43f6c26ed..f3eff2685 100644
+index ab26e5ae4..200023fd8 100644
 --- a/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_ops.c
 +++ b/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_ops.c
-@@ -536,12 +536,10 @@ aesni_mb_pmd_qp_set_unique_name(struct rte_cryptodev *dev,
+@@ -450,12 +450,10 @@ aesni_mb_pmd_qp_set_unique_name(struct rte_cryptodev *dev,
  static struct rte_ring *
  aesni_mb_pmd_qp_create_processed_ops_ring(struct aesni_mb_qp *qp,
 -		const char *str, unsigned int ring_size, int socket_id)
@@ -36,7 +37,7 @@
 +	unsigned int n = snprintf(ring_name, sizeof(ring_name), "%s", qp->name);
  
  	if (n >= sizeof(ring_name))
-@@ -601,5 +599,5 @@ aesni_mb_pmd_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id,
+@@ -515,5 +513,5 @@ aesni_mb_pmd_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id,
  
  	qp->ingress_queue = aesni_mb_pmd_qp_create_processed_ops_ring(qp,
 -			"ingress", qp_conf->nb_descriptors, socket_id);