[PATCH v2 2/2] can: virtio: fix virtqueue use before DRIVER_OK

From: Seonghyeon Lim via B4 Relay

Date: Fri Nov 20 2026 - 01:58:11 EST


From: Seonghyeon Lim <forfortuna@xxxxxxxxx>

virtio_can_probe() and virtio_can_restore() fill the RX virtqueue and
kick it before the device is set DRIVER_OK. The virtio specification
does not allow the driver to notify the device before DRIVER_OK.

In restore, if the interface was up, virtio_can_open() then sends a
START control message and waits for the reply. DRIVER_OK is only set
by the virtio core after restore returns, so the device may never
handle the request and the wait never completes, which hangs system
resume:

task:kworker/u4:5 state:D
Workqueue: async async_run_entry_fn
Call Trace:
__wait_for_common
virtio_can_send_ctrl_msg
virtio_can_open
virtio_can_restore
virtio_device_restore_priv
dpm_run_callback
device_resume

In probe, an ndo_open() right after register_candev() can likewise
send the START message before DRIVER_OK.

Call virtio_device_ready() before the first virtqueue use in both
probe and restore, as virtio-net does. Config change callbacks are
still deferred by the virtio core until probe or restore returns, and
virtqueue callbacks that arrive before NAPI is enabled are handled in
virtio_can_napi_enable().

Fixes: 083082a4e6d8 ("can: virtio: Add virtio CAN driver")
Cc: stable@xxxxxxxxxxxxxxx
Signed-off-by: Seonghyeon Lim <forfortuna@xxxxxxxxx>
---
drivers/net/can/virtio_can.c | 6 ++++++
1 file changed, 6 insertions(+)

diff --git a/drivers/net/can/virtio_can.c b/drivers/net/can/virtio_can.c
index 9055d7e43235..549e8d789d74 100644
--- a/drivers/net/can/virtio_can.c
+++ b/drivers/net/can/virtio_can.c
@@ -925,6 +925,9 @@ static int virtio_can_probe(struct virtio_device *vdev)
err = -ENOMEM;
goto on_failure;
}
+
+ virtio_device_ready(vdev);
+
virtio_can_populate_rx_vq(vdev);

err = register_virtio_can_dev(dev);
@@ -979,6 +982,9 @@ static int __maybe_unused virtio_can_restore(struct virtio_device *vdev)
virtio_can_del_vq(vdev);
return -ENOMEM;
}
+
+ virtio_device_ready(vdev);
+
virtio_can_populate_rx_vq(vdev);

if (netif_running(ndev)) {

--
2.43.0