* [PATCH net-next 0/2] net: sched: sch_api: fix coding style issues for extack
@ 2017-12-04 23:39 Alexander Aring
2017-12-04 23:39 ` [PATCH net-next 1/2] net: sched: sch_api: fix code style issues Alexander Aring
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Alexander Aring @ 2017-12-04 23:39 UTC (permalink / raw
To: davem; +Cc: jhs, xiyou.wangcong, jiri, netdev, Alexander Aring, David Ahern
Hi,
this patch prepares to handle extack for qdiscs and fixes checkpatch
issues.
There are a bunch of warnings issued by checkpatch which bothered me.
This first patchset is to get rid of those warnings to make way for
the next patchsets.
I plan to followup with qdiscs, classifiers and actions after this.
- Alex
Cc: David Ahern <dsahern@gmail.com>
Alexander Aring (2):
net: sched: sch_api: fix code style issues
net: sched: sch_api: rearrange init handling
include/net/sch_generic.h | 10 +++--
net/sched/sch_api.c | 97 +++++++++++++++++++++++++----------------------
2 files changed, 58 insertions(+), 49 deletions(-)
--
2.11.0
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH net-next 1/2] net: sched: sch_api: fix code style issues
2017-12-04 23:39 [PATCH net-next 0/2] net: sched: sch_api: fix coding style issues for extack Alexander Aring
@ 2017-12-04 23:39 ` Alexander Aring
2017-12-05 12:29 ` Jamal Hadi Salim
2017-12-04 23:40 ` [PATCH net-next 2/2] net: sched: sch_api: rearrange init handling Alexander Aring
2017-12-05 20:04 ` [PATCH net-next 0/2] net: sched: sch_api: fix coding style issues for extack David Miller
2 siblings, 1 reply; 6+ messages in thread
From: Alexander Aring @ 2017-12-04 23:39 UTC (permalink / raw
To: davem; +Cc: jhs, xiyou.wangcong, jiri, netdev, Alexander Aring, David Ahern
This patch fix checkpatch issues for upcomming patches according to the
sched api file. It changes checking on null pointer, remove unnecessary
brackets, add variable names for parameters and adjust 80 char width.
Cc: David Ahern <dsahern@gmail.com>
Signed-off-by: Alexander Aring <aring@mojatatu.com>
---
include/net/sch_generic.h | 10 ++++++----
net/sched/sch_api.c | 11 ++++++-----
2 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h
index 65d0d25f2648..d842bebef771 100644
--- a/include/net/sch_generic.h
+++ b/include/net/sch_generic.h
@@ -161,7 +161,8 @@ struct Qdisc_class_ops {
void (*walk)(struct Qdisc *, struct qdisc_walker * arg);
/* Filter manipulation */
- struct tcf_block * (*tcf_block)(struct Qdisc *, unsigned long);
+ struct tcf_block * (*tcf_block)(struct Qdisc *sch,
+ unsigned long arg);
unsigned long (*bind_tcf)(struct Qdisc *, unsigned long,
u32 classid);
void (*unbind_tcf)(struct Qdisc *, unsigned long);
@@ -185,11 +186,12 @@ struct Qdisc_ops {
struct sk_buff * (*dequeue)(struct Qdisc *);
struct sk_buff * (*peek)(struct Qdisc *);
- int (*init)(struct Qdisc *, struct nlattr *arg);
+ int (*init)(struct Qdisc *sch, struct nlattr *arg);
void (*reset)(struct Qdisc *);
void (*destroy)(struct Qdisc *);
- int (*change)(struct Qdisc *, struct nlattr *arg);
- void (*attach)(struct Qdisc *);
+ int (*change)(struct Qdisc *sch,
+ struct nlattr *arg);
+ void (*attach)(struct Qdisc *sch);
int (*dump)(struct Qdisc *, struct sk_buff *);
int (*dump_stats)(struct Qdisc *, struct gnet_dump *);
diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c
index b6c4f536876b..8f7f5378cc33 100644
--- a/net/sched/sch_api.c
+++ b/net/sched/sch_api.c
@@ -1020,7 +1020,7 @@ static struct Qdisc *qdisc_create(struct net_device *dev,
#endif
err = -ENOENT;
- if (ops == NULL)
+ if (!ops)
goto err_out;
sch = qdisc_alloc(dev_queue, ops);
@@ -1087,7 +1087,7 @@ static struct Qdisc *qdisc_create(struct net_device *dev,
if (sch->flags & TCQ_F_MQROOT)
goto err_out4;
- if ((sch->parent != TC_H_ROOT) &&
+ if (sch->parent != TC_H_ROOT &&
!(sch->flags & TCQ_F_INGRESS) &&
(!p || !(p->flags & TCQ_F_MQROOT)))
running = qdisc_root_sleeping_running(sch);
@@ -1139,7 +1139,7 @@ static int qdisc_change(struct Qdisc *sch, struct nlattr **tca)
int err = 0;
if (tca[TCA_OPTIONS]) {
- if (sch->ops->change == NULL)
+ if (!sch->ops->change)
return -EINVAL;
err = sch->ops->change(sch, tca[TCA_OPTIONS]);
if (err)
@@ -1344,7 +1344,8 @@ static int tc_modify_qdisc(struct sk_buff *skb, struct nlmsghdr *n,
goto create_n_graft;
if (n->nlmsg_flags & NLM_F_EXCL)
return -EEXIST;
- if (tca[TCA_KIND] && nla_strcmp(tca[TCA_KIND], q->ops->id))
+ if (tca[TCA_KIND] &&
+ nla_strcmp(tca[TCA_KIND], q->ops->id))
return -EINVAL;
if (q == p ||
(p && check_loop(q, p, 0)))
@@ -1389,7 +1390,7 @@ static int tc_modify_qdisc(struct sk_buff *skb, struct nlmsghdr *n,
}
/* Change qdisc parameters */
- if (q == NULL)
+ if (!q)
return -ENOENT;
if (n->nlmsg_flags & NLM_F_EXCL)
return -EEXIST;
--
2.11.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH net-next 2/2] net: sched: sch_api: rearrange init handling
2017-12-04 23:39 [PATCH net-next 0/2] net: sched: sch_api: fix coding style issues for extack Alexander Aring
2017-12-04 23:39 ` [PATCH net-next 1/2] net: sched: sch_api: fix code style issues Alexander Aring
@ 2017-12-04 23:40 ` Alexander Aring
2017-12-05 12:30 ` Jamal Hadi Salim
2017-12-05 20:04 ` [PATCH net-next 0/2] net: sched: sch_api: fix coding style issues for extack David Miller
2 siblings, 1 reply; 6+ messages in thread
From: Alexander Aring @ 2017-12-04 23:40 UTC (permalink / raw
To: davem; +Cc: jhs, xiyou.wangcong, jiri, netdev, Alexander Aring, David Ahern
This patch fixes the following checkpatch error:
ERROR: do not use assignment in if condition
by rearranging the if condition to execute init callback only if init
callback exists. The whole setup afterwards is called in any case,
doesn't matter if init callback is set or not. This patch has the same
behaviour as before, just without assign err variable in if condition.
It also makes the code easier to read.
Reviewed-by: Jamal Hadi Salim <jhs@mojatatu.com>
Cc: David Ahern <dsahern@gmail.com>
Signed-off-by: Alexander Aring <aring@mojatatu.com>
---
net/sched/sch_api.c | 88 ++++++++++++++++++++++++++++-------------------------
1 file changed, 47 insertions(+), 41 deletions(-)
diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c
index 8f7f5378cc33..a48ca41b7ecf 100644
--- a/net/sched/sch_api.c
+++ b/net/sched/sch_api.c
@@ -1060,54 +1060,60 @@ static struct Qdisc *qdisc_create(struct net_device *dev,
netdev_info(dev, "Caught tx_queue_len zero misconfig\n");
}
- if (!ops->init || (err = ops->init(sch, tca[TCA_OPTIONS])) == 0) {
- if (qdisc_is_percpu_stats(sch)) {
- sch->cpu_bstats =
- netdev_alloc_pcpu_stats(struct gnet_stats_basic_cpu);
- if (!sch->cpu_bstats)
- goto err_out4;
-
- sch->cpu_qstats = alloc_percpu(struct gnet_stats_queue);
- if (!sch->cpu_qstats)
- goto err_out4;
- }
+ if (ops->init) {
+ err = ops->init(sch, tca[TCA_OPTIONS]);
+ if (err != 0)
+ goto err_out5;
+ }
- if (tca[TCA_STAB]) {
- stab = qdisc_get_stab(tca[TCA_STAB]);
- if (IS_ERR(stab)) {
- err = PTR_ERR(stab);
- goto err_out4;
- }
- rcu_assign_pointer(sch->stab, stab);
- }
- if (tca[TCA_RATE]) {
- seqcount_t *running;
+ if (qdisc_is_percpu_stats(sch)) {
+ sch->cpu_bstats =
+ netdev_alloc_pcpu_stats(struct gnet_stats_basic_cpu);
+ if (!sch->cpu_bstats)
+ goto err_out4;
- err = -EOPNOTSUPP;
- if (sch->flags & TCQ_F_MQROOT)
- goto err_out4;
+ sch->cpu_qstats = alloc_percpu(struct gnet_stats_queue);
+ if (!sch->cpu_qstats)
+ goto err_out4;
+ }
- if (sch->parent != TC_H_ROOT &&
- !(sch->flags & TCQ_F_INGRESS) &&
- (!p || !(p->flags & TCQ_F_MQROOT)))
- running = qdisc_root_sleeping_running(sch);
- else
- running = &sch->running;
-
- err = gen_new_estimator(&sch->bstats,
- sch->cpu_bstats,
- &sch->rate_est,
- NULL,
- running,
- tca[TCA_RATE]);
- if (err)
- goto err_out4;
+ if (tca[TCA_STAB]) {
+ stab = qdisc_get_stab(tca[TCA_STAB]);
+ if (IS_ERR(stab)) {
+ err = PTR_ERR(stab);
+ goto err_out4;
}
+ rcu_assign_pointer(sch->stab, stab);
+ }
+ if (tca[TCA_RATE]) {
+ seqcount_t *running;
- qdisc_hash_add(sch, false);
+ err = -EOPNOTSUPP;
+ if (sch->flags & TCQ_F_MQROOT)
+ goto err_out4;
- return sch;
+ if (sch->parent != TC_H_ROOT &&
+ !(sch->flags & TCQ_F_INGRESS) &&
+ (!p || !(p->flags & TCQ_F_MQROOT)))
+ running = qdisc_root_sleeping_running(sch);
+ else
+ running = &sch->running;
+
+ err = gen_new_estimator(&sch->bstats,
+ sch->cpu_bstats,
+ &sch->rate_est,
+ NULL,
+ running,
+ tca[TCA_RATE]);
+ if (err)
+ goto err_out4;
}
+
+ qdisc_hash_add(sch, false);
+
+ return sch;
+
+err_out5:
/* ops->init() failed, we call ->destroy() like qdisc_create_dflt() */
if (ops->destroy)
ops->destroy(sch);
--
2.11.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH net-next 1/2] net: sched: sch_api: fix code style issues
2017-12-04 23:39 ` [PATCH net-next 1/2] net: sched: sch_api: fix code style issues Alexander Aring
@ 2017-12-05 12:29 ` Jamal Hadi Salim
0 siblings, 0 replies; 6+ messages in thread
From: Jamal Hadi Salim @ 2017-12-05 12:29 UTC (permalink / raw
To: Alexander Aring, davem; +Cc: xiyou.wangcong, jiri, netdev, David Ahern
On 17-12-04 06:39 PM, Alexander Aring wrote:
> This patch fix checkpatch issues for upcomming patches according to the
> sched api file. It changes checking on null pointer, remove unnecessary
> brackets, add variable names for parameters and adjust 80 char width.
>
> Cc: David Ahern <dsahern@gmail.com>
> Signed-off-by: Alexander Aring <aring@mojatatu.com>
Acked-by: Jamal Hadi Salim <jhs@mojatatu.com>
cheers,
jamal
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH net-next 2/2] net: sched: sch_api: rearrange init handling
2017-12-04 23:40 ` [PATCH net-next 2/2] net: sched: sch_api: rearrange init handling Alexander Aring
@ 2017-12-05 12:30 ` Jamal Hadi Salim
0 siblings, 0 replies; 6+ messages in thread
From: Jamal Hadi Salim @ 2017-12-05 12:30 UTC (permalink / raw
To: Alexander Aring, davem; +Cc: xiyou.wangcong, jiri, netdev, David Ahern
On 17-12-04 06:40 PM, Alexander Aring wrote:
> This patch fixes the following checkpatch error:
>
> ERROR: do not use assignment in if condition
>
> by rearranging the if condition to execute init callback only if init
> callback exists. The whole setup afterwards is called in any case,
> doesn't matter if init callback is set or not. This patch has the same
> behaviour as before, just without assign err variable in if condition.
> It also makes the code easier to read.
>
> Reviewed-by: Jamal Hadi Salim <jhs@mojatatu.com>
> Cc: David Ahern <dsahern@gmail.com>
> Signed-off-by: Alexander Aring <aring@mojatatu.com>
Acked-by: Jamal Hadi Salim <jhs@mojatatu.com>
cheers,
jamal
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH net-next 0/2] net: sched: sch_api: fix coding style issues for extack
2017-12-04 23:39 [PATCH net-next 0/2] net: sched: sch_api: fix coding style issues for extack Alexander Aring
2017-12-04 23:39 ` [PATCH net-next 1/2] net: sched: sch_api: fix code style issues Alexander Aring
2017-12-04 23:40 ` [PATCH net-next 2/2] net: sched: sch_api: rearrange init handling Alexander Aring
@ 2017-12-05 20:04 ` David Miller
2 siblings, 0 replies; 6+ messages in thread
From: David Miller @ 2017-12-05 20:04 UTC (permalink / raw
To: aring; +Cc: jhs, xiyou.wangcong, jiri, netdev, dsahern
From: Alexander Aring <aring@mojatatu.com>
Date: Mon, 4 Dec 2017 18:39:58 -0500
> this patch prepares to handle extack for qdiscs and fixes checkpatch
> issues.
>
> There are a bunch of warnings issued by checkpatch which bothered me.
> This first patchset is to get rid of those warnings to make way for
> the next patchsets.
>
> I plan to followup with qdiscs, classifiers and actions after this.
Series applied.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-12-05 20:04 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-12-04 23:39 [PATCH net-next 0/2] net: sched: sch_api: fix coding style issues for extack Alexander Aring
2017-12-04 23:39 ` [PATCH net-next 1/2] net: sched: sch_api: fix code style issues Alexander Aring
2017-12-05 12:29 ` Jamal Hadi Salim
2017-12-04 23:40 ` [PATCH net-next 2/2] net: sched: sch_api: rearrange init handling Alexander Aring
2017-12-05 12:30 ` Jamal Hadi Salim
2017-12-05 20:04 ` [PATCH net-next 0/2] net: sched: sch_api: fix coding style issues for extack David Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.