Skip to content

Commit e7f1bc2

Browse files
mstsirkinnathan-zcgao
authored andcommitted
virtio: break and reset virtio devices on device_shutdown()
commit 8bd2fa0 upstream. Hongyu reported a hang on kexec in a VM. QEMU reported invalid memory accesses during the hang. Invalid read at addr 0x102877002, size 2, region '(null)', reason: rejected Invalid write at addr 0x102877A44, size 2, region '(null)', reason: rejected ... It was traced down to virtio-console. Kexec works fine if virtio-console is not in use. The issue is that virtio-console continues to write to the MMIO even after underlying virtio-pci device is reset. Additionally, Eric noticed that IOMMUs are reset before devices, if devices are not reset on shutdown they continue to poke at guest memory and get errors from the IOMMU. Some devices get wedged then. The problem can be solved by breaking all virtio devices on virtio bus shutdown, then resetting them. Reported-by: Eric Auger <eauger@redhat.com> Reported-by: Hongyu Ning <hongyu.ning@linux.intel.com> Message-ID: <c1dbc7dbad9b445245d3348f19e6742b0be07347.1740094946.git.mst@redhat.com> Tested-by: Eric Auger <eric.auger@redhat.com> Acked-by: Jason Wang <jasowang@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> [Replaced virtio_synchronize_cbs(dev) with synchronize_rcu().] Signed-off-by: Aaron Ahmed <aarnahmd@amazon.com>
1 parent 0ab59d2 commit e7f1bc2

File tree

1 file changed

+29
-0
lines changed

1 file changed

+29
-0
lines changed

drivers/virtio/virtio.c

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -288,13 +288,42 @@ static int virtio_dev_remove(struct device *_d)
288288
return 0;
289289
}
290290

291+
static void virtio_dev_shutdown(struct device *_d)
292+
{
293+
struct virtio_device *dev = dev_to_virtio(_d);
294+
struct virtio_driver *drv = drv_to_virtio(dev->dev.driver);
295+
296+
/*
297+
* Stop accesses to or from the device.
298+
* We only need to do it if there's a driver - no accesses otherwise.
299+
*/
300+
if (!drv)
301+
return;
302+
303+
/*
304+
* Some devices get wedged if you kick them after they are
305+
* reset. Mark all vqs as broken to make sure we don't.
306+
*/
307+
virtio_break_device(dev);
308+
/*
309+
* Guarantee that any callback will see vq->broken as true.
310+
*/
311+
synchronize_rcu();
312+
/*
313+
* As IOMMUs are reset on shutdown, this will block device access to memory.
314+
* Some devices get wedged if this happens, so reset to make sure it does not.
315+
*/
316+
dev->config->reset(dev);
317+
}
318+
291319
static struct bus_type virtio_bus = {
292320
.name = "virtio",
293321
.match = virtio_dev_match,
294322
.dev_groups = virtio_dev_groups,
295323
.uevent = virtio_uevent,
296324
.probe = virtio_dev_probe,
297325
.remove = virtio_dev_remove,
326+
.shutdown = virtio_dev_shutdown,
298327
};
299328

300329
int register_virtio_driver(struct virtio_driver *driver)

0 commit comments

Comments
 (0)