Skip to content

Commit

Permalink
net: qede: use return from qede_parse_actions() for flow_spec
Browse files Browse the repository at this point in the history
In qede_flow_spec_to_rule(), when calling
qede_parse_actions() then the return code
was only used for a non-zero check, and then
-EINVAL was returned.

qede_parse_actions() can currently fail with:
* -EINVAL
* -EOPNOTSUPP

Commit 319a1d1 ("flow_offload: check for
basic action hw stats type") broke the implicit
assumption that it could only fail with -EINVAL,
by changing it to return -EOPNOTSUPP, when hardware
stats are requested.

However AFAICT it's not possible to trigger
qede_parse_actions() to return -EOPNOTSUPP, when
called from qede_flow_spec_to_rule(), as hardware
stats can't be requested by ethtool_rx_flow_rule_create().

This patch changes qede_flow_spec_to_rule() to use
the actual return code from qede_parse_actions(),
so it's no longer assumed that all errors are -EINVAL.

Only compile tested.

Signed-off-by: Asbjørn Sloth Tønnesen <ast@fiberby.net>
Reviewed-by: Simon Horman <horms@kernel.org>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
  • Loading branch information
Asbjørn Sloth Tønnesen authored and Paolo Abeni committed May 7, 2024
1 parent 179a6f5 commit 146817e
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions drivers/net/ethernet/qlogic/qede/qede_filter.c
Original file line number Diff line number Diff line change
Expand Up @@ -1943,6 +1943,8 @@ static int qede_flow_spec_validate(struct qede_dev *edev,
struct qede_arfs_tuple *t,
__u32 location)
{
int err;

if (location >= QEDE_RFS_MAX_FLTR) {
DP_INFO(edev, "Location out-of-bounds\n");
return -EINVAL;
Expand All @@ -1963,8 +1965,9 @@ static int qede_flow_spec_validate(struct qede_dev *edev,
return -EINVAL;
}

if (qede_parse_actions(edev, flow_action, NULL))
return -EINVAL;
err = qede_parse_actions(edev, flow_action, NULL);
if (err)
return err;

return 0;
}
Expand Down

0 comments on commit 146817e

Please sign in to comment.