When queue number shrinks to 1 from X, the following code stops us
sending the multiple queue ctrl message:

        if (nb_queues > 1) {
                if (virtio_set_multiple_queues(dev, nb_queues) != 0)
                        return -EINVAL;
        }

This ends up with still X queues being enabled, which is obviously
wrong. Fix it by removing the check.

Fixes: 823ad647950a ("virtio: support multiple queues")

Signed-off-by: Yuanhan Liu <yuanhan.liu at linux.intel.com>
---
 drivers/net/virtio/virtio_ethdev.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/net/virtio/virtio_ethdev.c 
b/drivers/net/virtio/virtio_ethdev.c
index d70bd00..a4cd6f5 100644
--- a/drivers/net/virtio/virtio_ethdev.c
+++ b/drivers/net/virtio/virtio_ethdev.c
@@ -1494,10 +1494,8 @@ virtio_dev_start(struct rte_eth_dev *dev)
         *vhost backend will have no chance to be waked up
         */
        nb_queues = RTE_MAX(dev->data->nb_rx_queues, dev->data->nb_tx_queues);
-       if (nb_queues > 1) {
-               if (virtio_set_multiple_queues(dev, nb_queues) != 0)
-                       return -EINVAL;
-       }
+       if (virtio_set_multiple_queues(dev, nb_queues) != 0)
+               return -EINVAL;

        PMD_INIT_LOG(DEBUG, "nb_queues=%d", nb_queues);

-- 
1.9.0

Reply via email to