aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCong Wang <xiyou.wangcong@gmail.com>2018-01-25 21:26:23 -0500
committerDavid S. Miller <davem@davemloft.net>2018-01-29 12:42:15 -0500
commit48bfd55e7e4149a304e89c1999436cf52d094a27 (patch)
tree6318e75ea99c74a81622ebe82ee2c71c9338baf4
parent6a643ddb5624be7e0694d49f5765a8d41c1ab6d0 (diff)
net_sched: plug in qdisc ops change_tx_queue_len
Introduce a new qdisc ops ->change_tx_queue_len() so that each qdisc could decide how to implement this if it wants. Previously we simply read dev->tx_queue_len, after pfifo_fast switches to skb array, we need this API to resize the skb array when we change dev->tx_queue_len. To avoid handling race conditions with TX BH, we need to deactivate all TX queues before change the value and bring them back after we are done, this also makes implementation easier. Cc: John Fastabend <john.fastabend@gmail.com> Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--include/net/sch_generic.h2
-rw-r--r--net/core/dev.c1
-rw-r--r--net/sched/sch_generic.c33
3 files changed, 36 insertions, 0 deletions
diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h
index eac43e8ca96d..e2ab13687fb9 100644
--- a/include/net/sch_generic.h
+++ b/include/net/sch_generic.h
@@ -200,6 +200,7 @@ struct Qdisc_ops {
200 struct nlattr *arg, 200 struct nlattr *arg,
201 struct netlink_ext_ack *extack); 201 struct netlink_ext_ack *extack);
202 void (*attach)(struct Qdisc *sch); 202 void (*attach)(struct Qdisc *sch);
203 int (*change_tx_queue_len)(struct Qdisc *, unsigned int);
203 204
204 int (*dump)(struct Qdisc *, struct sk_buff *); 205 int (*dump)(struct Qdisc *, struct sk_buff *);
205 int (*dump_stats)(struct Qdisc *, struct gnet_dump *); 206 int (*dump_stats)(struct Qdisc *, struct gnet_dump *);
@@ -489,6 +490,7 @@ void qdisc_class_hash_remove(struct Qdisc_class_hash *,
489void qdisc_class_hash_grow(struct Qdisc *, struct Qdisc_class_hash *); 490void qdisc_class_hash_grow(struct Qdisc *, struct Qdisc_class_hash *);
490void qdisc_class_hash_destroy(struct Qdisc_class_hash *); 491void qdisc_class_hash_destroy(struct Qdisc_class_hash *);
491 492
493int dev_qdisc_change_tx_queue_len(struct net_device *dev);
492void dev_init_scheduler(struct net_device *dev); 494void dev_init_scheduler(struct net_device *dev);
493void dev_shutdown(struct net_device *dev); 495void dev_shutdown(struct net_device *dev);
494void dev_activate(struct net_device *dev); 496void dev_activate(struct net_device *dev);
diff --git a/net/core/dev.c b/net/core/dev.c
index 520c24671bc5..dda9d7b9a840 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -7070,6 +7070,7 @@ int dev_change_tx_queue_len(struct net_device *dev, unsigned long new_len)
7070 dev->tx_queue_len = orig_len; 7070 dev->tx_queue_len = orig_len;
7071 return res; 7071 return res;
7072 } 7072 }
7073 return dev_qdisc_change_tx_queue_len(dev);
7073 } 7074 }
7074 7075
7075 return 0; 7076 return 0;
diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c
index 1816bde47256..08f9fa27e06e 100644
--- a/net/sched/sch_generic.c
+++ b/net/sched/sch_generic.c
@@ -1178,6 +1178,39 @@ void dev_deactivate(struct net_device *dev)
1178} 1178}
1179EXPORT_SYMBOL(dev_deactivate); 1179EXPORT_SYMBOL(dev_deactivate);
1180 1180
1181static int qdisc_change_tx_queue_len(struct net_device *dev,
1182 struct netdev_queue *dev_queue)
1183{
1184 struct Qdisc *qdisc = dev_queue->qdisc_sleeping;
1185 const struct Qdisc_ops *ops = qdisc->ops;
1186
1187 if (ops->change_tx_queue_len)
1188 return ops->change_tx_queue_len(qdisc, dev->tx_queue_len);
1189 return 0;
1190}
1191
1192int dev_qdisc_change_tx_queue_len(struct net_device *dev)
1193{
1194 bool up = dev->flags & IFF_UP;
1195 unsigned int i;
1196 int ret = 0;
1197
1198 if (up)
1199 dev_deactivate(dev);
1200
1201 for (i = 0; i < dev->num_tx_queues; i++) {
1202 ret = qdisc_change_tx_queue_len(dev, &dev->_tx[i]);
1203
1204 /* TODO: revert changes on a partial failure */
1205 if (ret)
1206 break;
1207 }
1208
1209 if (up)
1210 dev_activate(dev);
1211 return ret;
1212}
1213
1181static void dev_init_scheduler_queue(struct net_device *dev, 1214static void dev_init_scheduler_queue(struct net_device *dev,
1182 struct netdev_queue *dev_queue, 1215 struct netdev_queue *dev_queue,
1183 void *_qdisc) 1216 void *_qdisc)