patch 'crypto/ipsec_mb: optimize allocation in session' has been queued to stable release 21.11.5

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.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 07/25/23. 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. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/f329acb88395b70f49562094ff1c31c47920bc1d

Thanks.

Kevin

---
>From f329acb88395b70f49562094ff1c31c47920bc1d Mon Sep 17 00:00:00 2001
From: Ciara Power <ciara.power at intel.com>
Date: Wed, 17 May 2023 15:19:16 +0000
Subject: [PATCH] crypto/ipsec_mb: optimize allocation in session

[ upstream commit db7dc9070bf42593e3fca5f2f47ac0344e1b5cb6 ]

When configuring the session, use the queue pair mb_mgr that was already
allocated if possible. If this doesn't exist, then allocate a new mb_mgr.

This reduces unnecessary cycles creating an mb_mgr for every session
configured.

Fixes: c75542ae4200 ("crypto/ipsec_mb: introduce IPsec_mb framework")

Signed-off-by: Pablo de Lara <pablo.de.lara.guarch at intel.com>
Signed-off-by: Ciara Power <ciara.power at intel.com>
Acked-by: Kai Ji <kai.ji at intel.com>
---
 drivers/crypto/ipsec_mb/ipsec_mb_ops.c | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/drivers/crypto/ipsec_mb/ipsec_mb_ops.c b/drivers/crypto/ipsec_mb/ipsec_mb_ops.c
index 58ea4ee476..32d09cd5e3 100644
--- a/drivers/crypto/ipsec_mb/ipsec_mb_ops.c
+++ b/drivers/crypto/ipsec_mb/ipsec_mb_ops.c
@@ -320,7 +320,13 @@ ipsec_mb_sym_session_configure(
 	struct ipsec_mb_internals *pmd_data =
 		&ipsec_mb_pmds[internals->pmd_type];
-	IMB_MGR *mb_mgr = alloc_init_mb_mgr();
+	struct ipsec_mb_qp *qp = dev->data->queue_pairs[0];
+	IMB_MGR *mb_mgr;
 	int ret = 0;
 
+	if (qp != NULL)
+		mb_mgr = qp->mb_mgr;
+	else
+		mb_mgr = alloc_init_mb_mgr();
+
 	if (!mb_mgr)
 		return -ENOMEM;
@@ -328,5 +334,6 @@ ipsec_mb_sym_session_configure(
 	if (unlikely(sess == NULL)) {
 		IPSEC_MB_LOG(ERR, "invalid session struct");
-		free_mb_mgr(mb_mgr);
+		if (qp == NULL)
+			free_mb_mgr(mb_mgr);
 		return -EINVAL;
 	}
@@ -344,5 +351,6 @@ ipsec_mb_sym_session_configure(
 		/* Return session to mempool */
 		rte_mempool_put(mempool, sess_private_data);
-		free_mb_mgr(mb_mgr);
+		if (qp == NULL)
+			free_mb_mgr(mb_mgr);
 		return ret;
 	}
@@ -350,5 +358,6 @@ ipsec_mb_sym_session_configure(
 	set_sym_session_private_data(sess, dev->driver_id, sess_private_data);
 
-	free_mb_mgr(mb_mgr);
+	if (qp == NULL)
+		free_mb_mgr(mb_mgr);
 	return 0;
 }
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-07-20 16:18:01.733250564 +0100
+++ 0055-crypto-ipsec_mb-optimize-allocation-in-session.patch	2023-07-20 16:17:54.770750953 +0100
@@ -1 +1 @@
-From db7dc9070bf42593e3fca5f2f47ac0344e1b5cb6 Mon Sep 17 00:00:00 2001
+From f329acb88395b70f49562094ff1c31c47920bc1d Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit db7dc9070bf42593e3fca5f2f47ac0344e1b5cb6 ]
+
@@ -13 +14,0 @@
-Cc: stable at dpdk.org
@@ -23 +24 @@
-index 3e52f95674..30f919cd40 100644
+index 58ea4ee476..32d09cd5e3 100644
@@ -26 +27 @@
-@@ -435,7 +435,13 @@ ipsec_mb_sym_session_configure(
+@@ -320,7 +320,13 @@ ipsec_mb_sym_session_configure(
@@ -41 +42 @@
-@@ -443,5 +449,6 @@ ipsec_mb_sym_session_configure(
+@@ -328,5 +334,6 @@ ipsec_mb_sym_session_configure(
@@ -49,2 +50 @@
-@@ -453,9 +460,11 @@ ipsec_mb_sym_session_configure(
- 
+@@ -344,5 +351,6 @@ ipsec_mb_sym_session_configure(
@@ -51,0 +52 @@
+ 		rte_mempool_put(mempool, sess_private_data);
@@ -56,0 +58,2 @@
+@@ -350,5 +358,6 @@ ipsec_mb_sym_session_configure(
+ 	set_sym_session_private_data(sess, dev->driver_id, sess_private_data);