patches for DPDK stable branches
 help / color / mirror / Atom feed
* [PATCH] crypto/ipsec_mb: fix allocating mb_mgr in session
@ 2023-05-17 15:13 Ciara Power
  2023-05-17 15:19 ` [PATCH v2] " Ciara Power
  2023-05-17 16:46 ` [PATCH] " Ji, Kai
  0 siblings, 2 replies; 5+ messages in thread
From: Ciara Power @ 2023-05-17 15:13 UTC (permalink / raw)
  To: Kai Ji, Pablo de Lara; +Cc: dev, Ciara Power, stable

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")
Cc: stable@dpdk.org

Signed-off-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
Signed-off-by: Ciara Power <ciara.power@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 3e52f95674..f9ced8afc3 100644
--- a/drivers/crypto/ipsec_mb/ipsec_mb_ops.c
+++ b/drivers/crypto/ipsec_mb/ipsec_mb_ops.c
@@ -434,15 +434,22 @@ 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;
 	}
 
@@ -452,11 +459,13 @@ ipsec_mb_sym_session_configure(
 		IPSEC_MB_LOG(ERR, "failed configure session parameters");
 
 		/* Return session to mempool */
-		free_mb_mgr(mb_mgr);
+		if (qp == NULL)
+			free_mb_mgr(mb_mgr);
 		return ret;
 	}
 
-	free_mb_mgr(mb_mgr);
+	if (qp == NULL)
+			free_mb_mgr(mb_mgr);
 	return 0;
 }
 
-- 
2.25.1


^ permalink raw reply	[flat|nested] 5+ messages in thread

* [PATCH v2] crypto/ipsec_mb: fix allocating mb_mgr in session
  2023-05-17 15:13 [PATCH] crypto/ipsec_mb: fix allocating mb_mgr in session Ciara Power
@ 2023-05-17 15:19 ` Ciara Power
  2023-05-17 16:46   ` Ji, Kai
  2023-05-17 16:46 ` [PATCH] " Ji, Kai
  1 sibling, 1 reply; 5+ messages in thread
From: Ciara Power @ 2023-05-17 15:19 UTC (permalink / raw)
  To: Kai Ji, Pablo de Lara; +Cc: dev, Ciara Power, stable

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")
Cc: stable@dpdk.org

Signed-off-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
Signed-off-by: Ciara Power <ciara.power@intel.com>
---
v2: fixed indents
---
 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 3e52f95674..30f919cd40 100644
--- a/drivers/crypto/ipsec_mb/ipsec_mb_ops.c
+++ b/drivers/crypto/ipsec_mb/ipsec_mb_ops.c
@@ -434,15 +434,22 @@ 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;
 	}
 
@@ -452,11 +459,13 @@ ipsec_mb_sym_session_configure(
 		IPSEC_MB_LOG(ERR, "failed configure session parameters");
 
 		/* Return session to mempool */
-		free_mb_mgr(mb_mgr);
+		if (qp == NULL)
+			free_mb_mgr(mb_mgr);
 		return ret;
 	}
 
-	free_mb_mgr(mb_mgr);
+	if (qp == NULL)
+		free_mb_mgr(mb_mgr);
 	return 0;
 }
 
-- 
2.25.1


^ permalink raw reply	[flat|nested] 5+ messages in thread

* RE: [PATCH] crypto/ipsec_mb: fix allocating mb_mgr in session
  2023-05-17 15:13 [PATCH] crypto/ipsec_mb: fix allocating mb_mgr in session Ciara Power
  2023-05-17 15:19 ` [PATCH v2] " Ciara Power
@ 2023-05-17 16:46 ` Ji, Kai
  1 sibling, 0 replies; 5+ messages in thread
From: Ji, Kai @ 2023-05-17 16:46 UTC (permalink / raw)
  To: Power, Ciara, De Lara Guarch, Pablo; +Cc: dev, stable

Acked-by: Kai Ji <kai.ji@intel.com>

> -----Original Message-----
> From: Power, Ciara <ciara.power@intel.com>
> Sent: Wednesday, May 17, 2023 4:14 PM
> To: Ji, Kai <kai.ji@intel.com>; De Lara Guarch, Pablo
> <pablo.de.lara.guarch@intel.com>
> Cc: dev@dpdk.org; Power, Ciara <ciara.power@intel.com>; stable@dpdk.org
> Subject: [PATCH] crypto/ipsec_mb: fix allocating mb_mgr in session
> 
> 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")
> Cc: stable@dpdk.org
> 
> Signed-off-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
> Signed-off-by: Ciara Power <ciara.power@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 3e52f95674..f9ced8afc3 100644
> --- a/drivers/crypto/ipsec_mb/ipsec_mb_ops.c
> +++ b/drivers/crypto/ipsec_mb/ipsec_mb_ops.c
> @@ -434,15 +434,22 @@ 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;
>  	}
> 
> @@ -452,11 +459,13 @@ ipsec_mb_sym_session_configure(
>  		IPSEC_MB_LOG(ERR, "failed configure session parameters");
> 
>  		/* Return session to mempool */
> -		free_mb_mgr(mb_mgr);
> +		if (qp == NULL)
> +			free_mb_mgr(mb_mgr);
>  		return ret;
>  	}
> 
> -	free_mb_mgr(mb_mgr);
> +	if (qp == NULL)
> +			free_mb_mgr(mb_mgr);
>  	return 0;
>  }
> 
> --
> 2.25.1


^ permalink raw reply	[flat|nested] 5+ messages in thread

* RE: [PATCH v2] crypto/ipsec_mb: fix allocating mb_mgr in session
  2023-05-17 15:19 ` [PATCH v2] " Ciara Power
@ 2023-05-17 16:46   ` Ji, Kai
  2023-05-25  7:09     ` Akhil Goyal
  0 siblings, 1 reply; 5+ messages in thread
From: Ji, Kai @ 2023-05-17 16:46 UTC (permalink / raw)
  To: Power, Ciara, De Lara Guarch, Pablo; +Cc: dev, stable

Acked-by: Kai Ji <kai.ji@intel.com>

> -----Original Message-----
> From: Power, Ciara <ciara.power@intel.com>
> Sent: Wednesday, May 17, 2023 4:19 PM
> To: Ji, Kai <kai.ji@intel.com>; De Lara Guarch, Pablo
> <pablo.de.lara.guarch@intel.com>
> Cc: dev@dpdk.org; Power, Ciara <ciara.power@intel.com>; stable@dpdk.org
> Subject: [PATCH v2] crypto/ipsec_mb: fix allocating mb_mgr in session
> 
> 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")
> Cc: stable@dpdk.org
> 
> Signed-off-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
> Signed-off-by: Ciara Power <ciara.power@intel.com>
> ---
> v2: fixed indents
> ---
>  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 3e52f95674..30f919cd40 100644
> --- a/drivers/crypto/ipsec_mb/ipsec_mb_ops.c
> +++ b/drivers/crypto/ipsec_mb/ipsec_mb_ops.c
> @@ -434,15 +434,22 @@ 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;
>  	}
> 
> @@ -452,11 +459,13 @@ ipsec_mb_sym_session_configure(
>  		IPSEC_MB_LOG(ERR, "failed configure session parameters");
> 
>  		/* Return session to mempool */
> -		free_mb_mgr(mb_mgr);
> +		if (qp == NULL)
> +			free_mb_mgr(mb_mgr);
>  		return ret;
>  	}
> 
> -	free_mb_mgr(mb_mgr);
> +	if (qp == NULL)
> +		free_mb_mgr(mb_mgr);
>  	return 0;
>  }
> 
> --
> 2.25.1


^ permalink raw reply	[flat|nested] 5+ messages in thread

* RE: [PATCH v2] crypto/ipsec_mb: fix allocating mb_mgr in session
  2023-05-17 16:46   ` Ji, Kai
@ 2023-05-25  7:09     ` Akhil Goyal
  0 siblings, 0 replies; 5+ messages in thread
From: Akhil Goyal @ 2023-05-25  7:09 UTC (permalink / raw)
  To: Ji, Kai, Power, Ciara, De Lara Guarch, Pablo; +Cc: dev, stable

> Acked-by: Kai Ji <kai.ji@intel.com>
> 
> > Subject: [PATCH v2] crypto/ipsec_mb: fix allocating mb_mgr in session
> >
> > 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")
> > Cc: stable@dpdk.org
> >
> > Signed-off-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
> > Signed-off-by: Ciara Power <ciara.power@intel.com>
> > ---
Applied to dpdk-next-crypto


^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2023-05-25  7:09 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-05-17 15:13 [PATCH] crypto/ipsec_mb: fix allocating mb_mgr in session Ciara Power
2023-05-17 15:19 ` [PATCH v2] " Ciara Power
2023-05-17 16:46   ` Ji, Kai
2023-05-25  7:09     ` Akhil Goyal
2023-05-17 16:46 ` [PATCH] " Ji, Kai

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