Return unsupported error message when application tries to
modify flex item field.
Validation of packet modifications actions for SW Steering checked
if either source or destination field of MODIFY_FIELD action
was a flex item.
When DEC_TTL action is used, DEC_TTL action does not have any
action configuration and dereferencing source or destination field
is invalid, so validation of source and destination field types
should be moved to MODIFY_FIELD specific validation function, then
field types are validated if and only if action type is MODIFY_FIELD.
Signed-off-by: Dariusz Sosnowski <dsosnow...@nvidia.com>
Signed-off-by: Rongwei Liu <rongw...@nvidia.com>
Acked-by: Viacheslav Ovsiienko <viachesl...@nvidia.com>
---
drivers/net/mlx5/mlx5_flow_dv.c | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index 92a5914d4b..a7c0d5bf17 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -4828,6 +4828,7 @@ flow_dv_validate_action_modify_hdr(const uint64_t
action_flags,
return rte_flow_error_set(error, EINVAL,
RTE_FLOW_ERROR_TYPE_ACTION_CONF,
NULL, "action configuration not set");
+
if (action_flags & MLX5_FLOW_ACTION_ENCAP)
return rte_flow_error_set(error, EINVAL,
RTE_FLOW_ERROR_TYPE_ACTION, NULL,
@@ -5153,17 +5154,21 @@ flow_dv_validate_action_modify_field(struct rte_eth_dev
*dev,
struct mlx5_hca_attr *hca_attr = &priv->sh->cdev->config.hca_attr;
const struct rte_flow_action_modify_field *action_modify_field =
action->conf;
- uint32_t dst_width = mlx5_flow_item_field_width(dev,
- action_modify_field->dst.field,
- -1, attr, error);
- uint32_t src_width = mlx5_flow_item_field_width(dev,
- action_modify_field->src.field,
- dst_width, attr, error);
+ uint32_t dst_width, src_width;
ret = flow_dv_validate_action_modify_hdr(action_flags, action, error);
if (ret)
return ret;
-
+ if (action_modify_field->src.field == RTE_FLOW_FIELD_FLEX_ITEM ||
+ action_modify_field->dst.field == RTE_FLOW_FIELD_FLEX_ITEM)
+ return rte_flow_error_set(error, ENOTSUP,
+ RTE_FLOW_ERROR_TYPE_ACTION, action,
+ "flex item fields modification"
+ " is not supported");
+ dst_width = mlx5_flow_item_field_width(dev,
action_modify_field->dst.field,
+ -1, attr, error);
+ src_width = mlx5_flow_item_field_width(dev,
action_modify_field->src.field,
+ dst_width, attr, error);
if (action_modify_field->width == 0)
return rte_flow_error_set(error, EINVAL,
RTE_FLOW_ERROR_TYPE_ACTION, action,
--
2.27.0
