net/mlx5: adjust shared register according to mask

The metadata register reg_c[0] might be used by kernel or
firmware for their internal purposes. The actual used mask
can be queried from the kernel. The remaining bits can be
used by PMD to provide META or MARK feature. The code queries
the mask of reg_c[0] and adjust the resource usage dynamically.

Signed-off-by: Viacheslav Ovsiienko <viacheslavo@mellanox.com>
Acked-by: Matan Azrad <matan@mellanox.com>

diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
index 4cbe6c5..1f1ce7a 100644 (file)
--- a/drivers/net/mlx5/mlx5.c
+++ b/drivers/net/mlx5/mlx5.c
@@ -1583,6 +1583,60 @@ exit:
        DRV_LOG(DEBUG, "min tx inline configured: %d", config->txq_inline_min);
 }
 
+/**
+ * Configures the metadata mask fields in the shared context.
+ *
+ * @param [in] dev
+ *   Pointer to Ethernet device.
+ */
+static void
+mlx5_set_metadata_mask(struct rte_eth_dev *dev)
+{
+       struct mlx5_priv *priv = dev->data->dev_private;
+       struct mlx5_ibv_shared *sh = priv->sh;
+       uint32_t meta, mark, reg_c0;
+
+       reg_c0 = ~priv->vport_meta_mask;
+       switch (priv->config.dv_xmeta_en) {
+       case MLX5_XMETA_MODE_LEGACY:
+               meta = UINT32_MAX;
+               mark = MLX5_FLOW_MARK_MASK;
+               break;
+       case MLX5_XMETA_MODE_META16:
+               meta = reg_c0 >> rte_bsf32(reg_c0);
+               mark = MLX5_FLOW_MARK_MASK;
+               break;
+       case MLX5_XMETA_MODE_META32:
+               meta = UINT32_MAX;
+               mark = (reg_c0 >> rte_bsf32(reg_c0)) & MLX5_FLOW_MARK_MASK;
+               break;
+       default:
+               meta = 0;
+               mark = 0;
+               assert(false);
+               break;
+       }
+       if (sh->dv_mark_mask && sh->dv_mark_mask != mark)
+               DRV_LOG(WARNING, "metadata MARK mask mismatche %08X:%08X",
+                                sh->dv_mark_mask, mark);
+       else
+               sh->dv_mark_mask = mark;
+       if (sh->dv_meta_mask && sh->dv_meta_mask != meta)
+               DRV_LOG(WARNING, "metadata META mask mismatche %08X:%08X",
+                                sh->dv_meta_mask, meta);
+       else
+               sh->dv_meta_mask = meta;
+       if (sh->dv_regc0_mask && sh->dv_regc0_mask != reg_c0)
+               DRV_LOG(WARNING, "metadata reg_c0 mask mismatche %08X:%08X",
+                                sh->dv_meta_mask, reg_c0);
+       else
+               sh->dv_regc0_mask = reg_c0;
+       DRV_LOG(DEBUG, "metadata mode %u", priv->config.dv_xmeta_en);
+       DRV_LOG(DEBUG, "metadata MARK mask %08X", sh->dv_mark_mask);
+       DRV_LOG(DEBUG, "metadata META mask %08X", sh->dv_meta_mask);
+       DRV_LOG(DEBUG, "metadata reg_c0 mask %08X", sh->dv_regc0_mask);
+}
+
 /**
  * Allocate page of door-bells and register it using DevX API.
  *
@@ -1803,7 +1857,7 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,
        uint16_t port_id;
        unsigned int i;
 #ifdef HAVE_MLX5DV_DR_DEVX_PORT
-       struct mlx5dv_devx_port devx_port;
+       struct mlx5dv_devx_port devx_port = { .comp_mask = 0 };
 #endif
 
        /* Determine if this port representor is supposed to be spawned. */
@@ -2035,13 +2089,17 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,
         * vport index. The engaged part of metadata register is
         * defined by mask.
         */
-       devx_port.comp_mask = MLX5DV_DEVX_PORT_VPORT |
-                             MLX5DV_DEVX_PORT_MATCH_REG_C_0;
-       err = mlx5_glue->devx_port_query(sh->ctx, spawn->ibv_port, &devx_port);
-       if (err) {
-               DRV_LOG(WARNING, "can't query devx port %d on device %s",
-                       spawn->ibv_port, spawn->ibv_dev->name);
-               devx_port.comp_mask = 0;
+       if (switch_info->representor || switch_info->master) {
+               devx_port.comp_mask = MLX5DV_DEVX_PORT_VPORT |
+                                     MLX5DV_DEVX_PORT_MATCH_REG_C_0;
+               err = mlx5_glue->devx_port_query(sh->ctx, spawn->ibv_port,
+                                                &devx_port);
+               if (err) {
+                       DRV_LOG(WARNING,
+                               "can't query devx port %d on device %s",
+                               spawn->ibv_port, spawn->ibv_dev->name);
+                       devx_port.comp_mask = 0;
+               }
        }
        if (devx_port.comp_mask & MLX5DV_DEVX_PORT_MATCH_REG_C_0) {
                priv->vport_meta_tag = devx_port.reg_c_0.value;
@@ -2361,18 +2419,27 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,
                goto error;
        }
        priv->config.flow_prio = err;
-       /* Query availibility of metadata reg_c's. */
-       err = mlx5_flow_discover_mreg_c(eth_dev);
-       if (err < 0) {
-               err = -err;
-               goto error;
-       }
        if (!priv->config.dv_esw_en &&
            priv->config.dv_xmeta_en != MLX5_XMETA_MODE_LEGACY) {
                DRV_LOG(WARNING, "metadata mode %u is not supported "
                                 "(no E-Switch)", priv->config.dv_xmeta_en);
                priv->config.dv_xmeta_en = MLX5_XMETA_MODE_LEGACY;
        }
+       mlx5_set_metadata_mask(eth_dev);
+       if (priv->config.dv_xmeta_en != MLX5_XMETA_MODE_LEGACY &&
+           !priv->sh->dv_regc0_mask) {
+               DRV_LOG(ERR, "metadata mode %u is not supported "
+                            "(no metadata reg_c[0] is available)",
+                            priv->config.dv_xmeta_en);
+                       err = ENOTSUP;
+                       goto error;
+       }
+       /* Query availibility of metadata reg_c's. */
+       err = mlx5_flow_discover_mreg_c(eth_dev);
+       if (err < 0) {
+               err = -err;
+               goto error;
+       }
        if (!mlx5_flow_ext_mreg_supported(eth_dev)) {
                DRV_LOG(DEBUG,
                        "port %u extensive metadata register is not supported",

diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h
index fec51d9..1baaae1 100644 (file)
--- a/drivers/net/mlx5/mlx5.h
+++ b/drivers/net/mlx5/mlx5.h
@@ -624,6 +624,9 @@ struct mlx5_ibv_shared {
        } mr;
        /* Shared DV/DR flow data section. */
        pthread_mutex_t dv_mutex; /* DV context mutex. */
+       uint32_t dv_meta_mask; /* flow META metadata supported mask. */
+       uint32_t dv_mark_mask; /* flow MARK metadata supported mask. */
+       uint32_t dv_regc0_mask; /* available bits of metatada reg_c[0]. */
        uint32_t dv_refcnt; /* DV/DR data reference counter. */
        void *fdb_domain; /* FDB Direct Rules name space handle. */
        struct mlx5_flow_tbl_resource fdb_tbl[MLX5_MAX_TABLES_FDB];

diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index 1c9f5f7..98161d3 100644 (file)
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -901,13 +901,13 @@ flow_dv_convert_action_set_reg
  *   0 on success, a negative errno value otherwise and rte_errno is set.
  */
 static int
-flow_dv_convert_action_copy_mreg(struct rte_eth_dev *dev  __rte_unused,
+flow_dv_convert_action_copy_mreg(struct rte_eth_dev *dev,
                                 struct mlx5_flow_dv_modify_hdr_resource *res,
                                 const struct rte_flow_action *action,
                                 struct rte_flow_error *error)
 {
        const struct mlx5_flow_action_copy_mreg *conf = action->conf;
-       uint32_t mask = RTE_BE32(UINT32_MAX);
+       rte_be32_t mask = RTE_BE32(UINT32_MAX);
        struct rte_flow_item item = {
                .spec = NULL,
                .mask = &mask,
@@ -917,9 +917,44 @@ flow_dv_convert_action_copy_mreg(struct rte_eth_dev *dev  __rte_unused,
                {0, 0, 0},
        };
        struct field_modify_info reg_dst = {
-               .offset = (uint32_t)-1, /* Same as src. */
+               .offset = 0,
                .id = reg_to_field[conf->dst],
        };
+       /* Adjust reg_c[0] usage according to reported mask. */
+       if (conf->dst == REG_C_0 || conf->src == REG_C_0) {
+               struct mlx5_priv *priv = dev->data->dev_private;
+               uint32_t reg_c0 = priv->sh->dv_regc0_mask;
+
+               assert(reg_c0);
+               assert(priv->config.dv_xmeta_en != MLX5_XMETA_MODE_LEGACY);
+               if (conf->dst == REG_C_0) {
+                       /* Copy to reg_c[0], within mask only. */
+                       reg_dst.offset = rte_bsf32(reg_c0);
+                       /*
+                        * Mask is ignoring the enianness, because
+                        * there is no conversion in datapath.
+                        */
+#if RTE_BYTE_ORDER == RTE_BIG_ENDIAN
+                       /* Copy from destination lower bits to reg_c[0]. */
+                       mask = reg_c0 >> reg_dst.offset;
+#else
+                       /* Copy from destination upper bits to reg_c[0]. */
+                       mask = reg_c0 << (sizeof(reg_c0) * CHAR_BIT -
+                                         rte_fls_u32(reg_c0));
+#endif
+               } else {
+                       mask = rte_cpu_to_be_32(reg_c0);
+#if RTE_BYTE_ORDER == RTE_BIG_ENDIAN
+                       /* Copy from reg_c[0] to destination lower bits. */
+                       reg_dst.offset = 0;
+#else
+                       /* Copy from reg_c[0] to destination upper bits. */
+                       reg_dst.offset = sizeof(reg_c0) * CHAR_BIT -
+                                        (rte_fls_u32(reg_c0) -
+                                         rte_bsf32(reg_c0));
+#endif
+               }
+       }
        return flow_dv_convert_modify_action(&item,
                                             reg_src, &reg_dst, res,
                                             MLX5_MODIFICATION_TYPE_COPY,