| Message ID | 20240503105505.839342-2-ast@fiberby.net (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 146817ec32095abb8655dadc413fbfc3016e4da4 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | net: qede: don't restrict error codes | expand |
On Fri, May 03, 2024 at 10:55:01AM +0000, Asbjørn Sloth Tønnesen wrote: > 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 319a1d19471e ("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>
diff --git a/drivers/net/ethernet/qlogic/qede/qede_filter.c b/drivers/net/ethernet/qlogic/qede/qede_filter.c index cb6b33a228ea..d5ca4bf6dba5 100644 --- a/drivers/net/ethernet/qlogic/qede/qede_filter.c +++ b/drivers/net/ethernet/qlogic/qede/qede_filter.c @@ -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; @@ -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; }
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 319a1d19471e ("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> --- drivers/net/ethernet/qlogic/qede/qede_filter.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)