net/mlx5: fix release of jump to queue action

Message ID 1555273031-1672-1-git-send-email-orika@mellanox.com
State Accepted, archived
Delegated to: Shahaf Shuler
Headers show
Series
  • net/mlx5: fix release of jump to queue action
Related show

Checks

Context Check Description
ci/Intel-compilation success Compilation OK
ci/mellanox-Performance-Testing success Performance Testing PASS
ci/intel-Performance-Testing success Performance Testing PASS
ci/checkpatch success coding style OK

Commit Message

Ori Kam April 14, 2019, 8:17 p.m.
Currenlty the allocation of the jump to QP is done in flow apply,
this results in memory leak.

This patch fixes this issue by moving the allocation and release of the
jump to QP action to the responsiblity of the hrxq.

Fixes: cbb66daa3c85 ("net/mlx5: prepare Direct Verbs for Direct Rule")
Cc: stable@dpdk.org

Signed-off-by: Ori Kam <orika@mellanox.com>
---
 drivers/net/mlx5/mlx5_flow_dv.c |  8 ++------
 drivers/net/mlx5/mlx5_rxq.c     | 20 ++++++++++++++++++++
 drivers/net/mlx5/mlx5_rxtx.h    |  3 +++
 3 files changed, 25 insertions(+), 6 deletions(-)

Comments

Yongseok Koh April 16, 2019, 10:46 p.m. | #1
On Sun, Apr 14, 2019 at 08:17:11PM +0000, Ori Kam wrote:
> Currenlty the allocation of the jump to QP is done in flow apply,
> this results in memory leak.
> 
> This patch fixes this issue by moving the allocation and release of the
> jump to QP action to the responsiblity of the hrxq.
> 
> Fixes: cbb66daa3c85 ("net/mlx5: prepare Direct Verbs for Direct Rule")
> Cc: stable@dpdk.org
> 
> Signed-off-by: Ori Kam <orika@mellanox.com>
> ---

Acked-by: Yongseok Koh <yskoh@mellanox.com>


>  drivers/net/mlx5/mlx5_flow_dv.c |  8 ++------
>  drivers/net/mlx5/mlx5_rxq.c     | 20 ++++++++++++++++++++
>  drivers/net/mlx5/mlx5_rxtx.h    |  3 +++
>  3 files changed, 25 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
> index 3862b26..04ab3d6 100644
> --- a/drivers/net/mlx5/mlx5_flow_dv.c
> +++ b/drivers/net/mlx5/mlx5_flow_dv.c
> @@ -3651,9 +3651,7 @@ struct field_modify_info modify_tcp[] = {
>  					 "cannot get drop hash queue");
>  				goto error;
>  			}
> -			dv->actions[n++] =
> -				mlx5_glue->dv_create_flow_action_dest_ibv_qp
> -				(dv->hrxq->qp);
> +			dv->actions[n++] = dv->hrxq->action;
>  		} else if (flow->actions &
>  			   (MLX5_FLOW_ACTION_QUEUE | MLX5_FLOW_ACTION_RSS)) {
>  			struct mlx5_hrxq *hrxq;
> @@ -3678,9 +3676,7 @@ struct field_modify_info modify_tcp[] = {
>  				goto error;
>  			}
>  			dv->hrxq = hrxq;
> -			dv->actions[n++] =
> -				mlx5_glue->dv_create_flow_action_dest_ibv_qp
> -				(dv->hrxq->qp);
> +			dv->actions[n++] = dv->hrxq->action;
>  		}
>  		dv->flow =
>  			mlx5_glue->dv_create_flow(dv->matcher->matcher_object,
> diff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c
> index 8a84b0a..836bec9 100644
> --- a/drivers/net/mlx5/mlx5_rxq.c
> +++ b/drivers/net/mlx5/mlx5_rxq.c
> @@ -1864,6 +1864,13 @@ struct mlx5_hrxq *
>  	hrxq->rss_key_len = rss_key_len;
>  	hrxq->hash_fields = hash_fields;
>  	memcpy(hrxq->rss_key, rss_key, rss_key_len);
> +#ifdef HAVE_IBV_FLOW_DV_SUPPORT
> +	hrxq->action = mlx5_glue->dv_create_flow_action_dest_ibv_qp(hrxq->qp);
> +	if (!hrxq->action) {
> +		rte_errno = errno;
> +		goto error;
> +	}
> +#endif
>  	rte_atomic32_inc(&hrxq->refcnt);
>  	LIST_INSERT_HEAD(&priv->hrxqs, hrxq, next);
>  	return hrxq;
> @@ -1941,6 +1948,9 @@ struct mlx5_hrxq *
>  	if (rte_atomic32_dec_and_test(&hrxq->refcnt)) {
>  		claim_zero(mlx5_glue->destroy_qp(hrxq->qp));
>  		mlx5_ind_table_ibv_release(dev, hrxq->ind_table);
> +#ifdef HAVE_IBV_FLOW_DV_SUPPORT
> +		mlx5_glue->destroy_flow_action(hrxq->action);
> +#endif
>  		LIST_REMOVE(hrxq, next);
>  		rte_free(hrxq);
>  		return 0;
> @@ -2178,6 +2188,13 @@ struct mlx5_hrxq *
>  	}
>  	hrxq->ind_table = ind_tbl;
>  	hrxq->qp = qp;
> +#ifdef HAVE_IBV_FLOW_DV_SUPPORT
> +	hrxq->action = mlx5_glue->dv_create_flow_action_dest_ibv_qp(hrxq->qp);
> +	if (!hrxq->action) {
> +		rte_errno = errno;
> +		goto error;
> +	}
> +#endif
>  	priv->drop_queue.hrxq = hrxq;
>  	rte_atomic32_set(&hrxq->refcnt, 1);
>  	return hrxq;
> @@ -2202,6 +2219,9 @@ struct mlx5_hrxq *
>  	if (rte_atomic32_dec_and_test(&hrxq->refcnt)) {
>  		claim_zero(mlx5_glue->destroy_qp(hrxq->qp));
>  		mlx5_ind_table_ibv_drop_release(dev);
> +#ifdef HAVE_IBV_FLOW_DV_SUPPORT
> +		mlx5_glue->destroy_flow_action(hrxq->action);
> +#endif
>  		rte_free(hrxq);
>  		priv->drop_queue.hrxq = NULL;
>  	}
> diff --git a/drivers/net/mlx5/mlx5_rxtx.h b/drivers/net/mlx5/mlx5_rxtx.h
> index 5d49892..4339aaf 100644
> --- a/drivers/net/mlx5/mlx5_rxtx.h
> +++ b/drivers/net/mlx5/mlx5_rxtx.h
> @@ -166,6 +166,9 @@ struct mlx5_hrxq {
>  	rte_atomic32_t refcnt; /* Reference counter. */
>  	struct mlx5_ind_table_ibv *ind_table; /* Indirection table. */
>  	struct ibv_qp *qp; /* Verbs queue pair. */
> +#ifdef HAVE_IBV_FLOW_DV_SUPPORT
> +	void *action; /* DV QP action pointer. */
> +#endif
>  	uint64_t hash_fields; /* Verbs Hash fields. */
>  	uint32_t rss_key_len; /* Hash key length in bytes. */
>  	uint8_t rss_key[]; /* Hash key. */
> -- 
> 1.8.3.1
>
Shahaf Shuler April 18, 2019, 6:55 p.m. | #2
Wednesday, April 17, 2019 1:46 AM, Yongseok Koh:
> Subject: Re: [PATCH] net/mlx5: fix release of jump to queue action
> 
> On Sun, Apr 14, 2019 at 08:17:11PM +0000, Ori Kam wrote:
> > Currenlty the allocation of the jump to QP is done in flow apply, this
> > results in memory leak.
> >
> > This patch fixes this issue by moving the allocation and release of
> > the jump to QP action to the responsiblity of the hrxq.
> >
> > Fixes: cbb66daa3c85 ("net/mlx5: prepare Direct Verbs for Direct Rule")
> > Cc: stable@dpdk.org
> >
> > Signed-off-by: Ori Kam <orika@mellanox.com>

Applied to next-net-mlx, thanks.

Patch

diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index 3862b26..04ab3d6 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -3651,9 +3651,7 @@  struct field_modify_info modify_tcp[] = {
 					 "cannot get drop hash queue");
 				goto error;
 			}
-			dv->actions[n++] =
-				mlx5_glue->dv_create_flow_action_dest_ibv_qp
-				(dv->hrxq->qp);
+			dv->actions[n++] = dv->hrxq->action;
 		} else if (flow->actions &
 			   (MLX5_FLOW_ACTION_QUEUE | MLX5_FLOW_ACTION_RSS)) {
 			struct mlx5_hrxq *hrxq;
@@ -3678,9 +3676,7 @@  struct field_modify_info modify_tcp[] = {
 				goto error;
 			}
 			dv->hrxq = hrxq;
-			dv->actions[n++] =
-				mlx5_glue->dv_create_flow_action_dest_ibv_qp
-				(dv->hrxq->qp);
+			dv->actions[n++] = dv->hrxq->action;
 		}
 		dv->flow =
 			mlx5_glue->dv_create_flow(dv->matcher->matcher_object,
diff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c
index 8a84b0a..836bec9 100644
--- a/drivers/net/mlx5/mlx5_rxq.c
+++ b/drivers/net/mlx5/mlx5_rxq.c
@@ -1864,6 +1864,13 @@  struct mlx5_hrxq *
 	hrxq->rss_key_len = rss_key_len;
 	hrxq->hash_fields = hash_fields;
 	memcpy(hrxq->rss_key, rss_key, rss_key_len);
+#ifdef HAVE_IBV_FLOW_DV_SUPPORT
+	hrxq->action = mlx5_glue->dv_create_flow_action_dest_ibv_qp(hrxq->qp);
+	if (!hrxq->action) {
+		rte_errno = errno;
+		goto error;
+	}
+#endif
 	rte_atomic32_inc(&hrxq->refcnt);
 	LIST_INSERT_HEAD(&priv->hrxqs, hrxq, next);
 	return hrxq;
@@ -1941,6 +1948,9 @@  struct mlx5_hrxq *
 	if (rte_atomic32_dec_and_test(&hrxq->refcnt)) {
 		claim_zero(mlx5_glue->destroy_qp(hrxq->qp));
 		mlx5_ind_table_ibv_release(dev, hrxq->ind_table);
+#ifdef HAVE_IBV_FLOW_DV_SUPPORT
+		mlx5_glue->destroy_flow_action(hrxq->action);
+#endif
 		LIST_REMOVE(hrxq, next);
 		rte_free(hrxq);
 		return 0;
@@ -2178,6 +2188,13 @@  struct mlx5_hrxq *
 	}
 	hrxq->ind_table = ind_tbl;
 	hrxq->qp = qp;
+#ifdef HAVE_IBV_FLOW_DV_SUPPORT
+	hrxq->action = mlx5_glue->dv_create_flow_action_dest_ibv_qp(hrxq->qp);
+	if (!hrxq->action) {
+		rte_errno = errno;
+		goto error;
+	}
+#endif
 	priv->drop_queue.hrxq = hrxq;
 	rte_atomic32_set(&hrxq->refcnt, 1);
 	return hrxq;
@@ -2202,6 +2219,9 @@  struct mlx5_hrxq *
 	if (rte_atomic32_dec_and_test(&hrxq->refcnt)) {
 		claim_zero(mlx5_glue->destroy_qp(hrxq->qp));
 		mlx5_ind_table_ibv_drop_release(dev);
+#ifdef HAVE_IBV_FLOW_DV_SUPPORT
+		mlx5_glue->destroy_flow_action(hrxq->action);
+#endif
 		rte_free(hrxq);
 		priv->drop_queue.hrxq = NULL;
 	}
diff --git a/drivers/net/mlx5/mlx5_rxtx.h b/drivers/net/mlx5/mlx5_rxtx.h
index 5d49892..4339aaf 100644
--- a/drivers/net/mlx5/mlx5_rxtx.h
+++ b/drivers/net/mlx5/mlx5_rxtx.h
@@ -166,6 +166,9 @@  struct mlx5_hrxq {
 	rte_atomic32_t refcnt; /* Reference counter. */
 	struct mlx5_ind_table_ibv *ind_table; /* Indirection table. */
 	struct ibv_qp *qp; /* Verbs queue pair. */
+#ifdef HAVE_IBV_FLOW_DV_SUPPORT
+	void *action; /* DV QP action pointer. */
+#endif
 	uint64_t hash_fields; /* Verbs Hash fields. */
 	uint32_t rss_key_len; /* Hash key length in bytes. */
 	uint8_t rss_key[]; /* Hash key. */