diff options
| author | Tariq Toukan <tariqt@mellanox.com> | 2018-07-24 14:12:20 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-08-03 07:48:05 +0200 |
| commit | 469bda04fc892f99af71d3b973c583dffe159bdc (patch) | |
| tree | 7a28204ebd0179ece999a84872519e94f115e575 | |
| parent | d685bbf1acf724d9479593dc886e10202eda0c04 (diff) | |
| download | linux-stable-469bda04fc892f99af71d3b973c583dffe159bdc.tar.gz linux-stable-469bda04fc892f99af71d3b973c583dffe159bdc.tar.bz2 linux-stable-469bda04fc892f99af71d3b973c583dffe159bdc.zip | |
net: rollback orig value on failure of dev_qdisc_change_tx_queue_len
[ Upstream commit 7effaf06c3cdef6855e127886c7405b9ab62f90d ]
Fix dev_change_tx_queue_len so it rolls back original value
upon a failure in dev_qdisc_change_tx_queue_len.
This is already done for notifirers' failures, share the code.
In case of failure in dev_qdisc_change_tx_queue_len, some tx queues
would still be of the new length, while they should be reverted.
Currently, the revert is not done, and is marked with a TODO label
in dev_qdisc_change_tx_queue_len, and should find some nice solution
to do it.
Yet it is still better to not apply the newly requested value.
Fixes: 48bfd55e7e41 ("net_sched: plug in qdisc ops change_tx_queue_len")
Signed-off-by: Tariq Toukan <tariqt@mellanox.com>
Reviewed-by: Eran Ben Elisha <eranbe@mellanox.com>
Reported-by: Ran Rozenstein <ranro@mellanox.com>
Cc: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | net/core/dev.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 2af787e8b130..1ccc2a2ac2e9 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -7113,16 +7113,19 @@ int dev_change_tx_queue_len(struct net_device *dev, unsigned long new_len) dev->tx_queue_len = new_len; res = call_netdevice_notifiers(NETDEV_CHANGE_TX_QUEUE_LEN, dev); res = notifier_to_errno(res); - if (res) { - netdev_err(dev, - "refused to change device tx_queue_len\n"); - dev->tx_queue_len = orig_len; - return res; - } - return dev_qdisc_change_tx_queue_len(dev); + if (res) + goto err_rollback; + res = dev_qdisc_change_tx_queue_len(dev); + if (res) + goto err_rollback; } return 0; + +err_rollback: + netdev_err(dev, "refused to change device tx_queue_len\n"); + dev->tx_queue_len = orig_len; + return res; } /** |