From patchwork Tue May 19 09:13:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Antonio Quartulli X-Patchwork-Id: 219022 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, UNWANTED_LANGUAGE_BODY autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6EC2EC433DF for ; Tue, 19 May 2020 09:35:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 52FA5207D3 for ; Tue, 19 May 2020 09:35:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728440AbgESJft (ORCPT ); Tue, 19 May 2020 05:35:49 -0400 Received: from s2.neomailbox.net ([5.148.176.60]:16822 "EHLO s2.neomailbox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726859AbgESJfs (ORCPT ); Tue, 19 May 2020 05:35:48 -0400 X-Greylist: delayed 1199 seconds by postgrey-1.27 at vger.kernel.org; Tue, 19 May 2020 05:35:48 EDT From: Antonio Quartulli To: davem@davemloft.net Cc: netdev@vger.kernel.org, cake@lists.bufferbloat.net, Antonio Quartulli , =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= , Jamal Hadi Salim , Cong Wang , Jiri Pirko , Stephen Hemminger Subject: [PATCH] net/sch_generic.h: use sizeof_member() and get rid of unused variable Date: Tue, 19 May 2020 11:13:33 +0200 Message-Id: <20200519091333.20923-1-a@unstable.cc> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Compiling with -Wunused triggers the following warning: ./include/net/sch_generic.h: In function ‘qdisc_cb_private_validate’: ./include/net/sch_generic.h:464:23: warning: unused variable ‘qcb’ [-Wunused-variable] 464 | struct qdisc_skb_cb *qcb; | ^~~ as the qcb variable is only used to compute the sizeof one of its members. Get rid of the warning by using the provided sizeof_member() macro and avoid having a variable at all. At the same time use sizeof_member() also for computing the sizeof skb->cb, thus avoiding ‘qdisc_cb_private_validate’ to have an skb argument at all. Cc: Toke Høiland-Jørgensen Cc: Jamal Hadi Salim Cc: Cong Wang Cc: Jiri Pirko Cc: Stephen Hemminger Signed-off-by: Antonio Quartulli --- Affected code has been compile-tested on x86_64 include/net/codel_qdisc.h | 2 +- include/net/pie.h | 2 +- include/net/sch_generic.h | 9 ++++----- net/sched/sch_cake.c | 2 +- net/sched/sch_choke.c | 2 +- net/sched/sch_fq.c | 2 +- net/sched/sch_netem.c | 2 +- net/sched/sch_sfb.c | 2 +- 8 files changed, 11 insertions(+), 12 deletions(-) diff --git a/include/net/codel_qdisc.h b/include/net/codel_qdisc.h index 098630f83a55..c59d17de4ef3 100644 --- a/include/net/codel_qdisc.h +++ b/include/net/codel_qdisc.h @@ -57,7 +57,7 @@ struct codel_skb_cb { static struct codel_skb_cb *get_codel_cb(const struct sk_buff *skb) { - qdisc_cb_private_validate(skb, sizeof(struct codel_skb_cb)); + qdisc_cb_private_validate(sizeof(struct codel_skb_cb)); return (struct codel_skb_cb *)qdisc_skb_cb(skb)->data; } diff --git a/include/net/pie.h b/include/net/pie.h index 3fe2361e03b4..c15fe3032ad0 100644 --- a/include/net/pie.h +++ b/include/net/pie.h @@ -109,7 +109,7 @@ static inline void pie_vars_init(struct pie_vars *vars) static inline struct pie_skb_cb *get_pie_cb(const struct sk_buff *skb) { - qdisc_cb_private_validate(skb, sizeof(struct pie_skb_cb)); + qdisc_cb_private_validate(sizeof(struct pie_skb_cb)); return (struct pie_skb_cb *)qdisc_skb_cb(skb)->data; } diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h index c510b03b9751..8e1f7a0d7572 100644 --- a/include/net/sch_generic.h +++ b/include/net/sch_generic.h @@ -459,12 +459,11 @@ static inline bool lockdep_tcf_proto_is_locked(struct tcf_proto *tp) #define tcf_proto_dereference(p, tp) \ rcu_dereference_protected(p, lockdep_tcf_proto_is_locked(tp)) -static inline void qdisc_cb_private_validate(const struct sk_buff *skb, int sz) +static inline void qdisc_cb_private_validate(int sz) { - struct qdisc_skb_cb *qcb; - - BUILD_BUG_ON(sizeof(skb->cb) < offsetof(struct qdisc_skb_cb, data) + sz); - BUILD_BUG_ON(sizeof(qcb->data) < sz); + BUILD_BUG_ON(sizeof_field(struct sk_buff, cb) < + offsetof(struct qdisc_skb_cb, data) + sz); + BUILD_BUG_ON(sizeof_field(struct qdisc_skb_cb, data) < sz); } static inline int qdisc_qlen_cpu(const struct Qdisc *q) diff --git a/net/sched/sch_cake.c b/net/sched/sch_cake.c index 1496e87cd07b..2800551b7465 100644 --- a/net/sched/sch_cake.c +++ b/net/sched/sch_cake.c @@ -281,7 +281,7 @@ static u64 us_to_ns(u64 us) static struct cobalt_skb_cb *get_cobalt_cb(const struct sk_buff *skb) { - qdisc_cb_private_validate(skb, sizeof(struct cobalt_skb_cb)); + qdisc_cb_private_validate(sizeof(struct cobalt_skb_cb)); return (struct cobalt_skb_cb *)qdisc_skb_cb(skb)->data; } diff --git a/net/sched/sch_choke.c b/net/sched/sch_choke.c index bd618b00d319..6badd324df43 100644 --- a/net/sched/sch_choke.c +++ b/net/sched/sch_choke.c @@ -137,7 +137,7 @@ struct choke_skb_cb { static inline struct choke_skb_cb *choke_skb_cb(const struct sk_buff *skb) { - qdisc_cb_private_validate(skb, sizeof(struct choke_skb_cb)); + qdisc_cb_private_validate(sizeof(struct choke_skb_cb)); return (struct choke_skb_cb *)qdisc_skb_cb(skb)->data; } diff --git a/net/sched/sch_fq.c b/net/sched/sch_fq.c index 8f06a808c59a..0c2497509a3d 100644 --- a/net/sched/sch_fq.c +++ b/net/sched/sch_fq.c @@ -56,7 +56,7 @@ struct fq_skb_cb { static inline struct fq_skb_cb *fq_skb_cb(struct sk_buff *skb) { - qdisc_cb_private_validate(skb, sizeof(struct fq_skb_cb)); + qdisc_cb_private_validate(sizeof(struct fq_skb_cb)); return (struct fq_skb_cb *)qdisc_skb_cb(skb)->data; } diff --git a/net/sched/sch_netem.c b/net/sched/sch_netem.c index 84f82771cdf5..2b930d928c5c 100644 --- a/net/sched/sch_netem.c +++ b/net/sched/sch_netem.c @@ -161,7 +161,7 @@ struct netem_skb_cb { static inline struct netem_skb_cb *netem_skb_cb(struct sk_buff *skb) { /* we assume we can use skb next/prev/tstamp as storage for rb_node */ - qdisc_cb_private_validate(skb, sizeof(struct netem_skb_cb)); + qdisc_cb_private_validate(sizeof(struct netem_skb_cb)); return (struct netem_skb_cb *)qdisc_skb_cb(skb)->data; } diff --git a/net/sched/sch_sfb.c b/net/sched/sch_sfb.c index 4074c50ac3d7..ffaf145a7b05 100644 --- a/net/sched/sch_sfb.c +++ b/net/sched/sch_sfb.c @@ -91,7 +91,7 @@ struct sfb_skb_cb { static inline struct sfb_skb_cb *sfb_skb_cb(const struct sk_buff *skb) { - qdisc_cb_private_validate(skb, sizeof(struct sfb_skb_cb)); + qdisc_cb_private_validate(sizeof(struct sfb_skb_cb)); return (struct sfb_skb_cb *)qdisc_skb_cb(skb)->data; }