From: Ciara Power <ciara.power@intel.com>
To: Fan Zhang <fanzhang.oss@gmail.com>,
Pablo de Lara <pablo.de.lara.guarch@intel.com>
Cc: stable@dpdk.org, kai.ji@intel.com, Ciara Power <ciara.power@intel.com>
Subject: [PATCH 21.11] crypto/ipsec_mb: fix allocating mb_mgr in session
Date: Wed, 17 May 2023 15:24:04 +0000 [thread overview]
Message-ID: <20230517152404.1050004-1-ciara.power@intel.com> (raw)
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: c75542a ("crypto/ipsec_mb: introduce IPsec_mb framework")
Signed-off-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
Signed-off-by: Ciara Power <ciara.power@intel.com>
---
Similar fix sent upstream for 23.07, and 22.11 backport:
https://patches.dpdk.org/project/dpdk/patch/20230517151916.1048475-1-ciara.power@intel.com/
The 21.11 fix needed a few extra lines, so kept separate.
---
drivers/crypto/ipsec_mb/ipsec_mb_ops.c | 20 +++++++++++++++-----
1 file changed, 15 insertions(+), 5 deletions(-)
diff --git a/drivers/crypto/ipsec_mb/ipsec_mb_ops.c b/drivers/crypto/ipsec_mb/ipsec_mb_ops.c
index 58ea4ee476..12f0dd25bd 100644
--- a/drivers/crypto/ipsec_mb/ipsec_mb_ops.c
+++ b/drivers/crypto/ipsec_mb/ipsec_mb_ops.c
@@ -319,21 +319,29 @@ ipsec_mb_sym_session_configure(
struct ipsec_mb_dev_private *internals = dev->data->dev_private;
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;
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;
}
if (rte_mempool_get(mempool, &sess_private_data)) {
IPSEC_MB_LOG(ERR, "Couldn't get object from session mempool");
- free_mb_mgr(mb_mgr);
+ if (qp == NULL)
+ free_mb_mgr(mb_mgr);
return -ENOMEM;
}
@@ -343,13 +351,15 @@ 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;
}
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.25.1
reply other threads:[~2023-05-17 15:24 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230517152404.1050004-1-ciara.power@intel.com \
--to=ciara.power@intel.com \
--cc=fanzhang.oss@gmail.com \
--cc=kai.ji@intel.com \
--cc=pablo.de.lara.guarch@intel.com \
--cc=stable@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).