From: Jakub Kicinski <kuba@kernel•org>
To: Pedro Tammela <pctammela@mojatatu•com>
Cc: netdev@vger•kernel.org, jhs@mojatatu•com,
xiyou.wangcong@gmail•com, jiri@resnulli•us, davem@davemloft•net,
edumazet@google•com, pabeni@redhat•com, shuah@kernel•org,
victor@mojatatu•com
Subject: Re: [PATCH net-next v2 4/4] net/sched: cls_route: make netlink errors meaningful
Date: Mon, 28 Aug 2023 12:52:59 -0700 [thread overview]
Message-ID: <20230828125259.13361cbb@kernel.org> (raw)
In-Reply-To: <20230825155148.659895-5-pctammela@mojatatu.com>
On Fri, 25 Aug 2023 12:51:48 -0300 Pedro Tammela wrote:
> Use netlink extended ack and parsing policies to return more meaningful
> errors instead of the relying solely on errnos.
Hm, I don't see the changes to the policy, or anything meaningful
in the existing one.
> diff --git a/net/sched/cls_route.c b/net/sched/cls_route.c
> index 1e20bbd687f1..b34cf02c6c51 100644
> --- a/net/sched/cls_route.c
> +++ b/net/sched/cls_route.c
> @@ -400,30 +400,32 @@ static int route4_set_parms(struct net *net, struct tcf_proto *tp,
> if (new && handle & 0x8000)
> return -EINVAL;
> to = nla_get_u32(tb[TCA_ROUTE4_TO]);
> - if (to > 0xFF)
> - return -EINVAL;
> nhandle = to;
> }
>
> + if (tb[TCA_ROUTE4_FROM] && tb[TCA_ROUTE4_IIF]) {
> + NL_SET_ERR_MSG(extack,
> + "'from' and 'fromif' are mutually exclusive");
Let's point at one of them? NL_SET_ERR_MSG_ATTR() ?
> + return -EINVAL;
> + }
> +
> if (tb[TCA_ROUTE4_FROM]) {
> - if (tb[TCA_ROUTE4_IIF])
> - return -EINVAL;
> id = nla_get_u32(tb[TCA_ROUTE4_FROM]);
> - if (id > 0xFF)
> - return -EINVAL;
> nhandle |= id << 16;
> } else if (tb[TCA_ROUTE4_IIF]) {
> id = nla_get_u32(tb[TCA_ROUTE4_IIF]);
> - if (id > 0x7FFF)
> - return -EINVAL;
> nhandle |= (id | 0x8000) << 16;
> } else
> nhandle |= 0xFFFF << 16;
>
> if (handle && new) {
> nhandle |= handle & 0x7F00;
> - if (nhandle != handle)
> + if (nhandle != handle) {
> + NL_SET_ERR_MSG_FMT(extack,
> + "Unexpected handle %x (expected %x)",
> + handle, nhandle);
How about: Handle mismatch constructed: %x (expected: %x)?
> return -EINVAL;
> + }
> }
>
> if (!nhandle) {
> @@ -478,7 +480,6 @@ static int route4_change(struct net *net, struct sk_buff *in_skb,
> struct route4_filter __rcu **fp;
> struct route4_filter *fold, *f1, *pfp, *f = NULL;
> struct route4_bucket *b;
> - struct nlattr *opt = tca[TCA_OPTIONS];
> struct nlattr *tb[TCA_ROUTE4_MAX + 1];
> unsigned int h, th;
> int err;
> @@ -489,10 +490,12 @@ static int route4_change(struct net *net, struct sk_buff *in_skb,
> return -EINVAL;
> }
>
> - if (opt == NULL)
> + if (NL_REQ_ATTR_CHECK(extack, NULL, tca, TCA_OPTIONS)) {
> + NL_SET_ERR_MSG_MOD(extack, "missing options");
> return -EINVAL;
> + }
>
> - err = nla_parse_nested_deprecated(tb, TCA_ROUTE4_MAX, opt,
> + err = nla_parse_nested_deprecated(tb, TCA_ROUTE4_MAX, tca[TCA_OPTIONS],
> route4_policy, NULL);
> if (err < 0)
> return err;
--
pw-bot: cr
next prev parent reply other threads:[~2023-08-28 19:53 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-25 15:51 [PATCH net-next v2 0/4] selftests/tc-testing: add tests covering classid Pedro Tammela
2023-08-25 15:51 ` [PATCH net-next v2 1/4] selftests/tc-testing: cls_fw: add tests for classid Pedro Tammela
2023-08-25 15:51 ` [PATCH net-next v2 2/4] selftest/tc-testing: cls_route: " Pedro Tammela
2023-08-25 15:51 ` [PATCH net-next v2 3/4] selftest/tc-testing: cls_u32: " Pedro Tammela
2023-08-25 15:51 ` [PATCH net-next v2 4/4] net/sched: cls_route: make netlink errors meaningful Pedro Tammela
2023-08-28 19:52 ` Jakub Kicinski [this message]
2023-08-25 21:03 ` [PATCH net-next v2 0/4] selftests/tc-testing: add tests covering classid Victor Nogueira
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=20230828125259.13361cbb@kernel.org \
--to=kuba@kernel$(echo .)org \
--cc=davem@davemloft$(echo .)net \
--cc=edumazet@google$(echo .)com \
--cc=jhs@mojatatu$(echo .)com \
--cc=jiri@resnulli$(echo .)us \
--cc=netdev@vger$(echo .)kernel.org \
--cc=pabeni@redhat$(echo .)com \
--cc=pctammela@mojatatu$(echo .)com \
--cc=shuah@kernel$(echo .)org \
--cc=victor@mojatatu$(echo .)com \
--cc=xiyou.wangcong@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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