| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <20210917135506.1408151-1-kuba@kernel.org>
Date: Fri, 17 Sep 2021 06:55:06 -0700
From: Jakub Kicinski <kuba@...nel.org>
To: davem@...emloft.net, xiyou.wangcong@...il.com
Cc: netdev@...r.kernel.org, jhs@...atatu.com, jiri@...nulli.us,
Jakub Kicinski <kuba@...nel.org>,
Cong Wang <cong.wang@...edance.com>
Subject: [PATCH net-next] net: sched: move and reuse mq_change_real_num_tx()
The code for handling active queue changes is identical
between mq and mqprio, reuse it.
Suggested-by: Cong Wang <cong.wang@...edance.com>
Signed-off-by: Jakub Kicinski <kuba@...nel.org>
---
include/net/sch_generic.h | 2 ++
net/sched/sch_generic.c | 24 ++++++++++++++++++++++++
net/sched/sch_mq.c | 23 -----------------------
net/sched/sch_mqprio.c | 24 +-----------------------
4 files changed, 27 insertions(+), 46 deletions(-)
diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h
index 8c2d611639fc..5a011f8d394e 100644
--- a/include/net/sch_generic.h
+++ b/include/net/sch_generic.h
@@ -1345,6 +1345,8 @@ 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);
+void mq_change_real_num_tx(struct Qdisc *sch, unsigned int new_real_tx);
+
int sch_frag_xmit_hook(struct sk_buff *skb, int (*xmit)(struct sk_buff *skb));
#endif
diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c
index 66d2fbe9ef50..8c64a552a64f 100644
--- a/net/sched/sch_generic.c
+++ b/net/sched/sch_generic.c
@@ -1339,6 +1339,30 @@ void dev_qdisc_change_real_num_tx(struct net_device *dev,
qdisc->ops->change_real_num_tx(qdisc, new_real_tx);
}
+void mq_change_real_num_tx(struct Qdisc *sch, unsigned int new_real_tx)
+{
+#ifdef CONFIG_NET_SCHED
+ struct net_device *dev = qdisc_dev(sch);
+ struct Qdisc *qdisc;
+ unsigned int i;
+
+ for (i = new_real_tx; i < dev->real_num_tx_queues; i++) {
+ qdisc = netdev_get_tx_queue(dev, i)->qdisc_sleeping;
+ /* Only update the default qdiscs we created,
+ * qdiscs with handles are always hashed.
+ */
+ if (qdisc != &noop_qdisc && !qdisc->handle)
+ qdisc_hash_del(qdisc);
+ }
+ for (i = dev->real_num_tx_queues; i < new_real_tx; i++) {
+ qdisc = netdev_get_tx_queue(dev, i)->qdisc_sleeping;
+ if (qdisc != &noop_qdisc && !qdisc->handle)
+ qdisc_hash_add(qdisc, false);
+ }
+#endif
+}
+EXPORT_SYMBOL(mq_change_real_num_tx);
+
int dev_qdisc_change_tx_queue_len(struct net_device *dev)
{
bool up = dev->flags & IFF_UP;
diff --git a/net/sched/sch_mq.c b/net/sched/sch_mq.c
index db18d8a860f9..e04f1a87642b 100644
--- a/net/sched/sch_mq.c
+++ b/net/sched/sch_mq.c
@@ -125,29 +125,6 @@ static void mq_attach(struct Qdisc *sch)
priv->qdiscs = NULL;
}
-static void mq_change_real_num_tx(struct Qdisc *sch, unsigned int new_real_tx)
-{
-#ifdef CONFIG_NET_SCHED
- struct net_device *dev = qdisc_dev(sch);
- struct Qdisc *qdisc;
- unsigned int i;
-
- for (i = new_real_tx; i < dev->real_num_tx_queues; i++) {
- qdisc = netdev_get_tx_queue(dev, i)->qdisc_sleeping;
- /* Only update the default qdiscs we created,
- * qdiscs with handles are always hashed.
- */
- if (qdisc != &noop_qdisc && !qdisc->handle)
- qdisc_hash_del(qdisc);
- }
- for (i = dev->real_num_tx_queues; i < new_real_tx; i++) {
- qdisc = netdev_get_tx_queue(dev, i)->qdisc_sleeping;
- if (qdisc != &noop_qdisc && !qdisc->handle)
- qdisc_hash_add(qdisc, false);
- }
-#endif
-}
-
static int mq_dump(struct Qdisc *sch, struct sk_buff *skb)
{
struct net_device *dev = qdisc_dev(sch);
diff --git a/net/sched/sch_mqprio.c b/net/sched/sch_mqprio.c
index 7f23a92849d5..0bc10234e306 100644
--- a/net/sched/sch_mqprio.c
+++ b/net/sched/sch_mqprio.c
@@ -306,28 +306,6 @@ static void mqprio_attach(struct Qdisc *sch)
priv->qdiscs = NULL;
}
-static void mqprio_change_real_num_tx(struct Qdisc *sch,
- unsigned int new_real_tx)
-{
- struct net_device *dev = qdisc_dev(sch);
- struct Qdisc *qdisc;
- unsigned int i;
-
- for (i = new_real_tx; i < dev->real_num_tx_queues; i++) {
- qdisc = netdev_get_tx_queue(dev, i)->qdisc_sleeping;
- /* Only update the default qdiscs we created,
- * qdiscs with handles are always hashed.
- */
- if (qdisc != &noop_qdisc && !qdisc->handle)
- qdisc_hash_del(qdisc);
- }
- for (i = dev->real_num_tx_queues; i < new_real_tx; i++) {
- qdisc = netdev_get_tx_queue(dev, i)->qdisc_sleeping;
- if (qdisc != &noop_qdisc && !qdisc->handle)
- qdisc_hash_add(qdisc, false);
- }
-}
-
static struct netdev_queue *mqprio_queue_get(struct Qdisc *sch,
unsigned long cl)
{
@@ -645,7 +623,7 @@ static struct Qdisc_ops mqprio_qdisc_ops __read_mostly = {
.init = mqprio_init,
.destroy = mqprio_destroy,
.attach = mqprio_attach,
- .change_real_num_tx = mqprio_change_real_num_tx,
+ .change_real_num_tx = mq_change_real_num_tx,
.dump = mqprio_dump,
.owner = THIS_MODULE,
};
--
2.31.1
Powered by blists - more mailing lists