From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mail.toke.dk; spf=pass smtp.mailfrom=; dkim=pass header.d=gmail.com; arc=none (Message is not ARC signed); dmarc=pass (Used From Domain Record) header.from=gmail.com policy.dmarc=quarantine Received: from mail-yx1-xb12b.google.com (mail-yx1-xb12b.google.com [IPv6:2607:f8b0:4864:20::b12b]) by mail.toke.dk (Postfix) with ESMTPS id 4D8969F07D6 for ; Mon, 01 Dec 2025 18:57:24 +0100 (CET) Received: by mail-yx1-xb12b.google.com with SMTP id 956f58d0204a3-640d0895d7cso5836610d50.1 for ; Mon, 01 Dec 2025 09:57:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1764611842; x=1765216642; darn=lists.bufferbloat.net; h=content-transfer-encoding:mime-version:subject:references :in-reply-to:message-id:cc:to:from:date:from:to:cc:subject:date :message-id:reply-to; bh=tkqmpx35EBVYyHz+sYsqNnuEOUKwB0sqoFFtTjdVi3U=; b=HTNQe0dZVwaBF2M6q+rePVMnUnOQ/6ouwWHrFiyUjGFHRNQi/5crZ8B/Yb65EoEtaB 0JF91mGxZuxDqP35raQlJjwR0zmi+v+bDNIMo0sK8yGHv1azMJvQ4prY7fNI7KhK4+V1 fs7jlp8RvFBv89Dib5UZ7opyogdsJTXAn5vJ1qZnrE6clkP/yy7Dg1XZO6anqXcGKj1C bfvqBHgQiQkVQKwIvnWfeRs4JhEGzMZ50hDJI/GuuQAl8dEyDnhrfAzP0XKN1xnw7Gia 8WggLV7ht9XqrnfL+/RRMUiZ0n9N1jx5qpO6x2tAFwW/Cl9Bu/gUDm4XgjDIElxLuwaR MBtw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764611842; x=1765216642; h=content-transfer-encoding:mime-version:subject:references :in-reply-to:message-id:cc:to:from:date:x-gm-gg:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=tkqmpx35EBVYyHz+sYsqNnuEOUKwB0sqoFFtTjdVi3U=; b=nBe0rG6UC4B0eZu7G3kk9yJd+yVzXtIaMmcl1M/TBMOgKW+oOZ/8qyioHf25c6/qms fpBKRX1WXvtGqE1iXbodNhEEFndEuE4cdbwCb9gIhbD0JUzFpzfz0sq0uDG3mRIix3kZ w2gh44rmIVXfY8b1wmfZx2skqKIqus6xj7zhe1XhbdAFDxA4AOhbaaDhSF5PY2WBL/Ck F/Dyg7ACg2ebZ59y1Rnn4BzLsG+BlunsZPpmhuwOiDGIbO16GuR5BfYh1IjLfiAgxnzp umK+IdHRXTCUCu/sQaOlCDIPEUPg7/51/09twwPwMkNG0AuvDaIxjvOFVJYFqGEeJjBR 5Ddg== X-Forwarded-Encrypted: i=1; AJvYcCVZYJmZjKecopb4Ms9I5vBGBrfdPmg4DvCm19193Y9lRHbzyqSch7U6aRhawnewlFC7Ymue@lists.bufferbloat.net X-Gm-Message-State: AOJu0YxD6YXkHCJB6/oSY+xJaPXnp9TUAHSojar+9NqYAZeLy4yVLP+A a8ZLCp3ot0/8HdfmtIFEPnFVv85e2xs1zzqi8+hl7R7E4HVjyzYtfrl4 X-Gm-Gg: ASbGncvVYy174VKNtmK6tSVRR9LlzLvfw14E6gP70GOfdx+7zXsY0H2OSHbMELq8MYA SIjmI3O+ubrUdKt7VwTwRB45Bu9t9QLj6VbfoY2NM2h5SGl8XuJWkpFd5xZKMgMKCZWk20b0d7w r/9Tk9AwJzfXPbHm+zVjeDVUxXFFk3QmV68cmd4iZkSmjkJ2qhisoDCJIGn3YTvoPLh3VCz5AfJ 1w0yziJ9tbAoNXL0VUVWL9TWwR4bmE+BSWuWHDsz5Vu2LXKSTe6atXOGaGxos+d6zE9wyMHs/eF ajYicr1WulXVwWylTRcLUqOf/6H8+/bcd5h2892SuRrNI8kzuPQoViIrL/oZoLlCmyAJs8TIgAC k8AGmvPuKxMogOelb5hSd420ifIJp9Y9TDFKzN4c7s0m6r0cit/g+uczPocdi82xufHPlnwrObO YuCKmjIXNuur8LU0ak74GWak8v6OZT2Ti23yplnDFUIrT+xk6HapByAb9BSWjwErqje3s= X-Google-Smtp-Source: AGHT+IHtwRV3z+eEprkjPN1JlQVtx9G4JjRCbnGZDpI5VxqHcgiCtPJziT1NzvZ10SNonlVHTRvkuA== X-Received: by 2002:a05:690e:429c:10b0:63f:96d7:a369 with SMTP id 956f58d0204a3-643026257f4mr28216730d50.28.1764611841786; Mon, 01 Dec 2025 09:57:21 -0800 (PST) Received: from gmail.com (116.235.236.35.bc.googleusercontent.com. [35.236.235.116]) by smtp.gmail.com with UTF8SMTPSA id 956f58d0204a3-6433bf5f366sm5191475d50.0.2025.12.01.09.57.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Dec 2025 09:57:20 -0800 (PST) Date: Mon, 01 Dec 2025 12:57:20 -0500 From: Willem de Bruijn To: =?UTF-8?B?VG9rZSBIw7hpbGFuZC1Kw7hyZ2Vuc2Vu?= , =?UTF-8?B?VG9rZSBIw7hpbGFuZC1Kw7hyZ2Vuc2Vu?= , Jamal Hadi Salim , Cong Wang , Jiri Pirko , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman Cc: =?UTF-8?B?Sm9uYXMgS8O2cHBlbGVy?= , cake@lists.bufferbloat.net, netdev@vger.kernel.org, =?UTF-8?B?VG9rZSBIw7hpbGFuZC1Kw7hyZ2Vuc2Vu?= Message-ID: In-Reply-To: <20251130-mq-cake-sub-qdisc-v3-1-5f66c548ecdc@redhat.com> References: <20251130-mq-cake-sub-qdisc-v3-0-5f66c548ecdc@redhat.com> <20251130-mq-cake-sub-qdisc-v3-1-5f66c548ecdc@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-MailFrom: willemdebruijn.kernel@gmail.com X-Mailman-Rule-Hits: nonmember-moderation X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation Message-ID-Hash: XCW54LY2QLEREKM4GTBUEHTWV5D4M3PY X-Message-ID-Hash: XCW54LY2QLEREKM4GTBUEHTWV5D4M3PY X-Mailman-Approved-At: Tue, 02 Dec 2025 13:37:01 +0100 X-Mailman-Version: 3.3.10 Precedence: list Subject: [Cake] Re: [PATCH net-next v3 1/5] net/sched: Export mq functions for reuse List-Id: Cake - FQ_codel the next generation Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Toke H=C3=B8iland-J=C3=B8rgensen wrote: > To enable the cake_mq qdisc to reuse code from the mq qdisc, export a > bunch of functions from sch_mq. Split common functionality out from som= e > functions so it can be composed with other code, and export other > functions wholesale. > = > No functional change intended. > = > Signed-off-by: Toke H=C3=B8iland-J=C3=B8rgensen > --- > include/net/sch_generic.h | 19 +++++++++++++ > net/sched/sch_mq.c | 69 ++++++++++++++++++++++++++++++++-------= -------- > 2 files changed, 67 insertions(+), 21 deletions(-) > = > diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h > index c3a7268b567e..f2281914d962 100644 > --- a/include/net/sch_generic.h > +++ b/include/net/sch_generic.h We probably want to avoid random users. This may be better suited to a local header, similar to net/core/devmem.h. I don't mean to derail this feature if these are the only concerns. This can be revised later in -rcX too. > @@ -1419,7 +1419,26 @@ void mini_qdisc_pair_init(struct mini_Qdisc_pair= *miniqp, struct Qdisc *qdisc, > void mini_qdisc_pair_block_init(struct mini_Qdisc_pair *miniqp, > struct tcf_block *block); > = > +struct mq_sched { > + struct Qdisc **qdiscs; > +}; > + > +int mq_init_common(struct Qdisc *sch, struct nlattr *opt, > + struct netlink_ext_ack *extack, > + const struct Qdisc_ops *qdisc_ops); > +void mq_destroy_common(struct Qdisc *sch); > +void mq_attach(struct Qdisc *sch); > void mq_change_real_num_tx(struct Qdisc *sch, unsigned int new_real_tx= ); > +void mq_dump_common(struct Qdisc *sch, struct sk_buff *skb); > +struct netdev_queue *mq_select_queue(struct Qdisc *sch, > + struct tcmsg *tcm); > +struct Qdisc *mq_leaf(struct Qdisc *sch, unsigned long cl); > +unsigned long mq_find(struct Qdisc *sch, u32 classid); > +int mq_dump_class(struct Qdisc *sch, unsigned long cl, > + struct sk_buff *skb, struct tcmsg *tcm); > +int mq_dump_class_stats(struct Qdisc *sch, unsigned long cl, > + struct gnet_dump *d); > +void mq_walk(struct Qdisc *sch, struct qdisc_walker *arg); > = > int sch_frag_xmit_hook(struct sk_buff *skb, int (*xmit)(struct sk_buff= *skb)); > = > diff --git a/net/sched/sch_mq.c b/net/sched/sch_mq.c > index c860119a8f09..0bcabdcd1f44 100644 > --- a/net/sched/sch_mq.c > +++ b/net/sched/sch_mq.c > @@ -17,10 +17,6 @@ > #include > #include > = > -struct mq_sched { > - struct Qdisc **qdiscs; > -}; > - > static int mq_offload(struct Qdisc *sch, enum tc_mq_command cmd) > { > struct net_device *dev =3D qdisc_dev(sch); > @@ -49,23 +45,29 @@ static int mq_offload_stats(struct Qdisc *sch) > return qdisc_offload_dump_helper(sch, TC_SETUP_QDISC_MQ, &opt); > } > = > -static void mq_destroy(struct Qdisc *sch) > +void mq_destroy_common(struct Qdisc *sch) > { > struct net_device *dev =3D qdisc_dev(sch); > struct mq_sched *priv =3D qdisc_priv(sch); > unsigned int ntx; > = > - mq_offload(sch, TC_MQ_DESTROY); > - > if (!priv->qdiscs) > return; > for (ntx =3D 0; ntx < dev->num_tx_queues && priv->qdiscs[ntx]; ntx++)= > qdisc_put(priv->qdiscs[ntx]); > kfree(priv->qdiscs); > } > +EXPORT_SYMBOL(mq_destroy_common); On a similar note, this would be a good use of EXPORT_SYMBOL_NS_GPL. Maybe not even NETDEV_INTERNAL but a dedicated NET_SCHED_MQ. > -static int mq_init(struct Qdisc *sch, struct nlattr *opt, > - struct netlink_ext_ack *extack) > +static void mq_destroy(struct Qdisc *sch) > +{ > + mq_offload(sch, TC_MQ_DESTROY); > + mq_destroy_common(sch); > +} > + > +int mq_init_common(struct Qdisc *sch, struct nlattr *opt, > + struct netlink_ext_ack *extack, > + const struct Qdisc_ops *qdisc_ops) > { > struct net_device *dev =3D qdisc_dev(sch); > struct mq_sched *priv =3D qdisc_priv(sch); > @@ -87,7 +89,8 @@ static int mq_init(struct Qdisc *sch, struct nlattr *= opt, > = > for (ntx =3D 0; ntx < dev->num_tx_queues; ntx++) { > dev_queue =3D netdev_get_tx_queue(dev, ntx); > - qdisc =3D qdisc_create_dflt(dev_queue, get_default_qdisc_ops(dev, nt= x), > + qdisc =3D qdisc_create_dflt(dev_queue, > + qdisc_ops ?: get_default_qdisc_ops(dev, ntx), > TC_H_MAKE(TC_H_MAJ(sch->handle), > TC_H_MIN(ntx + 1)), > extack); > @@ -98,12 +101,24 @@ static int mq_init(struct Qdisc *sch, struct nlatt= r *opt, > } > = > sch->flags |=3D TCQ_F_MQROOT; > + return 0; > +} > +EXPORT_SYMBOL(mq_init_common); > + > +static int mq_init(struct Qdisc *sch, struct nlattr *opt, > + struct netlink_ext_ack *extack) > +{ > + int ret; > + > + ret =3D mq_init_common(sch, opt, extack, NULL); > + if (ret) > + return ret; > = > mq_offload(sch, TC_MQ_CREATE); > return 0; > } > = > -static void mq_attach(struct Qdisc *sch) > +void mq_attach(struct Qdisc *sch) > { > struct net_device *dev =3D qdisc_dev(sch); > struct mq_sched *priv =3D qdisc_priv(sch); > @@ -124,8 +139,9 @@ static void mq_attach(struct Qdisc *sch) > kfree(priv->qdiscs); > priv->qdiscs =3D NULL; > } > +EXPORT_SYMBOL(mq_attach); > = > -static int mq_dump(struct Qdisc *sch, struct sk_buff *skb) > +void mq_dump_common(struct Qdisc *sch, struct sk_buff *skb) > { > struct net_device *dev =3D qdisc_dev(sch); > struct Qdisc *qdisc; > @@ -152,7 +168,12 @@ static int mq_dump(struct Qdisc *sch, struct sk_bu= ff *skb) > = > spin_unlock_bh(qdisc_lock(qdisc)); > } > +} > +EXPORT_SYMBOL(mq_dump_common); > = > +static int mq_dump(struct Qdisc *sch, struct sk_buff *skb) > +{ > + mq_dump_common(sch, skb); > return mq_offload_stats(sch); > } > = > @@ -166,11 +187,12 @@ static struct netdev_queue *mq_queue_get(struct Q= disc *sch, unsigned long cl) > return netdev_get_tx_queue(dev, ntx); > } > = > -static struct netdev_queue *mq_select_queue(struct Qdisc *sch, > - struct tcmsg *tcm) > +struct netdev_queue *mq_select_queue(struct Qdisc *sch, > + struct tcmsg *tcm) > { > return mq_queue_get(sch, TC_H_MIN(tcm->tcm_parent)); > } > +EXPORT_SYMBOL(mq_select_queue); > = > static int mq_graft(struct Qdisc *sch, unsigned long cl, struct Qdisc = *new, > struct Qdisc **old, struct netlink_ext_ack *extack) > @@ -198,14 +220,15 @@ static int mq_graft(struct Qdisc *sch, unsigned l= ong cl, struct Qdisc *new, > return 0; > } > = > -static struct Qdisc *mq_leaf(struct Qdisc *sch, unsigned long cl) > +struct Qdisc *mq_leaf(struct Qdisc *sch, unsigned long cl) > { > struct netdev_queue *dev_queue =3D mq_queue_get(sch, cl); > = > return rtnl_dereference(dev_queue->qdisc_sleeping); > } > +EXPORT_SYMBOL(mq_leaf); > = > -static unsigned long mq_find(struct Qdisc *sch, u32 classid) > +unsigned long mq_find(struct Qdisc *sch, u32 classid) > { > unsigned int ntx =3D TC_H_MIN(classid); > = > @@ -213,9 +236,10 @@ static unsigned long mq_find(struct Qdisc *sch, u3= 2 classid) > return 0; > return ntx; > } > +EXPORT_SYMBOL(mq_find); > = > -static int mq_dump_class(struct Qdisc *sch, unsigned long cl, > - struct sk_buff *skb, struct tcmsg *tcm) > +int mq_dump_class(struct Qdisc *sch, unsigned long cl, > + struct sk_buff *skb, struct tcmsg *tcm) > { > struct netdev_queue *dev_queue =3D mq_queue_get(sch, cl); > = > @@ -224,9 +248,10 @@ static int mq_dump_class(struct Qdisc *sch, unsign= ed long cl, > tcm->tcm_info =3D rtnl_dereference(dev_queue->qdisc_sleeping)->handle= ; > return 0; > } > +EXPORT_SYMBOL(mq_dump_class); > = > -static int mq_dump_class_stats(struct Qdisc *sch, unsigned long cl, > - struct gnet_dump *d) > +int mq_dump_class_stats(struct Qdisc *sch, unsigned long cl, > + struct gnet_dump *d) > { > struct netdev_queue *dev_queue =3D mq_queue_get(sch, cl); > = > @@ -236,8 +261,9 @@ static int mq_dump_class_stats(struct Qdisc *sch, u= nsigned long cl, > return -1; > return 0; > } > +EXPORT_SYMBOL(mq_dump_class_stats); > = > -static void mq_walk(struct Qdisc *sch, struct qdisc_walker *arg) > +void mq_walk(struct Qdisc *sch, struct qdisc_walker *arg) > { > struct net_device *dev =3D qdisc_dev(sch); > unsigned int ntx; > @@ -251,6 +277,7 @@ static void mq_walk(struct Qdisc *sch, struct qdisc= _walker *arg) > break; > } > } > +EXPORT_SYMBOL(mq_walk); > = > static const struct Qdisc_class_ops mq_class_ops =3D { > .select_queue =3D mq_select_queue, > = > -- = > 2.52.0 > =