Skip to content

Commit

Permalink
net: qede: use extack in qede_parse_flow_attr()
Browse files Browse the repository at this point in the history
Convert qede_parse_flow_attr() to take extack,
and drop the edev argument.

Convert DP_NOTICE calls to use NL_SET_ERR_MSG_* instead.

Pass extack in calls to qede_flow_parse_{tcp,udp}_v{4,6}().

In calls to qede_parse_flow_attr(), if extack is
unavailable, then use NULL for now, until a
subsequent patch makes extack available.

Only compile tested.

Signed-off-by: Asbjørn Sloth Tønnesen <ast@fiberby.net>
Reviewed-by: Simon Horman <horms@kernel.org>
Link: https://lore.kernel.org/r/20240508143404.95901-12-ast@fiberby.net
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  • Loading branch information
Asbjørn Sloth Tønnesen authored and Jakub Kicinski committed May 11, 2024
1 parent f833a65 commit d6883bc
Showing 1 changed file with 14 additions and 12 deletions.
26 changes: 14 additions & 12 deletions drivers/net/ethernet/qlogic/qede/qede_filter.c
Original file line number Diff line number Diff line change
Expand Up @@ -1826,8 +1826,9 @@ qede_flow_parse_udp_v4(struct flow_rule *rule, struct qede_arfs_tuple *tuple,
}

static int
qede_parse_flow_attr(struct qede_dev *edev, __be16 proto,
struct flow_rule *rule, struct qede_arfs_tuple *tuple)
qede_parse_flow_attr(__be16 proto, struct flow_rule *rule,
struct qede_arfs_tuple *tuple,
struct netlink_ext_ack *extack)
{
struct flow_dissector *dissector = rule->match.dissector;
int rc = -EINVAL;
Expand All @@ -1841,14 +1842,15 @@ qede_parse_flow_attr(struct qede_dev *edev, __be16 proto,
BIT_ULL(FLOW_DISSECTOR_KEY_BASIC) |
BIT_ULL(FLOW_DISSECTOR_KEY_IPV6_ADDRS) |
BIT_ULL(FLOW_DISSECTOR_KEY_PORTS))) {
DP_NOTICE(edev, "Unsupported key set:0x%llx\n",
dissector->used_keys);
NL_SET_ERR_MSG_FMT_MOD(extack, "Unsupported key used: 0x%llx",
dissector->used_keys);
return -EOPNOTSUPP;
}

if (proto != htons(ETH_P_IP) &&
proto != htons(ETH_P_IPV6)) {
DP_NOTICE(edev, "Unsupported proto=0x%x\n", proto);
NL_SET_ERR_MSG_FMT_MOD(extack, "Unsupported proto=0x%x",
proto);
return -EPROTONOSUPPORT;
}

Expand All @@ -1860,15 +1862,15 @@ qede_parse_flow_attr(struct qede_dev *edev, __be16 proto,
}

if (ip_proto == IPPROTO_TCP && proto == htons(ETH_P_IP))
rc = qede_flow_parse_tcp_v4(rule, tuple, NULL);
rc = qede_flow_parse_tcp_v4(rule, tuple, extack);
else if (ip_proto == IPPROTO_TCP && proto == htons(ETH_P_IPV6))
rc = qede_flow_parse_tcp_v6(rule, tuple, NULL);
rc = qede_flow_parse_tcp_v6(rule, tuple, extack);
else if (ip_proto == IPPROTO_UDP && proto == htons(ETH_P_IP))
rc = qede_flow_parse_udp_v4(rule, tuple, NULL);
rc = qede_flow_parse_udp_v4(rule, tuple, extack);
else if (ip_proto == IPPROTO_UDP && proto == htons(ETH_P_IPV6))
rc = qede_flow_parse_udp_v6(rule, tuple, NULL);
rc = qede_flow_parse_udp_v6(rule, tuple, extack);
else
DP_NOTICE(edev, "Invalid protocol request\n");
NL_SET_ERR_MSG_MOD(extack, "Invalid protocol request");

return rc;
}
Expand All @@ -1889,7 +1891,7 @@ int qede_add_tc_flower_fltr(struct qede_dev *edev, __be16 proto,
}

/* parse flower attribute and prepare filter */
rc = qede_parse_flow_attr(edev, proto, f->rule, &t);
rc = qede_parse_flow_attr(proto, f->rule, &t, extack);
if (rc)
goto unlock;

Expand Down Expand Up @@ -2015,7 +2017,7 @@ static int qede_flow_spec_to_rule(struct qede_dev *edev,
if (IS_ERR(flow))
return PTR_ERR(flow);

err = qede_parse_flow_attr(edev, proto, flow->rule, t);
err = qede_parse_flow_attr(proto, flow->rule, t, NULL);
if (err)
goto err_out;

Expand Down

0 comments on commit d6883bc

Please sign in to comment.