From patchwork Mon Dec 4 23:39:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Aring X-Patchwork-Id: 844505 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=mojatatu-com.20150623.gappssmtp.com header.i=@mojatatu-com.20150623.gappssmtp.com header.b="wz8xrbeM"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yrLwk0Vwtz9s0g for ; Tue, 5 Dec 2017 10:40:54 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751598AbdLDXkw (ORCPT ); Mon, 4 Dec 2017 18:40:52 -0500 Received: from mail-it0-f67.google.com ([209.85.214.67]:41393 "EHLO mail-it0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752080AbdLDXkr (ORCPT ); Mon, 4 Dec 2017 18:40:47 -0500 Received: by mail-it0-f67.google.com with SMTP id x28so17145851ita.0 for ; Mon, 04 Dec 2017 15:40:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mojatatu-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=GQ+IFBbXCGDzEClBXhiqPmifmnl2svSglvGrgFAfo0A=; b=wz8xrbeMjUTqTz093EypSB4wYn0OMan2jRURKWbA4m+cKxjaf120QXOQTANvCw2Z56 naMfJ1+HbuE2miLlkoGsyZYj0u/oVuXUDiFcXxY6EWuX4XYwNqllmvSj8jkYw6wmwXOs UVOwzG7zrpv9SKvkHAFFfT7HGTyDs6/QR3aae1Z1JgOECIC+CrODXKsvX8/lVP0r8CcG cbcpnpbR5pypbvRuMyzYr/JxrvYOwN2NA1jW+JUXgTQLC7/dywAVVKZorT+V0Kvs1tRk Zy/iQc7yS3RULeqEgXQn0k506r9sV73m4z84Z3yDC1VXgx3qURm6StGCEcgyJQPS7Ncg p38A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=GQ+IFBbXCGDzEClBXhiqPmifmnl2svSglvGrgFAfo0A=; b=Zk0SaLBC8VIYSs8HFXxn40526VDcRrqj6GhSp0rGJh1uzG/dwEVL7O2KcAjg96MwNl XNHA8lfHsQHA0DHJq0WYTrU3DpJTgdBNnhB4QZ/QrBy/xxqh7d+OFncGbf92/mwaPYuo 1YX+6xNZSELCj61jSxy++q9u8IugYCEjAMAHx0TBXSyBRXK37dP0lPGoIk67ZADMUXT6 9JtgIFVuDFvmFZ4Xbmzlli9JeSV6rv6tLJdqT611jHNPUCaxMJcfmfviSyvDFdAB2nWG QMIzVRR4Ed/2ZIgdpGKDv0G/GidO9mmEK9Vkl08qRBLU2s4WIooR2nSWk3cUbuakTLj+ y8gw== X-Gm-Message-State: AJaThX4LZlkRobL7x2GuAR6c7imNufEoeC9U5Imz+RG3gxP5dFVR2ulu moAF1MMg6cpb8gmGGun24Jfg4A== X-Google-Smtp-Source: AGs4zMY8XToT8FMh5BQLgxpBUlX7j1ol45ktu0e8HPcFQc1E2LZ0g6kZPbSj4hfaYLcnlL2rEQ0BJw== X-Received: by 10.36.181.82 with SMTP id j18mr16161719iti.18.1512430846923; Mon, 04 Dec 2017 15:40:46 -0800 (PST) Received: from x220t.lan ([64.26.149.125]) by smtp.gmail.com with ESMTPSA id q6sm4738304ita.38.2017.12.04.15.40.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Dec 2017 15:40:46 -0800 (PST) From: Alexander Aring To: davem@davemloft.net Cc: jhs@mojatatu.com, xiyou.wangcong@gmail.com, jiri@resnulli.us, netdev@vger.kernel.org, Alexander Aring , David Ahern Subject: [PATCH net-next 1/2] net: sched: sch_api: fix code style issues Date: Mon, 4 Dec 2017 18:39:59 -0500 Message-Id: <20171204234000.20756-2-aring@mojatatu.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171204234000.20756-1-aring@mojatatu.com> References: <20171204234000.20756-1-aring@mojatatu.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 Signed-off-by: Alexander Aring Acked-by: Jamal Hadi Salim --- 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; From patchwork Mon Dec 4 23:40:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Aring X-Patchwork-Id: 844506 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=mojatatu-com.20150623.gappssmtp.com header.i=@mojatatu-com.20150623.gappssmtp.com header.b="KlGV4Y7x"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yrLwm3f29z9s0g for ; Tue, 5 Dec 2017 10:40:56 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752160AbdLDXky (ORCPT ); Mon, 4 Dec 2017 18:40:54 -0500 Received: from mail-it0-f68.google.com ([209.85.214.68]:40854 "EHLO mail-it0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751200AbdLDXks (ORCPT ); Mon, 4 Dec 2017 18:40:48 -0500 Received: by mail-it0-f68.google.com with SMTP id f190so10957030ita.5 for ; Mon, 04 Dec 2017 15:40:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mojatatu-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=huN2v9dFV6VfvCWeA/AtnWd8zM9y81ldy9tMPXdK/4I=; b=KlGV4Y7xr+nZgTM6C4Gmo9aYvCEukYY8X+rX7yPBxsgoKtTcLqVhKxUL7dnSOXV3RE sTzYiQBHKugMNa9Ow2CjlC4lcAiUbTaZTafnuRakzxhxxkYJO5Xm/MB3pj70bOOi+8vE cuO1ajXmcJiHvVkyvwplmQkA2Xek6Q4paxptodz0yxo3lvrIrSOKhjQzeSm/TrGvnsM8 qPKEPodHDO5jeJ7USpfd+MQ6NzqfhgTRpONnHEg2a5nk5mxTpwJnYVbawS1D1zT54Zly nAG5a+I7cMsO6gOk3mIIAvxgIhhG0c/pqCHU86DIEXz+NG0KySYtQDz1oSil8VvMQoZk D49A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=huN2v9dFV6VfvCWeA/AtnWd8zM9y81ldy9tMPXdK/4I=; b=RMLRBQZqVEloXZXihVTiT0DLAAM3iIjePlmRZEA3EMakcfMC372p6pgVzibsqlBqNZ zB8j2dQ7YM3xlhQXLMGJCk73ppa2+H+wse3ndq65evm1QsNuKgs62NZ8KnHXg9aMfX+1 ZrmQ5wAu1bcu1smfEF3je5FK0bOD2Ds7BMn1DCg8x0/umCcPN9AbE9JcQkmY5/8gBvrx 4ftx+Iu7/vE1c9BrayEhmNHIdQxyvZn8AHkUFAV77sP438J53Vi4v24Th9eDKSqUaXep QtUg6h5+sC4H1z6ewxD/ZHDSGraUk2U0MNGvK+4xNPpycciGWMuNY1NTer4b2ZRX1isQ dUyg== X-Gm-Message-State: AJaThX6U30HWfSpT2XaIGWAyVYQ9D1KsXanqyl1nCqy2yqDlEcL/3KE2 Bbb3klxnXvuQYEO0kwBcsKtg5g== X-Google-Smtp-Source: AGs4zMZziZuErnGYWTCrNIp/0I65+7Pvp4Rge/BL/J9PiN0b5DnVUnuP4Ew0F8umNJDPyPPwiFIc0Q== X-Received: by 10.107.46.159 with SMTP id u31mr26424112iou.2.1512430847824; Mon, 04 Dec 2017 15:40:47 -0800 (PST) Received: from x220t.lan ([64.26.149.125]) by smtp.gmail.com with ESMTPSA id q6sm4738304ita.38.2017.12.04.15.40.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Dec 2017 15:40:47 -0800 (PST) From: Alexander Aring To: davem@davemloft.net Cc: jhs@mojatatu.com, xiyou.wangcong@gmail.com, jiri@resnulli.us, netdev@vger.kernel.org, Alexander Aring , David Ahern Subject: [PATCH net-next 2/2] net: sched: sch_api: rearrange init handling Date: Mon, 4 Dec 2017 18:40:00 -0500 Message-Id: <20171204234000.20756-3-aring@mojatatu.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171204234000.20756-1-aring@mojatatu.com> References: <20171204234000.20756-1-aring@mojatatu.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 Cc: David Ahern Signed-off-by: Alexander Aring Acked-by: Jamal Hadi Salim --- 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);