[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 07/15] vhost: check queue state in the vhost_dev_set_log routine
From: |
Michael S. Tsirkin |
Subject: |
[PULL 07/15] vhost: check queue state in the vhost_dev_set_log routine |
Date: |
Fri, 18 Sep 2020 11:06:07 -0400 |
From: Dima Stepanov <dimastep@yandex-team.ru>
If the vhost-user-blk daemon provides only one virtqueue, but device was
added with several queues, then QEMU will send more VHOST-USER command
than expected by daemon side. The vhost_virtqueue_start() routine
handles such case by checking the return value from the
virtio_queue_get_desc_addr() function call. Add the same check to the
vhost_dev_set_log() routine.
Signed-off-by: Dima Stepanov <dimastep@yandex-team.ru>
Message-Id:
<2da64fc45789094b6bd6f1c283cac9e47eeeb786.1598865610.git.dimastep@yandex-team.ru>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
hw/virtio/vhost.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c
index 1b2d735b54..abe0fe3e67 100644
--- a/hw/virtio/vhost.c
+++ b/hw/virtio/vhost.c
@@ -835,12 +835,24 @@ out:
static int vhost_dev_set_log(struct vhost_dev *dev, bool enable_log)
{
int r, i, idx;
+ hwaddr addr;
+
r = vhost_dev_set_features(dev, enable_log);
if (r < 0) {
goto err_features;
}
for (i = 0; i < dev->nvqs; ++i) {
idx = dev->vhost_ops->vhost_get_vq_index(dev, dev->vq_index + i);
+ addr = virtio_queue_get_desc_addr(dev->vdev, idx);
+ if (!addr) {
+ /*
+ * The queue might not be ready for start. If this
+ * is the case there is no reason to continue the process.
+ * The similar logic is used by the vhost_virtqueue_start()
+ * routine.
+ */
+ break;
+ }
r = vhost_virtqueue_set_addr(dev, dev->vqs + i, idx,
enable_log);
if (r < 0) {
--
MST
- [PULL 00/15] virtio,pc,acpi: fixes, tests, Michael S. Tsirkin, 2020/09/18
- [PULL 01/15] linux headers: sync to 5.9-rc4, Michael S. Tsirkin, 2020/09/18
- [PULL 04/15] virtio-mem: detach the element from the virtqueue when error occurs, Michael S. Tsirkin, 2020/09/18
- [PULL 03/15] vhost-vdpa: batch updating IOTLB mappings, Michael S. Tsirkin, 2020/09/18
- [PULL 05/15] pc: fix auto_enable_numa_with_memhp/auto_enable_numa_with_memdev for the 5.0 machine, Michael S. Tsirkin, 2020/09/18
- [PULL 07/15] vhost: check queue state in the vhost_dev_set_log routine,
Michael S. Tsirkin <=
- [PULL 06/15] vhost: recheck dev state in the vhost_migration_log routine, Michael S. Tsirkin, 2020/09/18
- [PULL 08/15] tests/qtest/vhost-user-test: prepare the tests for adding new dev class, Michael S. Tsirkin, 2020/09/18
- [PULL 12/15] tests/qtest/vhost-user-test: enable the reconnect tests, Michael S. Tsirkin, 2020/09/18
- [PULL 15/15] virtio-iommu-pci: force virtio version 1, Michael S. Tsirkin, 2020/09/18
- [PULL 09/15] tests/qtest/libqos/virtio-blk: add support for vhost-user-blk, Michael S. Tsirkin, 2020/09/18
- [PULL 11/15] tests/qtest/vhost-user-test: add migrate_reconnect test, Michael S. Tsirkin, 2020/09/18
- [PULL 13/15] cphp: remove deprecated cpu-add command(s), Michael S. Tsirkin, 2020/09/18
- [PULL 14/15] virtio-iommu: Check gtrees are non null before destroying them, Michael S. Tsirkin, 2020/09/18
- [PULL 10/15] tests/qtest/vhost-user-test: add support for the vhost-user-blk device, Michael S. Tsirkin, 2020/09/18