Skip to contentSkip to conversation

virtio-net: set queues after driver_ok

PATCH In review Jason Wang 3 participants 3 messages Aug 10, 2023 – Aug 21, 2023

Subsystems (4)
lore
Share & tools
lore

Jason Wang

author
#0 lore raw

PATCH v2 1/1 virtio-net: set queues after driver_ok

Commit 25266128fe16 ("virtio-net: fix race between set queues and probe") tries to fix the race between set queues and probe by calling _virtnet_set_queues() before DRIVER_OK is set. This violates virtio spec. Fixing this by setting queues after virtio_device_ready().

Note that rtnl needs to be held for userspace requests to change the number of queues. So we are serialized in this way.

Fixes 25266128fe16 ("virtio-net: fix race between set queues and probe")

---
The patch is needed for -stable.
Changes since V1: Tweak the commit log.

---
 drivers/net/virtio_net.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/virtio_net.c +2 -2
index 1270c8d23463..ff03921e46df 100644
@@ -4219,8 +4219,6 @@ static int virtnet_probe(struct virtio_device *vdev)
 	if (vi->has_rss || vi->has_rss_hash_report)
 		virtnet_init_default_rss(vi);
 
-	_virtnet_set_queues(vi, vi->curr_queue_pairs);
-
 	/* serialize netdev register + virtio_device_ready() with ndo_open() */
 	rtnl_lock();
 
@@ -4233,6 +4231,8 @@ static int virtnet_probe(struct virtio_device *vdev)
 
 	virtio_device_ready(vdev);
 
+	_virtnet_set_queues(vi, vi->curr_queue_pairs);
+
 	/* a random MAC address has been assigned, notify the device.
 	 * We don't fail probe if VIRTIO_NET_F_CTRL_MAC_ADDR is not there
 	 * because many devices work fine without getting MAC explicitly
Signature · 1 line
2.39.3
maintainer
#1 lore raw
Quoted 7 lines · On Wed, 9 Aug 2023 23:12:56 -0400 Jason Wang wrote:

Commit 25266128fe16 ("virtio-net: fix race between set queues and probe") tries to fix the race between set queues and probe by calling _virtnet_set_queues() before DRIVER_OK is set. This violates virtio spec. Fixing this by setting queues after virtio_device_ready().

Note that rtnl needs to be held for userspace requests to change the number of queues. So we are serialized in this way.

FTR this appears to have been applied yesterday by DaveM. Thanks!

Tested-by on v2 1/1
#2 lore raw
In reply to Jason Wang
Quoted 10 lines · Jason Wang

Commit 25266128fe16 ("virtio-net: fix race between set queues and probe") tries to fix the race between set queues and probe by calling _virtnet_set_queues() before DRIVER_OK is set. This violates virtio spec. Fixing this by setting queues after virtio_device_ready().

Note that rtnl needs to be held for userspace requests to change the number of queues. So we are serialized in this way.

Fixes 25266128fe16 ("virtio-net: fix race between set queues and probe")

I had the same issue to report and this fix helped me out.

Quoted 31 lines

---
The patch is needed for -stable.
Changes since V1: Tweak the commit log.

---
  drivers/net/virtio_net.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/virtio_net.c +2 -2
index 1270c8d23463..ff03921e46df 100644
@@ -4219,8 +4219,6 @@ static int virtnet_probe(struct virtio_device *vdev)
  	if (vi->has_rss || vi->has_rss_hash_report)
  		virtnet_init_default_rss(vi);
 
-	_virtnet_set_queues(vi, vi->curr_queue_pairs);
-
  	/* serialize netdev register + virtio_device_ready() with ndo_open() */
  	rtnl_lock();
 
@@ -4233,6 +4231,8 @@ static int virtnet_probe(struct virtio_device *vdev)
 
  	virtio_device_ready(vdev);
 
+	_virtnet_set_queues(vi, vi->curr_queue_pairs);
+
  	/* a random MAC address has been assigned, notify the device.
  	 * We don't fail probe if VIRTIO_NET_F_CTRL_MAC_ADDR is not there
  	 * because many devices work fine without getting MAC explicitly