Skip to content

Commit

Permalink
net/mlx5: fix validation for conntrack indirect action
Browse files Browse the repository at this point in the history
[ upstream commit a9156d685fa1b8927f68606c69521c5eae3184a2 ]

After rte_flow_shared_action_* API was replaced with
rte_flow_action_handle_* API, one input parameter of the update
interface was also changed. A generic pointer was used instead of the
"const struct rte_flow_action *" pointer.

In the entrance of mlx5 PMD callback for update, the validation is
called for all indirect actions. But for conntrack type, the pointer
is no longer with rte_flow_action pointer type and it will cause an
incorrect casting and error.

The content for updating should only be validated when needed. It
should skip the validation in the entrance. Right now, the content
was already added before updating the hardware by WQE. So the type
of the indirect action should be checked before calling the action
validate function.

When creating a new conntrack object, the validation is still needed
since all the content will be used to update the hardware context.

Fixes: 4b61b87 ("ethdev: introduce indirect flow action")

Signed-off-by: Bing Zhao <bingz@nvidia.com>
Acked-by: Ori Kam <orika@nvidia.com>
  • Loading branch information
zorrohahaha authored and kevintraynor committed Jul 21, 2023
1 parent 2788848 commit d0af29e
Showing 1 changed file with 11 additions and 2 deletions.
13 changes: 11 additions & 2 deletions drivers/net/mlx5/mlx5_flow.c
Original file line number Diff line number Diff line change
Expand Up @@ -8955,9 +8955,18 @@ mlx5_action_handle_update(struct rte_eth_dev *dev,
const struct mlx5_flow_driver_ops *fops =
flow_get_drv_ops(flow_get_drv_type(dev, &attr));
int ret;
uint32_t act_idx = (uint32_t)(uintptr_t)handle;
uint32_t type = act_idx >> MLX5_INDIRECT_ACTION_TYPE_OFFSET;

ret = flow_drv_action_validate(dev, NULL,
(const struct rte_flow_action *)update, fops, error);
switch (type) {
case MLX5_INDIRECT_ACTION_TYPE_CT:
ret = 0;
break;
default:
ret = flow_drv_action_validate(dev, NULL,
(const struct rte_flow_action *)update,
fops, error);
}
if (ret)
return ret;
return flow_drv_action_update(dev, handle, update, fops,
Expand Down

0 comments on commit d0af29e

Please sign in to comment.