net/mlx5: add macros for file name and path

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

diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index c317376..20ff1fb 100644 (file)
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -5280,6 +5280,11 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,
        } else {
                tunnel = NULL;
        }
+       if (tunnel && priv->representor)
+               return rte_flow_error_set(error, ENOTSUP,
+                                         RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL,
+                                         "decap not supported "
+                                         "for VF representor");
        grp_info.std_tbl_fix = tunnel_use_standard_attr_group_translate
                                (dev, tunnel, attr, items, actions);
        ret = flow_dv_validate_attributes(dev, tunnel, attr, &grp_info, error);
@@ -6230,8 +6235,9 @@ flow_dv_prepare(struct rte_eth_dev *dev,
                                   "not enough memory to create flow handle");
                return NULL;
        }
-       MLX5_ASSERT(wks->flow_idx + 1 < RTE_DIM(wks->flows));
+       MLX5_ASSERT(wks->flow_idx < RTE_DIM(wks->flows));
        dev_flow = &wks->flows[wks->flow_idx++];
+       memset(dev_flow, 0, sizeof(*dev_flow));
        dev_flow->handle = dev_handle;
        dev_flow->handle_idx = handle_idx;
        /*
@@ -6243,12 +6249,6 @@ flow_dv_prepare(struct rte_eth_dev *dev,
         */
        dev_flow->dv.value.size = MLX5_ST_SZ_BYTES(fte_match_param) -
                                  MLX5_ST_SZ_BYTES(fte_match_set_misc4);
-       /*
-        * The matching value needs to be cleared to 0 before using. In the
-        * past, it will be automatically cleared when using rte_*alloc
-        * API. The time consumption will be almost the same as before.
-        */
-       memset(dev_flow->dv.value.buf, 0, MLX5_ST_SZ_BYTES(fte_match_param));
        dev_flow->ingress = attr->ingress;
        dev_flow->dv.transfer = attr->transfer;
        return dev_flow;
@@ -11117,11 +11117,11 @@ flow_dv_sample_remove_cb(struct mlx5_cache_list *list __rte_unused,
        struct mlx5_priv *priv = dev->data->dev_private;
 
        if (cache_resource->verbs_action)
-               claim_zero(mlx5_glue->destroy_flow_action
+               claim_zero(mlx5_flow_os_destroy_flow_action
                                (cache_resource->verbs_action));
        if (cache_resource->ft_type == MLX5DV_FLOW_TABLE_TYPE_FDB) {
                if (cache_resource->default_miss)
-                       claim_zero(mlx5_glue->destroy_flow_action
+                       claim_zero(mlx5_flow_os_destroy_flow_action
                          (cache_resource->default_miss));
        }
        if (cache_resource->normal_path_tbl)
@@ -11174,7 +11174,7 @@ flow_dv_dest_array_remove_cb(struct mlx5_cache_list *list __rte_unused,
 
        MLX5_ASSERT(cache_resource->action);
        if (cache_resource->action)
-               claim_zero(mlx5_glue->destroy_flow_action
+               claim_zero(mlx5_flow_os_destroy_flow_action
                                        (cache_resource->action));
        for (; i < cache_resource->num_of_dest; i++)
                flow_dv_sample_sub_actions_release(dev,