net/ixgbe: support VF MAC address add/remove

[dpdk.git] / drivers / net / mlx5 / mlx5_flow.c

diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index b488b67..cb9d265 100644 (file)
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -364,7 +364,15 @@ mlx5_flow_get_reg_id(struct rte_eth_dev *dev,
        case MLX5_METADATA_TX:
                return REG_A;
        case MLX5_METADATA_FDB:
-               return REG_C_0;
+               switch (config->dv_xmeta_en) {
+               case MLX5_XMETA_MODE_LEGACY:
+                       return REG_NONE;
+               case MLX5_XMETA_MODE_META16:
+                       return REG_C_0;
+               case MLX5_XMETA_MODE_META32:
+                       return REG_C_1;
+               }
+               break;
        case MLX5_FLOW_MARK:
                switch (config->dv_xmeta_en) {
                case MLX5_XMETA_MODE_LEGACY:
@@ -1142,6 +1150,18 @@ mlx5_flow_validate_action_rss(const struct rte_flow_action *action,
                                          &rss->types,
                                          "some RSS protocols are not"
                                          " supported");
+       if ((rss->types & (ETH_RSS_L3_SRC_ONLY | ETH_RSS_L3_DST_ONLY)) &&
+           !(rss->types & ETH_RSS_IP))
+               return rte_flow_error_set(error, EINVAL,
+                                         RTE_FLOW_ERROR_TYPE_ACTION_CONF, NULL,
+                                         "L3 partial RSS requested but L3 RSS"
+                                         " type not specified");
+       if ((rss->types & (ETH_RSS_L4_SRC_ONLY | ETH_RSS_L4_DST_ONLY)) &&
+           !(rss->types & (ETH_RSS_UDP | ETH_RSS_TCP)))
+               return rte_flow_error_set(error, EINVAL,
+                                         RTE_FLOW_ERROR_TYPE_ACTION_CONF, NULL,
+                                         "L4 partial RSS requested but L4 RSS"
+                                         " type not specified");
        if (!priv->rxqs_n)
                return rte_flow_error_set(error, EINVAL,
                                          RTE_FLOW_ERROR_TYPE_ACTION_CONF,
@@ -1990,8 +2010,8 @@ mlx5_flow_validate_item_gre_key(const struct rte_flow_item *item,
        const rte_be32_t *mask = item->mask;
        int ret = 0;
        rte_be32_t gre_key_default_mask = RTE_BE32(UINT32_MAX);
-       const struct rte_flow_item_gre *gre_spec = gre_item->spec;
-       const struct rte_flow_item_gre *gre_mask = gre_item->mask;
+       const struct rte_flow_item_gre *gre_spec;
+       const struct rte_flow_item_gre *gre_mask;
 
        if (item_flags & MLX5_FLOW_LAYER_GRE_KEY)
                return rte_flow_error_set(error, ENOTSUP,
@@ -2005,8 +2025,10 @@ mlx5_flow_validate_item_gre_key(const struct rte_flow_item *item,
                return rte_flow_error_set(error, ENOTSUP,
                                          RTE_FLOW_ERROR_TYPE_ITEM, item,
                                          "GRE key following a wrong item");
+       gre_mask = gre_item->mask;
        if (!gre_mask)
                gre_mask = &rte_flow_item_gre_mask;
+       gre_spec = gre_item->spec;
        if (gre_spec && (gre_mask->c_rsvd0_ver & RTE_BE16(0x2000)) &&
                         !(gre_spec->c_rsvd0_ver & RTE_BE16(0x2000)))
                return rte_flow_error_set(error, EINVAL,
@@ -2937,16 +2959,16 @@ flow_mreg_add_copy_action(struct rte_eth_dev *dev, uint32_t mark_id,
        mcp_res = (void *)mlx5_hlist_lookup(priv->mreg_cp_tbl, mark_id);
        if (mcp_res) {
                /* For non-default rule. */
-               if (mark_id)
+               if (mark_id != MLX5_DEFAULT_COPY_ID)
                        mcp_res->refcnt++;
-               assert(mark_id || mcp_res->refcnt == 1);
+               assert(mark_id != MLX5_DEFAULT_COPY_ID || mcp_res->refcnt == 1);
                return mcp_res;
        }
        /* Provide the full width of FLAG specific value. */
        if (mark_id == (priv->sh->dv_regc0_mask & MLX5_FLOW_MARK_DEFAULT))
                tag_spec.data = MLX5_FLOW_MARK_DEFAULT;
        /* Build a new flow. */
-       if (mark_id) {
+       if (mark_id != MLX5_DEFAULT_COPY_ID) {
                items[0] = (struct rte_flow_item){
                        .type = MLX5_RTE_FLOW_ITEM_TYPE_TAG,
                        .spec = &tag_spec,
@@ -3044,7 +3066,7 @@ flow_mreg_del_copy_action(struct rte_eth_dev *dev,
        }
        /*
         * We do not check availability of metadata registers here,
-        * because copy resources are allocated in this case.
+        * because copy resources are not allocated in this case.
         */
        if (--mcp_res->refcnt)
                return;
@@ -3123,7 +3145,8 @@ flow_mreg_del_default_copy_action(struct rte_eth_dev *dev)
        /* Check if default flow is registered. */
        if (!priv->mreg_cp_tbl)
                return;
-       mcp_res = (void *)mlx5_hlist_lookup(priv->mreg_cp_tbl, 0ULL);
+       mcp_res = (void *)mlx5_hlist_lookup(priv->mreg_cp_tbl,
+                                           MLX5_DEFAULT_COPY_ID);
        if (!mcp_res)
                return;
        assert(mcp_res->flow);
@@ -3156,7 +3179,7 @@ flow_mreg_add_default_copy_action(struct rte_eth_dev *dev,
            !mlx5_flow_ext_mreg_supported(dev) ||
            !priv->sh->dv_regc0_mask)
                return 0;
-       mcp_res = flow_mreg_add_copy_action(dev, 0, error);
+       mcp_res = flow_mreg_add_copy_action(dev, MLX5_DEFAULT_COPY_ID, error);
        if (!mcp_res)
                return -rte_errno;
        return 0;