From: Greg Kroah-Hartman Date: Tue, 1 Aug 2023 05:57:04 +0000 (+0200) Subject: 5.4-stable patches X-Git-Tag: v5.15.124~49 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0280c14c244c2c0c833fa2394fab3b4960efad5e;p=thirdparty%2Fkernel%2Fstable-queue.git 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 1653ff4cb06..8af7d4814f9 100644 --- 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 index 00000000000..43b6876f95f --- /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 +Date: Tue, 25 Jul 2023 03:20:49 -0400 +Subject: virtio-net: fix race between set queues and probe + +From: Jason Wang + +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 +Acked-by: Michael S. Tsirkin +Reviewed-by: Xuan Zhuo +Link: https://lore.kernel.org/r/20230725072049.617289-1-jasowang@redhat.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Greg Kroah-Hartman +--- + 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);