[3/4] net/mlx5: share DV/DR flow related structures

  DV/DR related structures are moved to the shared context:
  - rx/tx namespaces, shared by master and representors
  - rx/tx flow tables
  - matchers
  - encap/decap action resources
  - flow tags (MARK actions)
  - modify action resources
  - jump tables

Signed-off-by: Viacheslav Ovsiienko <viacheslavo@mellanox.com>
---
 drivers/net/mlx5/mlx5.c         | 28 +++++++++++-----------
 drivers/net/mlx5/mlx5.h         | 40 +++++++++++++++----------------
 drivers/net/mlx5/mlx5_flow_dv.c | 52 +++++++++++++++++++++++------------------
 3 files changed, 63 insertions(+), 57 deletions(-)
  

Tuesday, April 2, 2019 9:23 AM, Viacheslav Ovsiienko:
> Subject: [PATCH 3/4] net/mlx5: share DV/DR flow related structures

Same comment about the title. 

> 
> DV/DR related structures are moved to the shared context:
>   - rx/tx namespaces, shared by master and representors
>   - rx/tx flow tables
>   - matchers
>   - encap/decap action resources
>   - flow tags (MARK actions)
>   - modify action resources
>   - jump tables

I am OK w/ the logic.
However the next commit (4/4 net/mlx5: add mutex for shared DV/DR structures) should be squashed into this one. 
Because w/o it, the concurrent flow creation/destroy between multiple devices is broken. 

> 
> Signed-off-by: Viacheslav Ovsiienko <viacheslavo@mellanox.com>
> ---
>  drivers/net/mlx5/mlx5.c         | 28 +++++++++++-----------
>  drivers/net/mlx5/mlx5.h         | 40 +++++++++++++++----------------
>  drivers/net/mlx5/mlx5_flow_dv.c | 52 +++++++++++++++++++++++---------
> ---------
>  3 files changed, 63 insertions(+), 57 deletions(-)
> 
> diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c index
> 79e0c17..369b698 100644
> --- a/drivers/net/mlx5/mlx5.c
> +++ b/drivers/net/mlx5/mlx5.c
> @@ -329,27 +329,27 @@ struct mlx5_dev_spawn_data {
>  		err = errno;
>  		goto error;
>  	}
> -	priv->rx_ns = ns;
> +	sh->rx_ns = ns;
>  	ns = mlx5dv_dr_create_ns(sh->ctx,
> MLX5DV_DR_NS_DOMAIN_EGRESS_BYPASS);
>  	if (!ns) {
>  		DRV_LOG(ERR, "egress mlx5dv_dr_create_ns failed");
>  		err = errno;
>  		goto error;
>  	}
> -	priv->tx_ns = ns;
> +	sh->tx_ns = ns;
>  	sh->dv_refcnt++;
>  	priv->dv_shared = 1;
>  	return 0;
> 
>  error:
>         /* Rollback the created objects. */
> -	if (priv->rx_ns) {
> -		mlx5dv_dr_destroy_ns(priv->rx_ns);
> -		priv->rx_ns = NULL;
> +	if (sh->rx_ns) {
> +		mlx5dv_dr_destroy_ns(sh->rx_ns);
> +		sh->rx_ns = NULL;
>  	}
> -	if (priv->tx_ns) {
> -		mlx5dv_dr_destroy_ns(priv->tx_ns);
> -		priv->tx_ns = NULL;
> +	if (sh->tx_ns) {
> +		mlx5dv_dr_destroy_ns(sh->tx_ns);
> +		sh->tx_ns = NULL;
>  	}
>  	return err;
>  }
> @@ -373,13 +373,13 @@ struct mlx5_dev_spawn_data {
>  	assert(sh->dv_refcnt);
>  	if (sh->dv_refcnt && --sh->dv_refcnt)
>  		return;
> -	if (priv->rx_ns) {
> -		mlx5dv_dr_destroy_ns(priv->rx_ns);
> -		priv->rx_ns = NULL;
> +	if (sh->rx_ns) {
> +		mlx5dv_dr_destroy_ns(sh->rx_ns);
> +		sh->rx_ns = NULL;
>  	}
> -	if (priv->tx_ns) {
> -		mlx5dv_dr_destroy_ns(priv->tx_ns);
> -		priv->tx_ns = NULL;
> +	if (sh->tx_ns) {
> +		mlx5dv_dr_destroy_ns(sh->tx_ns);
> +		sh->tx_ns = NULL;
>  	}
>  }
>  #endif
> diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h index
> 56a2c61..e67227f 100644
> --- a/drivers/net/mlx5/mlx5.h
> +++ b/drivers/net/mlx5/mlx5.h
> @@ -199,6 +199,15 @@ struct mlx5_ibv_shared_port {
>  	 */
>  };
> 
> +/* Table structure. */
> +struct mlx5_flow_tbl_resource {
> +	void *obj; /**< Pointer to DR table object. */
> +	rte_atomic32_t refcnt; /**< Reference counter. */ };
> +
> +#define MLX5_MAX_TABLES 1024
> +#define MLX5_GROUP_FACTOR 1
> +
>  /*
>   * Shared Infiniband device context for Master/Representors
>   * which belong to same IB device with multiple IB ports.
> @@ -215,6 +224,17 @@ struct mlx5_ibv_shared {
>  	struct ibv_device_attr_ex device_attr; /* Device properties. */
>  	/* Shared DV/DR flow data section. */
>  	uint32_t dv_refcnt; /* DV/DR data reference counter. */
> +	void *rx_ns; /* RX Direct Rules name space handle. */
> +	struct mlx5_flow_tbl_resource rx_tbl[MLX5_MAX_TABLES];
> +	/* RX Direct Rules tables. */
> +	void *tx_ns; /* TX Direct Rules name space handle. */
> +	struct mlx5_flow_tbl_resource tx_tbl[MLX5_MAX_TABLES];
> +	/* TX Direct Rules tables/ */
> +	LIST_HEAD(matchers, mlx5_flow_dv_matcher) matchers;
> +	LIST_HEAD(encap_decap, mlx5_flow_dv_encap_decap_resource)
> encaps_decaps;
> +	LIST_HEAD(modify_cmd, mlx5_flow_dv_modify_hdr_resource)
> modify_cmds;
> +	LIST_HEAD(tag, mlx5_flow_dv_tag_resource) tags;
> +	LIST_HEAD(jump, mlx5_flow_dv_jump_tbl_resource) jump_tbl;
>  	/* Shared interrupt handler section. */
>  	pthread_mutex_t intr_mutex; /* Interrupt config mutex. */
>  	uint32_t intr_cnt; /* Interrupt handler reference counter. */ @@ -
> 222,15 +242,6 @@ struct mlx5_ibv_shared {
>  	struct mlx5_ibv_shared_port port[]; /* per device port data array. */
> };
> 
> -/* Table structure. */
> -struct mlx5_flow_tbl_resource {
> -	void *obj; /**< Pointer to DR table object. */
> -	rte_atomic32_t refcnt; /**< Reference counter. */
> -};
> -
> -#define MLX5_MAX_TABLES 1024
> -#define MLX5_GROUP_FACTOR 1
> -
>  struct mlx5_priv {
>  	LIST_ENTRY(mlx5_priv) mem_event_cb;
>  	/**< Called by memory event callback. */ @@ -279,11 +290,6 @@
> struct mlx5_priv {
>  	LIST_HEAD(txqibv, mlx5_txq_ibv) txqsibv; /* Verbs Tx queues. */
>  	/* Verbs Indirection tables. */
>  	LIST_HEAD(ind_tables, mlx5_ind_table_ibv) ind_tbls;
> -	LIST_HEAD(matchers, mlx5_flow_dv_matcher) matchers;
> -	LIST_HEAD(encap_decap, mlx5_flow_dv_encap_decap_resource)
> encaps_decaps;
> -	LIST_HEAD(modify_cmd, mlx5_flow_dv_modify_hdr_resource)
> modify_cmds;
> -	LIST_HEAD(tag, mlx5_flow_dv_tag_resource) tags;
> -	LIST_HEAD(jump, mlx5_flow_dv_jump_tbl_resource) jump_tbl;
>  	/* Pointer to next element. */
>  	rte_atomic32_t refcnt; /**< Reference counter. */
>  	struct ibv_flow_action *verbs_action;
> @@ -308,12 +314,6 @@ struct mlx5_priv {
>  	/* UAR same-page access control required in 32bit implementations.
> */  #endif
>  	struct mlx5_flow_tcf_context *tcf_context; /* TC flower context. */
> -	void *rx_ns; /* RX Direct Rules name space handle. */
> -	struct mlx5_flow_tbl_resource rx_tbl[MLX5_MAX_TABLES];
> -	/* RX Direct Rules tables. */
> -	void *tx_ns; /* TX Direct Rules name space handle. */
> -	struct mlx5_flow_tbl_resource tx_tbl[MLX5_MAX_TABLES];
> -	/* TX Direct Rules tables/ */
>  };
> 
>  #define PORT_ID(priv) ((priv)->dev_data->port_id) diff --git
> a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
> index f1dd00a..4912fc8 100644
> --- a/drivers/net/mlx5/mlx5_flow_dv.c
> +++ b/drivers/net/mlx5/mlx5_flow_dv.c
> @@ -804,18 +804,19 @@ struct field_modify_info modify_tcp[] = {
>  			 struct rte_flow_error *error)
>  {
>  	struct mlx5_priv *priv = dev->data->dev_private;
> +	struct mlx5_ibv_shared *sh = priv->sh;
>  	struct mlx5_flow_dv_encap_decap_resource *cache_resource;
>  	struct rte_flow *flow = dev_flow->flow;
>  	struct mlx5dv_dr_ns *ns;
> 
>  	resource->flags = flow->group ? 0 : 1;
>  	if (flow->ingress)
> -		ns = priv->rx_ns;
> +		ns = sh->rx_ns;
>  	else
> -		ns = priv->tx_ns;
> +		ns = sh->tx_ns;
> 
>  	/* Lookup a matching resource from cache. */
> -	LIST_FOREACH(cache_resource, &priv->encaps_decaps, next) {
> +	LIST_FOREACH(cache_resource, &sh->encaps_decaps, next) {
>  		if (resource->reformat_type == cache_resource-
> >reformat_type &&
>  		    resource->ft_type == cache_resource->ft_type &&
>  		    resource->flags == cache_resource->flags && @@ -840,7
> +841,7 @@ struct field_modify_info modify_tcp[] = {
>  	*cache_resource = *resource;
>  	cache_resource->verbs_action =
>  		mlx5_glue->dv_create_flow_action_packet_reformat
> -			(priv->sh->ctx, cache_resource->reformat_type,
> +			(sh->ctx, cache_resource->reformat_type,
>  			 cache_resource->ft_type, ns, cache_resource-
> >flags,
>  			 cache_resource->size,
>  			 (cache_resource->size ? cache_resource->buf :
> NULL)); @@ -852,7 +853,7 @@ struct field_modify_info modify_tcp[] = {
>  	}
>  	rte_atomic32_init(&cache_resource->refcnt);
>  	rte_atomic32_inc(&cache_resource->refcnt);
> -	LIST_INSERT_HEAD(&priv->encaps_decaps, cache_resource, next);
> +	LIST_INSERT_HEAD(&sh->encaps_decaps, cache_resource, next);
>  	dev_flow->dv.encap_decap = cache_resource;
>  	DRV_LOG(DEBUG, "new encap/decap resource %p: refcnt %d++",
>  		(void *)cache_resource,
> @@ -883,10 +884,11 @@ struct field_modify_info modify_tcp[] = {
>  			 struct rte_flow_error *error)
>  {
>  	struct mlx5_priv *priv = dev->data->dev_private;
> +	struct mlx5_ibv_shared *sh = priv->sh;
>  	struct mlx5_flow_dv_jump_tbl_resource *cache_resource;
> 
>  	/* Lookup a matching resource from cache. */
> -	LIST_FOREACH(cache_resource, &priv->jump_tbl, next) {
> +	LIST_FOREACH(cache_resource, &sh->jump_tbl, next) {
>  		if (resource->tbl == cache_resource->tbl) {
>  			DRV_LOG(DEBUG, "jump table resource resource
> %p: refcnt %d++",
>  				(void *)cache_resource,
> @@ -914,7 +916,7 @@ struct field_modify_info modify_tcp[] = {
>  	}
>  	rte_atomic32_init(&cache_resource->refcnt);
>  	rte_atomic32_inc(&cache_resource->refcnt);
> -	LIST_INSERT_HEAD(&priv->jump_tbl, cache_resource, next);
> +	LIST_INSERT_HEAD(&sh->jump_tbl, cache_resource, next);
>  	dev_flow->dv.jump = cache_resource;
>  	DRV_LOG(DEBUG, "new jump table  resource %p: refcnt %d++",
>  		(void *)cache_resource,
> @@ -1538,14 +1540,15 @@ struct field_modify_info modify_tcp[] = {
>  			 struct rte_flow_error *error)
>  {
>  	struct mlx5_priv *priv = dev->data->dev_private;
> +	struct mlx5_ibv_shared *sh = priv->sh;
>  	struct mlx5_flow_dv_modify_hdr_resource *cache_resource;
> 
>  	struct mlx5dv_dr_ns *ns =
>  		resource->ft_type == MLX5DV_FLOW_TABLE_TYPE_NIC_TX
> ?
> -		priv->tx_ns : priv->rx_ns;
> +		sh->tx_ns : sh->rx_ns;
> 
>  	/* Lookup a matching resource from cache. */
> -	LIST_FOREACH(cache_resource, &priv->modify_cmds, next) {
> +	LIST_FOREACH(cache_resource, &sh->modify_cmds, next) {
>  		if (resource->ft_type == cache_resource->ft_type &&
>  		    resource->actions_num == cache_resource->actions_num
> &&
>  		    !memcmp((const void *)resource->actions, @@ -1569,7
> +1572,7 @@ struct field_modify_info modify_tcp[] = {
>  	*cache_resource = *resource;
>  	cache_resource->verbs_action =
>  		mlx5_glue->dv_create_flow_action_modify_header
> -					(priv->sh->ctx, cache_resource-
> >ft_type,
> +					(sh->ctx, cache_resource->ft_type,
>  					 ns, 0,
>  					 cache_resource->actions_num *
>  					 sizeof(cache_resource->actions[0]),
> @@ -1582,7 +1585,7 @@ struct field_modify_info modify_tcp[] = {
>  	}
>  	rte_atomic32_init(&cache_resource->refcnt);
>  	rte_atomic32_inc(&cache_resource->refcnt);
> -	LIST_INSERT_HEAD(&priv->modify_cmds, cache_resource, next);
> +	LIST_INSERT_HEAD(&sh->modify_cmds, cache_resource, next);
>  	dev_flow->dv.modify_hdr = cache_resource;
>  	DRV_LOG(DEBUG, "new modify-header resource %p: refcnt %d++",
>  		(void *)cache_resource,
> @@ -2879,18 +2882,19 @@ struct field_modify_info modify_tcp[] = {
>  			 struct rte_flow_error *error)
>  {
>  	struct mlx5_priv *priv = dev->data->dev_private;
> +	struct mlx5_ibv_shared *sh = priv->sh;
>  	struct mlx5_flow_tbl_resource *tbl;
> 
>  	if (egress) {
> -		tbl = &priv->tx_tbl[table_id];
> +		tbl = &sh->tx_tbl[table_id];
>  		if (!tbl->obj)
>  			tbl->obj = mlx5_glue->dr_create_flow_tbl
> -				(priv->tx_ns, table_id);
> +				(sh->tx_ns, table_id);
>  	} else {
> -		tbl = &priv->rx_tbl[table_id];
> +		tbl = &sh->rx_tbl[table_id];
>  		if (!tbl->obj)
>  			tbl->obj = mlx5_glue->dr_create_flow_tbl
> -				(priv->rx_ns, table_id);
> +				(sh->rx_ns, table_id);
>  	}
>  	if (!tbl->obj) {
>  		rte_flow_error_set(error, ENOMEM,
> @@ -2946,6 +2950,7 @@ struct field_modify_info modify_tcp[] = {
>  			 struct rte_flow_error *error)
>  {
>  	struct mlx5_priv *priv = dev->data->dev_private;
> +	struct mlx5_ibv_shared *sh = priv->sh;
>  	struct mlx5_flow_dv_matcher *cache_matcher;
>  	struct mlx5dv_flow_matcher_attr dv_attr = {
>  		.type = IBV_FLOW_ATTR_NORMAL,
> @@ -2957,7 +2962,7 @@ struct field_modify_info modify_tcp[] = {  #endif
> 
>  	/* Lookup from cache. */
> -	LIST_FOREACH(cache_matcher, &priv->matchers, next) {
> +	LIST_FOREACH(cache_matcher, &sh->matchers, next) {
>  		if (matcher->crc == cache_matcher->crc &&
>  		    matcher->priority == cache_matcher->priority &&
>  		    matcher->egress == cache_matcher->egress && @@ -
> 3001,8 +3006,7 @@ struct field_modify_info modify_tcp[] = {
>  	if (matcher->egress)
>  		dv_attr.flags |= IBV_FLOW_ATTR_FLAGS_EGRESS;
>  	cache_matcher->matcher_object =
> -		mlx5_glue->dv_create_flow_matcher(priv->sh->ctx,
> &dv_attr,
> -						  tbl->obj);
> +		mlx5_glue->dv_create_flow_matcher(sh->ctx, &dv_attr, tbl-
> >obj);
>  	if (!cache_matcher->matcher_object) {
>  		rte_free(cache_matcher);
>  #ifdef HAVE_MLX5DV_DR
> @@ -3013,7 +3017,7 @@ struct field_modify_info modify_tcp[] = {
>  					  NULL, "cannot create matcher");
>  	}
>  	rte_atomic32_inc(&cache_matcher->refcnt);
> -	LIST_INSERT_HEAD(&priv->matchers, cache_matcher, next);
> +	LIST_INSERT_HEAD(&sh->matchers, cache_matcher, next);
>  	dev_flow->dv.matcher = cache_matcher;
>  	DRV_LOG(DEBUG, "priority %hd new %s matcher %p: refcnt %d",
>  		cache_matcher->priority,
> @@ -3069,10 +3073,11 @@ struct field_modify_info modify_tcp[] = {
>  			 struct rte_flow_error *error)
>  {
>  	struct mlx5_priv *priv = dev->data->dev_private;
> +	struct mlx5_ibv_shared *sh = priv->sh;
>  	struct mlx5_flow_dv_tag_resource *cache_resource;
> 
>  	/* Lookup a matching resource from cache. */
> -	LIST_FOREACH(cache_resource, &priv->tags, next) {
> +	LIST_FOREACH(cache_resource, &sh->tags, next) {
>  		if (resource->tag == cache_resource->tag) {
>  			DRV_LOG(DEBUG, "tag resource %p: refcnt %d++",
>  				(void *)cache_resource,
> @@ -3099,7 +3104,7 @@ struct field_modify_info modify_tcp[] = {
>  	}
>  	rte_atomic32_init(&cache_resource->refcnt);
>  	rte_atomic32_inc(&cache_resource->refcnt);
> -	LIST_INSERT_HEAD(&priv->tags, cache_resource, next);
> +	LIST_INSERT_HEAD(&sh->tags, cache_resource, next);
>  	dev_flow->flow->tag_resource = cache_resource;
>  	DRV_LOG(DEBUG, "new tag resource %p: refcnt %d++",
>  		(void *)cache_resource,
> @@ -3676,6 +3681,7 @@ struct field_modify_info modify_tcp[] = {  {
>  	struct mlx5_flow_dv_matcher *matcher = flow->dv.matcher;
>  	struct mlx5_priv *priv = dev->data->dev_private;
> +	struct mlx5_ibv_shared *sh = priv->sh;
>  	struct mlx5_flow_tbl_resource *tbl;
> 
>  	assert(matcher->matcher_object);
> @@ -3687,9 +3693,9 @@ struct field_modify_info modify_tcp[] = {
>  			   (matcher->matcher_object));
>  		LIST_REMOVE(matcher, next);
>  		if (matcher->egress)
> -			tbl = &priv->tx_tbl[matcher->group];
> +			tbl = &sh->tx_tbl[matcher->group];
>  		else
> -			tbl = &priv->rx_tbl[matcher->group];
> +			tbl = &sh->rx_tbl[matcher->group];
>  		flow_dv_tbl_resource_release(tbl);
>  		rte_free(matcher);
>  		DRV_LOG(DEBUG, "port %u matcher %p: removed",
> --
> 1.8.3.1