net: ena: Fix bug where ring allocation backoff stopped too late

BugLink: https://bugs.launchpad.net/bugs/1850175
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.

Fixes: eece4d2ab9d2 ("net: ena: add ethtool function for changing io queue sizes")
Signed-off-by: Arthur Kiyanovski <akiyano@amazon.com>
Signed-off-by: Sameeh Jubran <sameehj@amazon.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from commit 3e5bfb189e1a65df132fd0e3fa00fbb6feec1431)
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Khaled Elmously <khalid.elmously@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>

diff --git a/drivers/net/ethernet/amazon/ena/ena_netdev.c b/drivers/net/ethernet/amazon/ena/ena_netdev.c
index aae40ec942c544dcd7f9a1233c03ca62facc0313..ec373a8d7656035b224659553e8694e7d45b3ca9 100644 (file)
--- a/drivers/net/ethernet/amazon/ena/ena_netdev.c
+++ b/drivers/net/ethernet/amazon/ena/ena_netdev.c
@@ -1840,8 +1840,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);