From: Jiri Pirko <jiri@resnulli.us>
To: netdev@vger.kernel.org
Cc: davem@davemloft.net, jhs@mojatatu.com, xiyou.wangcong@gmail.com,
dsa@cumulusnetworks.com, edumazet@google.com,
stephen@networkplumber.org, daniel@iogearbox.net,
alexander.h.duyck@intel.com, simon.horman@netronome.com,
mlxsw@mellanox.com
Subject: [patch net-next v3 04/10] net: sched: replace nprio by a bool to make the function more readable
Date: Tue, 16 May 2017 19:27:56 +0200 [thread overview]
Message-ID: <20170516172802.1317-5-jiri@resnulli.us> (raw)
In-Reply-To: <20170516172802.1317-1-jiri@resnulli.us>
From: Jiri Pirko <jiri@mellanox.com>
The use of "nprio" variable in tc_ctl_tfilter is a bit cryptic and makes
a reader wonder what is going on for a while. So help him to understand
this priority allocation dance a litte bit better.
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
---
net/sched/cls_api.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c
index 88ec1a1..0e49e6e 100644
--- a/net/sched/cls_api.c
+++ b/net/sched/cls_api.c
@@ -271,7 +271,7 @@ static int tc_ctl_tfilter(struct sk_buff *skb, struct nlmsghdr *n,
struct tcmsg *t;
u32 protocol;
u32 prio;
- u32 nprio;
+ bool prio_allocate;
u32 parent;
struct net_device *dev;
struct Qdisc *q;
@@ -300,7 +300,7 @@ static int tc_ctl_tfilter(struct sk_buff *skb, struct nlmsghdr *n,
t = nlmsg_data(n);
protocol = TC_H_MIN(t->tcm_info);
prio = TC_H_MAJ(t->tcm_info);
- nprio = prio;
+ prio_allocate = false;
parent = t->tcm_parent;
cl = 0;
@@ -316,6 +316,7 @@ static int tc_ctl_tfilter(struct sk_buff *skb, struct nlmsghdr *n,
*/
if (n->nlmsg_flags & NLM_F_CREATE) {
prio = TC_H_MAKE(0x80000000U, 0U);
+ prio_allocate = true;
break;
}
/* fall-through */
@@ -377,7 +378,7 @@ static int tc_ctl_tfilter(struct sk_buff *skb, struct nlmsghdr *n,
back = &tp->next) {
if (tp->prio >= prio) {
if (tp->prio == prio) {
- if (!nprio ||
+ if (prio_allocate ||
(tp->protocol != protocol && protocol)) {
err = -EINVAL;
goto errout;
@@ -403,11 +404,11 @@ static int tc_ctl_tfilter(struct sk_buff *skb, struct nlmsghdr *n,
goto errout;
}
- if (!nprio)
- nprio = TC_H_MAJ(tcf_auto_prio(rtnl_dereference(*back)));
+ if (prio_allocate)
+ prio = TC_H_MAJ(tcf_auto_prio(rtnl_dereference(*back)));
tp = tcf_proto_create(nla_data(tca[TCA_KIND]),
- protocol, nprio, parent, q, block);
+ protocol, prio, parent, q, block);
if (IS_ERR(tp)) {
err = PTR_ERR(tp);
goto errout;
--
2.9.3
next prev parent reply other threads:[~2017-05-16 17:28 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-16 17:27 [patch net-next v3 00/10] net: sched: introduce multichain support for filters Jiri Pirko
2017-05-16 17:27 ` [patch net-next v3 01/10] net: sched: move tc_classify function to cls_api.c Jiri Pirko
2017-05-16 20:25 ` Cong Wang
2017-05-16 21:00 ` Jiri Pirko
2017-05-16 21:03 ` Cong Wang
2017-05-16 21:05 ` Jiri Pirko
2017-05-16 17:27 ` [patch net-next v3 02/10] net: sched: introduce tcf block infractructure Jiri Pirko
2017-05-16 20:51 ` Cong Wang
2017-05-16 20:57 ` Jiri Pirko
2017-05-16 21:34 ` David Miller
2017-05-16 22:34 ` Cong Wang
2017-05-17 5:42 ` Jiri Pirko
2017-05-16 17:27 ` [patch net-next v3 03/10] net: sched: rename tcf_destroy_chain helper Jiri Pirko
2017-05-16 17:27 ` Jiri Pirko [this message]
2017-05-16 17:27 ` [patch net-next v3 05/10] net: sched: move TC_H_MAJ macro call into tcf_auto_prio Jiri Pirko
2017-05-16 21:01 ` Cong Wang
2017-05-16 21:03 ` Jiri Pirko
2017-05-16 22:38 ` Cong Wang
2017-05-17 5:47 ` Jiri Pirko
2017-05-17 12:47 ` Jamal Hadi Salim
2017-05-17 12:53 ` Jiri Pirko
2017-05-16 17:27 ` [patch net-next v3 06/10] net: sched: introduce helpers to work with filter chains Jiri Pirko
2017-05-16 22:17 ` Cong Wang
2017-05-17 5:50 ` Jiri Pirko
2017-05-16 17:27 ` [patch net-next v3 07/10] net: sched: push chain dump to a separate function Jiri Pirko
2017-05-16 17:28 ` [patch net-next v3 08/10] net: sched: introduce multichain support for filters Jiri Pirko
2017-05-16 17:28 ` [patch net-next v3 09/10] net: sched: push tp down to action init Jiri Pirko
2017-05-16 17:28 ` [patch net-next v3 10/10] net: sched: add termination action to allow goto chain Jiri Pirko
2017-05-16 17:29 ` [patch iproute2 v2 repost 1/3] tc_filter: add support for chain index Jiri Pirko
2017-05-16 18:16 ` Stephen Hemminger
2017-05-16 19:47 ` Jiri Pirko
2017-05-22 20:33 ` Stephen Hemminger
2017-05-23 13:40 ` Jiri Pirko
2017-05-26 19:48 ` Daniel Borkmann
2017-05-27 0:11 ` Stephen Hemminger
2017-05-27 0:24 ` Daniel Borkmann
2017-05-16 17:29 ` [patch iproute2 v2 repost 2/3] tc: actions: add helpers to parse and print control actions Jiri Pirko
2017-06-14 18:32 ` Jiri Benc
2017-06-14 19:18 ` Jiri Pirko
2017-06-14 19:28 ` Jiri Benc
2017-06-14 20:10 ` Jiri Pirko
2017-05-16 17:29 ` [patch iproute2 v2 repost 3/3] tc/actions: introduce support for goto chain action Jiri Pirko
2017-05-31 12:27 ` Jiri Benc
2017-06-02 8:15 ` Jiri Pirko
2017-06-02 8:22 ` Jiri Benc
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=20170516172802.1317-5-jiri@resnulli.us \
--to=jiri@resnulli.us \
--cc=alexander.h.duyck@intel.com \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=dsa@cumulusnetworks.com \
--cc=edumazet@google.com \
--cc=jhs@mojatatu.com \
--cc=mlxsw@mellanox.com \
--cc=netdev@vger.kernel.org \
--cc=simon.horman@netronome.com \
--cc=stephen@networkplumber.org \
--cc=xiyou.wangcong@gmail.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).