net: ena: Fix bug where ring allocation backoff stopped too late
Subsystems (3)
PATCH 1/1 net: ena: Fix bug where ring allocation backoff stopped too late
From: Sameeh Jubran <[email protected]>
The current code of create_queues_with_size_backoff() allows the ring size to become as small as ENA_MIN_RING_SIZE/2. This is a bug since we don't want the queue ring to be smaller than ENA_MIN_RING_SIZE
In this commit we change the loop's termination condition to look at the queue size of the next iteration instead of that of the current one, so that the minimal queue size again becomes ENA_MIN_RING_SIZE.
--- drivers/net/ethernet/amazon/ena/ena_netdev.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/amazon/ena/ena_netdev.c +2 -2
@@ -1839,8 +1839,8 @@ err_setup_tx:if (cur_rx_ring_size >= cur_tx_ring_size) new_rx_ring_size = cur_rx_ring_size /2 ; -if (cur_tx_ring_size <ENA_MIN_RING_SIZE || - cur_rx_ring_size <ENA_MIN_RING_SIZE ) { +if (new_tx_ring_size <ENA_MIN_RING_SIZE || + new_rx_ring_size <ENA_MIN_RING_SIZE ) {netif_err (adapter, ifup, adapter->netdev,"Queue creation failed with the smallest possible queue size of %d for both queues. Not retrying with smaller queues\n" ,ENA_MIN_RING_SIZE );
Signature · 1 line
2.17.1
From: <[email protected]>
Date: Sun, 23 Jun 2019 10:11:10 +0300
Quoted 6 lines
From: Sameeh Jubran <[email protected]>
The current code of
create_queues_with_size_backoff()allows the ring size to become as small as ENA_MIN_RING_SIZE/2. This is a bug since we don't want the queue ring to be smaller thanENA_MIN_RING_SIZE
Quoted 8 lines
In this commit we change the loop's termination condition to look at the queue size of the next iteration instead of that of the current one, so that the minimal queue size again becomes
ENA_MIN_RING_SIZE.Fixes eece4d2ab9d2 ("net: ena: add ethtool function for changing io queue sizes")Signed-off-by Arthur Kiyanovski <[email protected]>Signed-off-by Sameeh Jubran <[email protected]>
Applied, thank you.