From: "Asbjørn Sloth Tønnesen" <ast@fiberby.net>
To: netdev@vger.kernel.org
Cc: "Asbjørn Sloth Tønnesen" <ast@fiberby.net>,
linux-kernel@vger.kernel.org,
"David S. Miller" <davem@davemloft.net>,
"Eric Dumazet" <edumazet@google.com>,
"Jakub Kicinski" <kuba@kernel.org>,
"Paolo Abeni" <pabeni@redhat.com>,
"Manish Chopra" <manishc@marvell.com>
Subject: [PATCH net-next 11/14] net: qede: use extack in qede_parse_flow_attr()
Date: Tue, 7 May 2024 10:44:12 +0000 [thread overview]
Message-ID: <20240507104421.1628139-12-ast@fiberby.net> (raw)
In-Reply-To: <20240507104421.1628139-1-ast@fiberby.net>
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>
---
.../net/ethernet/qlogic/qede/qede_filter.c | 23 ++++++++++---------
1 file changed, 12 insertions(+), 11 deletions(-)
diff --git a/drivers/net/ethernet/qlogic/qede/qede_filter.c b/drivers/net/ethernet/qlogic/qede/qede_filter.c
index 5b353a160d15..8734c864f324 100644
--- a/drivers/net/ethernet/qlogic/qede/qede_filter.c
+++ b/drivers/net/ethernet/qlogic/qede/qede_filter.c
@@ -1826,7 +1826,7 @@ qede_flow_parse_udp_v4(struct netlink_ext_ack *extack, struct flow_rule *rule,
}
static int
-qede_parse_flow_attr(struct qede_dev *edev, __be16 proto,
+qede_parse_flow_attr(struct netlink_ext_ack *extack, __be16 proto,
struct flow_rule *rule, struct qede_arfs_tuple *tuple)
{
struct flow_dissector *dissector = rule->match.dissector;
@@ -1841,14 +1841,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;
}
@@ -1860,15 +1861,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(NULL, rule, tuple);
+ rc = qede_flow_parse_tcp_v4(extack, rule, tuple);
else if (ip_proto == IPPROTO_TCP && proto == htons(ETH_P_IPV6))
- rc = qede_flow_parse_tcp_v6(NULL, rule, tuple);
+ rc = qede_flow_parse_tcp_v6(extack, rule, tuple);
else if (ip_proto == IPPROTO_UDP && proto == htons(ETH_P_IP))
- rc = qede_flow_parse_udp_v4(NULL, rule, tuple);
+ rc = qede_flow_parse_udp_v4(extack, rule, tuple);
else if (ip_proto == IPPROTO_UDP && proto == htons(ETH_P_IPV6))
- rc = qede_flow_parse_udp_v6(NULL, rule, tuple);
+ rc = qede_flow_parse_udp_v6(extack, rule, tuple);
else
- DP_NOTICE(edev, "Invalid protocol request\n");
+ NL_SET_ERR_MSG_MOD(extack, "Invalid protocol request");
return rc;
}
@@ -1889,7 +1890,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(extack, proto, f->rule, &t);
if (rc)
goto unlock;
@@ -2015,7 +2016,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(NULL, proto, flow->rule, t);
if (err)
goto err_out;
--
2.43.0
next prev parent reply other threads:[~2024-05-07 10:44 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-07 10:44 [PATCH net-next 00/14] net: qede: convert filter code to use extack Asbjørn Sloth Tønnesen
2024-05-07 10:44 ` [PATCH net-next 01/14] net: qede: use extack in qede_flow_parse_ports() Asbjørn Sloth Tønnesen
2024-05-08 10:07 ` Przemek Kitszel
2024-05-08 10:41 ` Asbjørn Sloth Tønnesen
2024-05-07 10:44 ` [PATCH net-next 02/14] net: qede: use extack in qede_set_v6_tuple_to_profile() Asbjørn Sloth Tønnesen
2024-05-07 10:44 ` [PATCH net-next 03/14] net: qede: use extack in qede_set_v4_tuple_to_profile() Asbjørn Sloth Tønnesen
2024-05-07 10:44 ` [PATCH net-next 04/14] net: qede: use extack in qede_flow_parse_v6_common() Asbjørn Sloth Tønnesen
2024-05-07 10:44 ` [PATCH net-next 05/14] net: qede: use extack in qede_flow_parse_v4_common() Asbjørn Sloth Tønnesen
2024-05-07 10:44 ` [PATCH net-next 06/14] net: qede: use extack in qede_flow_parse_tcp_v6() Asbjørn Sloth Tønnesen
2024-05-07 10:44 ` [PATCH net-next 07/14] net: qede: use extack in qede_flow_parse_tcp_v4() Asbjørn Sloth Tønnesen
2024-05-07 10:44 ` [PATCH net-next 08/14] net: qede: use extack in qede_flow_parse_udp_v6() Asbjørn Sloth Tønnesen
2024-05-07 10:44 ` [PATCH net-next 09/14] net: qede: use extack in qede_flow_parse_udp_v4() Asbjørn Sloth Tønnesen
2024-05-07 10:44 ` [PATCH net-next 10/14] net: qede: add extack in qede_add_tc_flower_fltr() Asbjørn Sloth Tønnesen
2024-05-07 10:44 ` Asbjørn Sloth Tønnesen [this message]
2024-05-07 10:44 ` [PATCH net-next 12/14] net: qede: use faked extack in qede_flow_spec_to_rule() Asbjørn Sloth Tønnesen
2024-05-07 10:44 ` [PATCH net-next 13/14] net: qede: propagate extack through qede_flow_spec_validate() Asbjørn Sloth Tønnesen
2024-05-07 10:44 ` [PATCH net-next 14/14] net: qede: use extack in qede_parse_actions() Asbjørn Sloth Tønnesen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240507104421.1628139-12-ast@fiberby.net \
--to=ast@fiberby.net \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=manishc@marvell.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).