[9/9] net/mlx5: add drop action to Direct Verbs E-Switch

Message ID 1555276357-4892-10-git-send-email-orika@mellanox.com
State Superseded, archived
Delegated to: Shahaf Shuler
Headers show
Series
  • net/mlx5: add Direct Verbs E-Switch support
Related show

Checks

Context Check Description
ci/Intel-compilation success Compilation OK
ci/checkpatch warning coding style issues

Commit Message

Ori Kam April 14, 2019, 9:12 p.m.
This commit adds support for drop action when creating E-Switch flow
using DV.

Signed-off-by: Ori Kam <orika@mellanox.com>
---
 drivers/net/mlx5/mlx5.c         |  9 +++++++++
 drivers/net/mlx5/mlx5.h         |  1 +
 drivers/net/mlx5/mlx5_flow_dv.c | 26 ++++++++++++++++----------
 drivers/net/mlx5/mlx5_glue.c    | 12 ++++++++++++
 drivers/net/mlx5/mlx5_glue.h    |  1 +
 5 files changed, 39 insertions(+), 10 deletions(-)

Comments

Yongseok Koh April 18, 2019, 1:28 a.m. | #1
On Sun, Apr 14, 2019 at 09:12:37PM +0000, Ori Kam wrote:
> This commit adds support for drop action when creating E-Switch flow
> using DV.
> 
> Signed-off-by: Ori Kam <orika@mellanox.com>
> ---
>  drivers/net/mlx5/mlx5.c         |  9 +++++++++
>  drivers/net/mlx5/mlx5.h         |  1 +
>  drivers/net/mlx5/mlx5_flow_dv.c | 26 ++++++++++++++++----------
>  drivers/net/mlx5/mlx5_glue.c    | 12 ++++++++++++
>  drivers/net/mlx5/mlx5_glue.h    |  1 +
>  5 files changed, 39 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
> index 938ba1c..e3c6d24 100644
> --- a/drivers/net/mlx5/mlx5.c
> +++ b/drivers/net/mlx5/mlx5.c
> @@ -357,6 +357,7 @@ struct mlx5_dev_spawn_data {
>  			goto error;
>  		}
>  		sh->fdb_ns = ns;
> +		sh->drop_action = mlx5_glue->dr_create_flow_action_drop();
>  	}
>  #endif
>  	sh->dv_refcnt++;
> @@ -377,6 +378,10 @@ struct mlx5_dev_spawn_data {
>  		mlx5_glue->dr_destroy_ns(sh->fdb_ns);
>  		sh->fdb_ns = NULL;
>  	}
> +	if (sh->drop_action) {
> +		mlx5_glue->destroy_flow_action(sh->drop_action);
> +		sh->drop_action = NULL;
> +	}
>  	return err;
>  #else
>  	(void)priv;
> @@ -417,6 +422,10 @@ struct mlx5_dev_spawn_data {
>  		mlx5_glue->dr_destroy_ns(sh->fdb_ns);
>  		sh->fdb_ns = NULL;
>  	}
> +	if (sh->drop_action) {
> +		mlx5_glue->destroy_flow_action(sh->drop_action);
> +		sh->drop_action = NULL;
> +	}
>  #endif
>  	pthread_mutex_destroy(&sh->dv_mutex);
>  #else
> diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h
> index 016984d..fd85b9d 100644
> --- a/drivers/net/mlx5/mlx5.h
> +++ b/drivers/net/mlx5/mlx5.h
> @@ -275,6 +275,7 @@ struct mlx5_ibv_shared {
>  	/* RX Direct Rules tables. */
>  	void *tx_ns; /* TX Direct Rules name space handle. */
>  	struct mlx5_flow_tbl_resource tx_tbl[MLX5_MAX_TABLES];
> +	void *drop_action; /* Pointer to drop action. */

Better to mention esw here?
E.g. esw_drop_action.

>  	/* TX Direct Rules tables/ */
>  	LIST_HEAD(matchers, mlx5_flow_dv_matcher) matchers;
>  	LIST_HEAD(encap_decap, mlx5_flow_dv_encap_decap_resource) encaps_decaps;
> diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
> index d4dc439..4a8e894 100644
> --- a/drivers/net/mlx5/mlx5_flow_dv.c
> +++ b/drivers/net/mlx5/mlx5_flow_dv.c
> @@ -4062,6 +4062,7 @@ struct field_modify_info modify_tcp[] = {
>  {
>  	struct mlx5_flow_dv *dv;
>  	struct mlx5_flow *dev_flow;
> +	struct mlx5_priv *priv = dev->data->dev_private;
>  	int n;
>  	int err;
>  
> @@ -4069,17 +4070,22 @@ struct field_modify_info modify_tcp[] = {
>  		dv = &dev_flow->dv;
>  		n = dv->actions_n;
>  		if (flow->actions & MLX5_FLOW_ACTION_DROP) {
> -			dv->hrxq = mlx5_hrxq_drop_new(dev);
> -			if (!dv->hrxq) {
> -				rte_flow_error_set
> -					(error, errno,
> -					 RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL,
> -					 "cannot get drop hash queue");
> -				goto error;
> +			if (flow->transfer)
> +				dv->actions[n++] = priv->sh->drop_action;
> +			else {
> +				dv->hrxq = mlx5_hrxq_drop_new(dev);
> +				if (!dv->hrxq) {
> +					rte_flow_error_set
> +						(error, errno,
> +						 RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
> +						 NULL,
> +						 "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++] =
> -				mlx5_glue->dv_create_flow_action_dest_ibv_qp
> -				(dv->hrxq->qp);

This seems to be conflicting to your previous fix, which is:
	"net/mlx5: fix release of jump to queue action"

Please rebase.

Thanks,
Yongseok

>  		} else if (flow->actions &
>  			   (MLX5_FLOW_ACTION_QUEUE | MLX5_FLOW_ACTION_RSS)) {
>  			struct mlx5_hrxq *hrxq;
> diff --git a/drivers/net/mlx5/mlx5_glue.c b/drivers/net/mlx5/mlx5_glue.c
> index 117190f..b32cd09c 100644
> --- a/drivers/net/mlx5/mlx5_glue.c
> +++ b/drivers/net/mlx5/mlx5_glue.c
> @@ -394,6 +394,16 @@
>  }
>  
>  static void *
> +mlx5_glue_dr_create_flow_action_drop(void)
> +{
> +#ifdef HAVE_MLX5DV_DR_ESWITCH
> +	return mlx5dv_dr_create_action_drop();
> +#else
> +	return NULL;
> +#endif
> +}
> +
> +static void *
>  mlx5_glue_dr_create_flow_tbl(void *ns, uint32_t level)
>  {
>  #ifdef HAVE_MLX5DV_DR
> @@ -861,6 +871,8 @@
>  		mlx5_glue_dr_create_flow_action_dest_flow_tbl,
>  	.dr_create_flow_action_dest_vport =
>  		mlx5_glue_dr_create_flow_action_dest_vport,
> +	.dr_create_flow_action_drop =
> +		mlx5_glue_dr_create_flow_action_drop,
>  	.dr_create_flow_tbl = mlx5_glue_dr_create_flow_tbl,
>  	.dr_destroy_flow_tbl = mlx5_glue_dr_destroy_flow_tbl,
>  	.dr_create_ns = mlx5_glue_dr_create_ns,
> diff --git a/drivers/net/mlx5/mlx5_glue.h b/drivers/net/mlx5/mlx5_glue.h
> index 26f5cb3..1d06583 100644
> --- a/drivers/net/mlx5/mlx5_glue.h
> +++ b/drivers/net/mlx5/mlx5_glue.h
> @@ -147,6 +147,7 @@ struct mlx5_glue {
>  	struct ibv_cq *(*cq_ex_to_cq)(struct ibv_cq_ex *cq);
>  	void *(*dr_create_flow_action_dest_flow_tbl)(void *tbl);
>  	void *(*dr_create_flow_action_dest_vport)(void *ns, uint32_t vport);
> +	void *(*dr_create_flow_action_drop)();
>  	void *(*dr_create_flow_tbl)(void *ns, uint32_t level);
>  	int (*dr_destroy_flow_tbl)(void *tbl);
>  	void *(*dr_create_ns)(struct ibv_context *ctx,
> -- 
> 1.8.3.1
>
Ori Kam April 18, 2019, 5:15 a.m. | #2
Hi Yongseok,
PSB 

> -----Original Message-----
> From: Yongseok Koh
> Sent: Thursday, April 18, 2019 4:28 AM
> To: Ori Kam <orika@mellanox.com>
> Cc: Shahaf Shuler <shahafs@mellanox.com>; Matan Azrad
> <matan@mellanox.com>; Slava Ovsiienko <viacheslavo@mellanox.com>; Moti
> Haimovsky <motih@mellanox.com>; dev@dpdk.org
> Subject: Re: [PATCH 9/9] net/mlx5: add drop action to Direct Verbs E-Switch
> 
> On Sun, Apr 14, 2019 at 09:12:37PM +0000, Ori Kam wrote:
> > This commit adds support for drop action when creating E-Switch flow
> > using DV.
> >
> > Signed-off-by: Ori Kam <orika@mellanox.com>
> > ---
> >  drivers/net/mlx5/mlx5.c         |  9 +++++++++
> >  drivers/net/mlx5/mlx5.h         |  1 +
> >  drivers/net/mlx5/mlx5_flow_dv.c | 26 ++++++++++++++++----------
> >  drivers/net/mlx5/mlx5_glue.c    | 12 ++++++++++++
> >  drivers/net/mlx5/mlx5_glue.h    |  1 +
> >  5 files changed, 39 insertions(+), 10 deletions(-)
> >
> > diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
> > index 938ba1c..e3c6d24 100644
> > --- a/drivers/net/mlx5/mlx5.c
> > +++ b/drivers/net/mlx5/mlx5.c
> > @@ -357,6 +357,7 @@ struct mlx5_dev_spawn_data {
> >  			goto error;
> >  		}
> >  		sh->fdb_ns = ns;
> > +		sh->drop_action = mlx5_glue->dr_create_flow_action_drop();
> >  	}
> >  #endif
> >  	sh->dv_refcnt++;
> > @@ -377,6 +378,10 @@ struct mlx5_dev_spawn_data {
> >  		mlx5_glue->dr_destroy_ns(sh->fdb_ns);
> >  		sh->fdb_ns = NULL;
> >  	}
> > +	if (sh->drop_action) {
> > +		mlx5_glue->destroy_flow_action(sh->drop_action);
> > +		sh->drop_action = NULL;
> > +	}
> >  	return err;
> >  #else
> >  	(void)priv;
> > @@ -417,6 +422,10 @@ struct mlx5_dev_spawn_data {
> >  		mlx5_glue->dr_destroy_ns(sh->fdb_ns);
> >  		sh->fdb_ns = NULL;
> >  	}
> > +	if (sh->drop_action) {
> > +		mlx5_glue->destroy_flow_action(sh->drop_action);
> > +		sh->drop_action = NULL;
> > +	}
> >  #endif
> >  	pthread_mutex_destroy(&sh->dv_mutex);
> >  #else
> > diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h
> > index 016984d..fd85b9d 100644
> > --- a/drivers/net/mlx5/mlx5.h
> > +++ b/drivers/net/mlx5/mlx5.h
> > @@ -275,6 +275,7 @@ struct mlx5_ibv_shared {
> >  	/* RX Direct Rules tables. */
> >  	void *tx_ns; /* TX Direct Rules name space handle. */
> >  	struct mlx5_flow_tbl_resource tx_tbl[MLX5_MAX_TABLES];
> > +	void *drop_action; /* Pointer to drop action. */
> 
> Better to mention esw here?
> E.g. esw_drop_action.
> 

Sure.

> >  	/* TX Direct Rules tables/ */
> >  	LIST_HEAD(matchers, mlx5_flow_dv_matcher) matchers;
> >  	LIST_HEAD(encap_decap, mlx5_flow_dv_encap_decap_resource)
> encaps_decaps;
> > diff --git a/drivers/net/mlx5/mlx5_flow_dv.c
> b/drivers/net/mlx5/mlx5_flow_dv.c
> > index d4dc439..4a8e894 100644
> > --- a/drivers/net/mlx5/mlx5_flow_dv.c
> > +++ b/drivers/net/mlx5/mlx5_flow_dv.c
> > @@ -4062,6 +4062,7 @@ struct field_modify_info modify_tcp[] = {
> >  {
> >  	struct mlx5_flow_dv *dv;
> >  	struct mlx5_flow *dev_flow;
> > +	struct mlx5_priv *priv = dev->data->dev_private;
> >  	int n;
> >  	int err;
> >
> > @@ -4069,17 +4070,22 @@ struct field_modify_info modify_tcp[] = {
> >  		dv = &dev_flow->dv;
> >  		n = dv->actions_n;
> >  		if (flow->actions & MLX5_FLOW_ACTION_DROP) {
> > -			dv->hrxq = mlx5_hrxq_drop_new(dev);
> > -			if (!dv->hrxq) {
> > -				rte_flow_error_set
> > -					(error, errno,
> > -
> RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL,
> > -					 "cannot get drop hash queue");
> > -				goto error;
> > +			if (flow->transfer)
> > +				dv->actions[n++] = priv->sh->drop_action;
> > +			else {
> > +				dv->hrxq = mlx5_hrxq_drop_new(dev);
> > +				if (!dv->hrxq) {
> > +					rte_flow_error_set
> > +						(error, errno,
> > +
> RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
> > +						 NULL,
> > +						 "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++] =
> > -				mlx5_glue-
> >dv_create_flow_action_dest_ibv_qp
> > -				(dv->hrxq->qp);
> 
> This seems to be conflicting to your previous fix, which is:
> 	"net/mlx5: fix release of jump to queue action"
> 
> Please rebase.
> 

Sure.

> Thanks,
> Yongseok
> 
> >  		} else if (flow->actions &
> >  			   (MLX5_FLOW_ACTION_QUEUE |
> MLX5_FLOW_ACTION_RSS)) {
> >  			struct mlx5_hrxq *hrxq;
> > diff --git a/drivers/net/mlx5/mlx5_glue.c b/drivers/net/mlx5/mlx5_glue.c
> > index 117190f..b32cd09c 100644
> > --- a/drivers/net/mlx5/mlx5_glue.c
> > +++ b/drivers/net/mlx5/mlx5_glue.c
> > @@ -394,6 +394,16 @@
> >  }
> >
> >  static void *
> > +mlx5_glue_dr_create_flow_action_drop(void)
> > +{
> > +#ifdef HAVE_MLX5DV_DR_ESWITCH
> > +	return mlx5dv_dr_create_action_drop();
> > +#else
> > +	return NULL;
> > +#endif
> > +}
> > +
> > +static void *
> >  mlx5_glue_dr_create_flow_tbl(void *ns, uint32_t level)
> >  {
> >  #ifdef HAVE_MLX5DV_DR
> > @@ -861,6 +871,8 @@
> >  		mlx5_glue_dr_create_flow_action_dest_flow_tbl,
> >  	.dr_create_flow_action_dest_vport =
> >  		mlx5_glue_dr_create_flow_action_dest_vport,
> > +	.dr_create_flow_action_drop =
> > +		mlx5_glue_dr_create_flow_action_drop,
> >  	.dr_create_flow_tbl = mlx5_glue_dr_create_flow_tbl,
> >  	.dr_destroy_flow_tbl = mlx5_glue_dr_destroy_flow_tbl,
> >  	.dr_create_ns = mlx5_glue_dr_create_ns,
> > diff --git a/drivers/net/mlx5/mlx5_glue.h b/drivers/net/mlx5/mlx5_glue.h
> > index 26f5cb3..1d06583 100644
> > --- a/drivers/net/mlx5/mlx5_glue.h
> > +++ b/drivers/net/mlx5/mlx5_glue.h
> > @@ -147,6 +147,7 @@ struct mlx5_glue {
> >  	struct ibv_cq *(*cq_ex_to_cq)(struct ibv_cq_ex *cq);
> >  	void *(*dr_create_flow_action_dest_flow_tbl)(void *tbl);
> >  	void *(*dr_create_flow_action_dest_vport)(void *ns, uint32_t vport);
> > +	void *(*dr_create_flow_action_drop)();
> >  	void *(*dr_create_flow_tbl)(void *ns, uint32_t level);
> >  	int (*dr_destroy_flow_tbl)(void *tbl);
> >  	void *(*dr_create_ns)(struct ibv_context *ctx,
> > --
> > 1.8.3.1
> >

Patch

diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
index 938ba1c..e3c6d24 100644
--- a/drivers/net/mlx5/mlx5.c
+++ b/drivers/net/mlx5/mlx5.c
@@ -357,6 +357,7 @@  struct mlx5_dev_spawn_data {
 			goto error;
 		}
 		sh->fdb_ns = ns;
+		sh->drop_action = mlx5_glue->dr_create_flow_action_drop();
 	}
 #endif
 	sh->dv_refcnt++;
@@ -377,6 +378,10 @@  struct mlx5_dev_spawn_data {
 		mlx5_glue->dr_destroy_ns(sh->fdb_ns);
 		sh->fdb_ns = NULL;
 	}
+	if (sh->drop_action) {
+		mlx5_glue->destroy_flow_action(sh->drop_action);
+		sh->drop_action = NULL;
+	}
 	return err;
 #else
 	(void)priv;
@@ -417,6 +422,10 @@  struct mlx5_dev_spawn_data {
 		mlx5_glue->dr_destroy_ns(sh->fdb_ns);
 		sh->fdb_ns = NULL;
 	}
+	if (sh->drop_action) {
+		mlx5_glue->destroy_flow_action(sh->drop_action);
+		sh->drop_action = NULL;
+	}
 #endif
 	pthread_mutex_destroy(&sh->dv_mutex);
 #else
diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h
index 016984d..fd85b9d 100644
--- a/drivers/net/mlx5/mlx5.h
+++ b/drivers/net/mlx5/mlx5.h
@@ -275,6 +275,7 @@  struct mlx5_ibv_shared {
 	/* RX Direct Rules tables. */
 	void *tx_ns; /* TX Direct Rules name space handle. */
 	struct mlx5_flow_tbl_resource tx_tbl[MLX5_MAX_TABLES];
+	void *drop_action; /* Pointer to drop action. */
 	/* TX Direct Rules tables/ */
 	LIST_HEAD(matchers, mlx5_flow_dv_matcher) matchers;
 	LIST_HEAD(encap_decap, mlx5_flow_dv_encap_decap_resource) encaps_decaps;
diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index d4dc439..4a8e894 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -4062,6 +4062,7 @@  struct field_modify_info modify_tcp[] = {
 {
 	struct mlx5_flow_dv *dv;
 	struct mlx5_flow *dev_flow;
+	struct mlx5_priv *priv = dev->data->dev_private;
 	int n;
 	int err;
 
@@ -4069,17 +4070,22 @@  struct field_modify_info modify_tcp[] = {
 		dv = &dev_flow->dv;
 		n = dv->actions_n;
 		if (flow->actions & MLX5_FLOW_ACTION_DROP) {
-			dv->hrxq = mlx5_hrxq_drop_new(dev);
-			if (!dv->hrxq) {
-				rte_flow_error_set
-					(error, errno,
-					 RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL,
-					 "cannot get drop hash queue");
-				goto error;
+			if (flow->transfer)
+				dv->actions[n++] = priv->sh->drop_action;
+			else {
+				dv->hrxq = mlx5_hrxq_drop_new(dev);
+				if (!dv->hrxq) {
+					rte_flow_error_set
+						(error, errno,
+						 RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
+						 NULL,
+						 "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++] =
-				mlx5_glue->dv_create_flow_action_dest_ibv_qp
-				(dv->hrxq->qp);
 		} else if (flow->actions &
 			   (MLX5_FLOW_ACTION_QUEUE | MLX5_FLOW_ACTION_RSS)) {
 			struct mlx5_hrxq *hrxq;
diff --git a/drivers/net/mlx5/mlx5_glue.c b/drivers/net/mlx5/mlx5_glue.c
index 117190f..b32cd09c 100644
--- a/drivers/net/mlx5/mlx5_glue.c
+++ b/drivers/net/mlx5/mlx5_glue.c
@@ -394,6 +394,16 @@ 
 }
 
 static void *
+mlx5_glue_dr_create_flow_action_drop(void)
+{
+#ifdef HAVE_MLX5DV_DR_ESWITCH
+	return mlx5dv_dr_create_action_drop();
+#else
+	return NULL;
+#endif
+}
+
+static void *
 mlx5_glue_dr_create_flow_tbl(void *ns, uint32_t level)
 {
 #ifdef HAVE_MLX5DV_DR
@@ -861,6 +871,8 @@ 
 		mlx5_glue_dr_create_flow_action_dest_flow_tbl,
 	.dr_create_flow_action_dest_vport =
 		mlx5_glue_dr_create_flow_action_dest_vport,
+	.dr_create_flow_action_drop =
+		mlx5_glue_dr_create_flow_action_drop,
 	.dr_create_flow_tbl = mlx5_glue_dr_create_flow_tbl,
 	.dr_destroy_flow_tbl = mlx5_glue_dr_destroy_flow_tbl,
 	.dr_create_ns = mlx5_glue_dr_create_ns,
diff --git a/drivers/net/mlx5/mlx5_glue.h b/drivers/net/mlx5/mlx5_glue.h
index 26f5cb3..1d06583 100644
--- a/drivers/net/mlx5/mlx5_glue.h
+++ b/drivers/net/mlx5/mlx5_glue.h
@@ -147,6 +147,7 @@  struct mlx5_glue {
 	struct ibv_cq *(*cq_ex_to_cq)(struct ibv_cq_ex *cq);
 	void *(*dr_create_flow_action_dest_flow_tbl)(void *tbl);
 	void *(*dr_create_flow_action_dest_vport)(void *ns, uint32_t vport);
+	void *(*dr_create_flow_action_drop)();
 	void *(*dr_create_flow_tbl)(void *ns, uint32_t level);
 	int (*dr_destroy_flow_tbl)(void *tbl);
 	void *(*dr_create_ns)(struct ibv_context *ctx,