5.4-stable patches

added patches:
	virtio-net-fix-race-between-set-queues-and-probe.patch

diff --git a/queue-5.4/series b/queue-5.4/series
index 1653ff4cb060f970c315b79a3410dcf2a9d9d4a2..8af7d4814f983dc80f09d661f2e987dd557ee145 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -74,3 +74,4 @@ btrfs-check-for-commit-error-at-btrfs_attach_transaction_barrier.patch
 tpm_tis-explicitly-check-for-error-code.patch
 irq-bcm6345-l1-do-not-assume-a-fixed-block-to-cpu-ma.patch
 btrfs-check-if-the-transaction-was-aborted-at-btrfs_.patch
+virtio-net-fix-race-between-set-queues-and-probe.patch

diff --git a/queue-5.4/virtio-net-fix-race-between-set-queues-and-probe.patch b/queue-5.4/virtio-net-fix-race-between-set-queues-and-probe.patch
new file mode 100644 (file)
index 0000000..43b6876
--- /dev/null
+++ b/queue-5.4/virtio-net-fix-race-between-set-queues-and-probe.patch
@@ -0,0 +1,47 @@
+From 25266128fe16d5632d43ada34c847d7b8daba539 Mon Sep 17 00:00:00 2001
+From: Jason Wang <jasowang@redhat.com>
+Date: Tue, 25 Jul 2023 03:20:49 -0400
+Subject: virtio-net: fix race between set queues and probe
+
+From: Jason Wang <jasowang@redhat.com>
+
+commit 25266128fe16d5632d43ada34c847d7b8daba539 upstream.
+
+A race were found where set_channels could be called after registering
+but before virtnet_set_queues() in virtnet_probe(). Fixing this by
+moving the virtnet_set_queues() before netdevice registering. While at
+it, use _virtnet_set_queues() to avoid holding rtnl as the device is
+not even registered at that time.
+
+Cc: stable@vger.kernel.org
+Fixes: a220871be66f ("virtio-net: correctly enable multiqueue")
+Signed-off-by: Jason Wang <jasowang@redhat.com>
+Acked-by: Michael S. Tsirkin <mst@redhat.com>
+Reviewed-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
+Link: https://lore.kernel.org/r/20230725072049.617289-1-jasowang@redhat.com
+Signed-off-by: Jakub Kicinski <kuba@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/net/virtio_net.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/drivers/net/virtio_net.c
++++ b/drivers/net/virtio_net.c
+@@ -3265,6 +3265,8 @@ static int virtnet_probe(struct virtio_d
+               }
+       }
+ 
++      _virtnet_set_queues(vi, vi->curr_queue_pairs);
++
+       /* serialize netdev register + virtio_device_ready() with ndo_open() */
+       rtnl_lock();
+ 
+@@ -3285,8 +3287,6 @@ static int virtnet_probe(struct virtio_d
+               goto free_unregister_netdev;
+       }
+ 
+-      virtnet_set_queues(vi, vi->curr_queue_pairs);
+-
+       /* Assume link up if device can't report link status,
+          otherwise get link status from config. */
+       netif_carrier_off(dev);