The new member "tag_index" was added into the structure
"rte_flow_action_modify_data". It is the index of the header inside
encapsulation level. Both the "RTE_FLOW_FIELD_TAG" and
"MLX5_RTE_FLOW_FIELD_META_REG" types will use this member instead
of the "level", but the "level" will still be supported for the
compatibility.
In the validation stage, not only the "RTE_FLOW_FIELD_TAG" type, but
also the "MLX5_RTE_FLOW_FIELD_META_REG" needs to be checked.
In the meanwhile, lowering down the log priority will help to
prevent the flooding.
Fixes: 68c513e861ca ("net/mlx5: align implementation with modify API")
Cc: michae...@nvidia.com
Signed-off-by: Bing Zhao <bi...@nvidia.com>
Acked-by: Ori Kam <or...@nvidia.com>
---
drivers/net/mlx5/mlx5_flow.c | 5 +++--
drivers/net/mlx5/mlx5_flow.h | 7 ++++---
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index cf83db7b60..97211fc209 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -2411,7 +2411,8 @@ flow_validate_modify_field_level(const struct
rte_flow_action_modify_data *data,
{
if (data->level == 0)
return 0;
- if (data->field != RTE_FLOW_FIELD_TAG)
+ if (data->field != RTE_FLOW_FIELD_TAG &&
+ data->field != (enum rte_flow_field_id)MLX5_RTE_FLOW_FIELD_META_REG)
return rte_flow_error_set(error, ENOTSUP,
RTE_FLOW_ERROR_TYPE_ACTION, NULL,
"inner header fields modification is
not supported");
@@ -2424,7 +2425,7 @@ flow_validate_modify_field_level(const struct
rte_flow_action_modify_data *data,
* 'tag_index' field. In old API, it was provided using 'level' field
* and it is still supported for backwards compatibility.
*/
- DRV_LOG(WARNING, "tag array provided in 'level' field instead of
'tag_index' field.");
+ DRV_LOG(DEBUG, "tag array provided in 'level' field instead of
'tag_index' field.");
return 0;
}
diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h
index 003e7da3a6..d6e88425a3 100644
--- a/drivers/net/mlx5/mlx5_flow.h
+++ b/drivers/net/mlx5/mlx5_flow.h
@@ -52,8 +52,8 @@ enum mlx5_rte_flow_action_type {
/* Private (internal) Field IDs for MODIFY_FIELD action. */
enum mlx5_rte_flow_field_id {
- MLX5_RTE_FLOW_FIELD_END = INT_MIN,
- MLX5_RTE_FLOW_FIELD_META_REG,
+ MLX5_RTE_FLOW_FIELD_END = INT_MIN,
+ MLX5_RTE_FLOW_FIELD_META_REG,
};
#define MLX5_INDIRECT_ACTION_TYPE_OFFSET 29
@@ -1117,9 +1117,10 @@ flow_dv_fetch_field(const uint8_t *data, uint32_t size)
static inline bool
flow_modify_field_support_tag_array(enum rte_flow_field_id field)
{
- switch (field) {
+ switch ((int)field) {
case RTE_FLOW_FIELD_TAG:
case RTE_FLOW_FIELD_MPLS:
+ case MLX5_RTE_FLOW_FIELD_META_REG:
return true;
default:
break;
--
2.34.1
