From: Greg Kroah-Hartman Date: Tue, 1 Aug 2023 05:57:20 +0000 (+0200) Subject: 5.10-stable patches X-Git-Tag: v5.15.124~48 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5038a8b2e5ee5a84e719ac135b6df33bf4827582;p=thirdparty%2Fkernel%2Fstable-queue.git 5.10-stable patches added patches: virtio-net-fix-race-between-set-queues-and-probe.patch --- diff --git a/queue-5.10/series b/queue-5.10/series index d7b50dc77fa..ded087e7878 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -98,3 +98,4 @@ kvm-vmx-don-t-fudge-cr0-and-cr4-for-restricted-l2-gu.patch staging-rtl8712-use-constants-from-linux-ieee80211.h.patch staging-r8712-fix-memory-leak-in-_r8712_init_xmit_pr.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.10/virtio-net-fix-race-between-set-queues-and-probe.patch b/queue-5.10/virtio-net-fix-race-between-set-queues-and-probe.patch new file mode 100644 index 00000000000..090118c5a36 --- /dev/null +++ b/queue-5.10/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 +@@ -3220,6 +3220,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(); + +@@ -3240,8 +3242,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);