diff options
author | David S. Miller <davem@davemloft.net> | 2021-09-15 15:46:02 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2021-09-15 15:46:02 +0100 |
commit | dc50b930be89b82acc21bdefd24df863e47d5cf1 (patch) | |
tree | dc03eaceb78890ddd8421e13e88b8cae1d1820a0 /net/core | |
parent | c506cc5bc6e33a20ca615043aa3ddb2da4b8c210 (diff) | |
parent | 2d6a58996ee23f85745a8e42edaad7a2b86d1a83 (diff) | |
download | linux-dc50b930be89b82acc21bdefd24df863e47d5cf1.tar.gz linux-dc50b930be89b82acc21bdefd24df863e47d5cf1.tar.bz2 linux-dc50b930be89b82acc21bdefd24df863e47d5cf1.zip |
Merge branch 'qdisc-visibility'
Jakub Kicinski says:
====================
net: sched: update default qdisc visibility after Tx queue cnt changes
Matthew noticed that number of children reported by mq does not match
number of queues on reconfigured interfaces. For example if mq is
instantiated when there is 8 queues it will always show 8 children,
regardless of config being changed:
# ethtool -L eth0 combined 8
# tc qdisc replace dev eth0 root handle 100: mq
# tc qdisc show dev eth0
qdisc mq 100: root
qdisc pfifo_fast 0: parent 100:8 bands 3 priomap 1 2 ...
qdisc pfifo_fast 0: parent 100:7 bands 3 priomap 1 2 ...
qdisc pfifo_fast 0: parent 100:6 bands 3 priomap 1 2 ...
qdisc pfifo_fast 0: parent 100:5 bands 3 priomap 1 2 ...
qdisc pfifo_fast 0: parent 100:4 bands 3 priomap 1 2 ...
qdisc pfifo_fast 0: parent 100:3 bands 3 priomap 1 2 ...
qdisc pfifo_fast 0: parent 100:2 bands 3 priomap 1 2 ...
qdisc pfifo_fast 0: parent 100:1 bands 3 priomap 1 2 ...
# ethtool -L eth0 combined 1
# tc qdisc show dev eth0
qdisc mq 100: root
qdisc pfifo_fast 0: parent 100:8 bands 3 priomap 1 2 ...
qdisc pfifo_fast 0: parent 100:7 bands 3 priomap 1 2 ...
qdisc pfifo_fast 0: parent 100:6 bands 3 priomap 1 2 ...
qdisc pfifo_fast 0: parent 100:5 bands 3 priomap 1 2 ...
qdisc pfifo_fast 0: parent 100:4 bands 3 priomap 1 2 ...
qdisc pfifo_fast 0: parent 100:3 bands 3 priomap 1 2 ...
qdisc pfifo_fast 0: parent 100:2 bands 3 priomap 1 2 ...
qdisc pfifo_fast 0: parent 100:1 bands 3 priomap 1 2 ...
# ethtool -L eth0 combined 32
# tc qdisc show dev eth0
qdisc mq 100: root
qdisc pfifo_fast 0: parent 100:8 bands 3 priomap 1 2 ...
qdisc pfifo_fast 0: parent 100:7 bands 3 priomap 1 2 ...
qdisc pfifo_fast 0: parent 100:6 bands 3 priomap 1 2 ...
qdisc pfifo_fast 0: parent 100:5 bands 3 priomap 1 2 ...
qdisc pfifo_fast 0: parent 100:4 bands 3 priomap 1 2 ...
qdisc pfifo_fast 0: parent 100:3 bands 3 priomap 1 2 ...
qdisc pfifo_fast 0: parent 100:2 bands 3 priomap 1 2 ...
qdisc pfifo_fast 0: parent 100:1 bands 3 priomap 1 2 ...
This patchset fixes this by hashing and unhasing the default
child qdiscs as number of queues gets adjusted.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
-rw-r--r-- | net/core/dev.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 74fd402d26dd..f930329f0dc2 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -2921,6 +2921,8 @@ int netif_set_real_num_tx_queues(struct net_device *dev, unsigned int txq) if (dev->num_tc) netif_setup_tc(dev, txq); + dev_qdisc_change_real_num_tx(dev, txq); + dev->real_num_tx_queues = txq; if (disabling) { |