diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2020-12-15 10:52:23 +0100 |
|---|---|---|
| committer | Richard Weinberger <richard@nod.at> | 2021-02-12 21:22:32 +0100 |
| commit | 9b84512cfe601759f66ee594b2d5aa07788251ea (patch) | |
| tree | 366fbad250a9585f47366aee25bfc9f347a66ffa /arch/um | |
| parent | 10c2b5aeb21c439251e5e828bf1362f89ab3de49 (diff) | |
| download | linux-stable-9b84512cfe601759f66ee594b2d5aa07788251ea.tar.gz linux-stable-9b84512cfe601759f66ee594b2d5aa07788251ea.tar.bz2 linux-stable-9b84512cfe601759f66ee594b2d5aa07788251ea.zip | |
um: virtio: disable VQs during suspend
If the system is suspended, the device shouldn't be able to send
anything to it. Disable virtqueues in suspend to simulate this,
and as we might be only using s2idle (kernel services are still
on), prevent sending anything on them as well.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'arch/um')
| -rw-r--r-- | arch/um/drivers/virtio_uml.c | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/arch/um/drivers/virtio_uml.c b/arch/um/drivers/virtio_uml.c index ef620caed8e7..9db9d00b2dc2 100644 --- a/arch/um/drivers/virtio_uml.c +++ b/arch/um/drivers/virtio_uml.c @@ -65,6 +65,7 @@ struct virtio_uml_vq_info { vq_callback_t *callback; struct time_travel_event defer; #endif + bool suspended; }; extern unsigned long long physmem_size, highmem; @@ -725,6 +726,9 @@ static bool vu_notify(struct virtqueue *vq) const uint64_t n = 1; int rc; + if (info->suspended) + return true; + time_travel_propagate_time(); if (info->kick_fd < 0) { @@ -1288,6 +1292,36 @@ static const struct of_device_id virtio_uml_match[] = { }; MODULE_DEVICE_TABLE(of, virtio_uml_match); +static int virtio_uml_suspend(struct platform_device *pdev, pm_message_t state) +{ + struct virtio_uml_device *vu_dev = platform_get_drvdata(pdev); + struct virtqueue *vq; + + virtio_device_for_each_vq((&vu_dev->vdev), vq) { + struct virtio_uml_vq_info *info = vq->priv; + + info->suspended = true; + vhost_user_set_vring_enable(vu_dev, vq->index, false); + } + + return 0; +} + +static int virtio_uml_resume(struct platform_device *pdev) +{ + struct virtio_uml_device *vu_dev = platform_get_drvdata(pdev); + struct virtqueue *vq; + + virtio_device_for_each_vq((&vu_dev->vdev), vq) { + struct virtio_uml_vq_info *info = vq->priv; + + info->suspended = false; + vhost_user_set_vring_enable(vu_dev, vq->index, true); + } + + return 0; +} + static struct platform_driver virtio_uml_driver = { .probe = virtio_uml_probe, .remove = virtio_uml_remove, @@ -1295,6 +1329,8 @@ static struct platform_driver virtio_uml_driver = { .name = "virtio-uml", .of_match_table = virtio_uml_match, }, + .suspend = virtio_uml_suspend, + .resume = virtio_uml_resume, }; static int __init virtio_uml_init(void) |