The following changes since commit 96662996eda78c48aadddd4e76d8615c7eb72d80:

Merge remote-tracking branch 'remotes/dgilbert/tags/pull-migration-20210513a' into staging (2021-05-14 12:03:47 +0100)

git://repo.or.cz/qemu/kevin.git tags/for-upstream

for you to fetch changes up to b773c9fb68ceff9a9692409d7afbc5d6865983c6:

vhost-user-blk: Check that num-queues is supported by backend (2021-05-14 18:04:27 +0200)

- vhost-user-blk: Fix error handling during initialisation

- Add test cases for the vhost-user-blk export

- Fix leaked Transaction objects

- qcow2: Expose dirty bit in 'qemu-img info'

Coiby Xu (1):

test: new qTest case to test the vhost-user-blk-server

Kevin Wolf (8):

block: Fix Transaction leak in bdrv_root_attach_child()

block: Fix Transaction leak in bdrv_reopen_multiple()

vhost-user-blk: Make sure to set Error on realize failure

vhost-user-blk: Don't reconnect during initialisation

vhost-user-blk: Improve error reporting in realize

vhost-user-blk: Get more feature flags from vhost device

virtio: Fail if iommu_platform is requested, but unsupported

vhost-user-blk: Check that num-queues is supported by backend

Michael Tokarev (1):

qapi: spelling fix (addtional)

Stefan Hajnoczi (3):

block/export: improve vu_blk_sect_range_ok()

tests/qtest: add multi-queue test case to vhost-user-blk-test

vhost-user-blk-test: test discard/write zeroes invalid inputs

Vladimir Sementsov-Ogievskiy (1):

qcow2: set bdi->is_dirty

qapi/qom.json | 4 +-

include/hw/virtio/vhost.h | 2 +

tests/qtest/libqos/vhost-user-blk.h | 48 ++

block.c | 9 +-

block/export/vhost-user-blk-server.c | 9 +-

block/qcow2.c | 1 +

hw/block/vhost-user-blk.c | 85 ++-

hw/virtio/vhost-user.c | 5 +

hw/virtio/virtio-bus.c | 5 +

tests/qtest/libqos/vhost-user-blk.c | 130 +++++

tests/qtest/vhost-user-blk-test.c | 989 +++++++++++++++++++++++++++++++++++

MAINTAINERS | 2 +

tests/qtest/libqos/meson.build | 1 +

tests/qtest/meson.build | 4 +

14 files changed, 1232 insertions(+), 62 deletions(-)

create mode 100644 tests/qtest/libqos/vhost-user-blk.h

create mode 100644 tests/qtest/libqos/vhost-user-blk.c

create mode 100644 tests/qtest/vhost-user-blk-test.c

From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>

Set bdi->is_dirty, so that qemu-img info could show dirty flag.

After this commit the following check will show '"dirty-flag": true':

./build/qemu-img create -f qcow2 -o lazy_refcounts=on x 1M

./build/qemu-io x

qemu-io> write 0 1M

After "write" command success, kill the qemu-io process:

kill -9 <qemu-io pid>

./build/qemu-img info --output=json x

This will show '"dirty-flag": true' among other things. (before this

commit it shows '"dirty-flag": false')

Note, that qcow2's dirty-bit is not a "dirty bit for the image". It

only protects qcow2 lazy refcounts feature. So, there are a lot of

conditions when qcow2 session may be not closed correctly, but bit is

0. Still, when bit is set, the last session is definitely not finished

correctly and it's better to report it.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>

Message-Id: <20210504160656.462836-1-vsementsov@virtuozzo.com>

Tested-by: Kirill Tkhai <ktkhai@virtuozzo.com>

Reviewed-by: Eric Blake <eblake@redhat.com>

block/qcow2.c | 1 +

1 file changed, 1 insertion(+)

diff --git a/block/qcow2.c b/block/qcow2.c

--- a/block/qcow2.c

+++ b/block/qcow2.c

@@ -XXX,XX +XXX,XX @@ static int qcow2_get_info(BlockDriverState *bs, BlockDriverInfo *bdi)

BDRVQcow2State *s = bs->opaque;

bdi->cluster_size = s->cluster_size;

bdi->vm_state_offset = qcow2_vm_state_offset(s);

+ bdi->is_dirty = s->incompatible_features & QCOW2_INCOMPAT_DIRTY;

return 0;

2.30.2

From: Stefan Hajnoczi <stefanha@redhat.com>

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>

Message-Id: <20210309094106.196911-4-stefanha@redhat.com>

Signed-off-by: Kevin Wolf <kwolf@redhat.com>

Message-Id: <20210322092327.150720-3-stefanha@redhat.com>

tests/qtest/vhost-user-blk-test.c | 81 +++++++++++++++++++++++++++++--

1 file changed, 76 insertions(+), 5 deletions(-)

diff --git a/tests/qtest/vhost-user-blk-test.c b/tests/qtest/vhost-user-blk-test.c

--- a/tests/qtest/vhost-user-blk-test.c

+++ b/tests/qtest/vhost-user-blk-test.c

@@ -XXX,XX +XXX,XX @@ static void pci_hotplug(void *obj, void *data, QGuestAllocator *t_alloc)

qpci_unplug_acpi_device_test(qts, "drv1", PCI_SLOT_HP);

+static void multiqueue(void *obj, void *data, QGuestAllocator *t_alloc)

+{

+ QVirtioPCIDevice *pdev1 = obj;

+ QVirtioDevice *dev1 = &pdev1->vdev;

+ QVirtioPCIDevice *pdev8;

+ QVirtioDevice *dev8;

+ QTestState *qts = pdev1->pdev->bus->qts;

+ uint64_t features;

+ uint16_t num_queues;

+

+ /*

+ * The primary device has 1 queue and VIRTIO_BLK_F_MQ is not enabled. The

+ * VIRTIO specification allows VIRTIO_BLK_F_MQ to be enabled when there is

+ * only 1 virtqueue, but --device vhost-user-blk-pci doesn't do this (which

+ * is also spec-compliant).

+ */

+ features = qvirtio_get_features(dev1);

+ g_assert_cmpint(features & (1u << VIRTIO_BLK_F_MQ), ==, 0);

+ features = features & ~(QVIRTIO_F_BAD_FEATURE |

+ (1u << VIRTIO_RING_F_INDIRECT_DESC) |

+ (1u << VIRTIO_F_NOTIFY_ON_EMPTY) |

+ (1u << VIRTIO_BLK_F_SCSI));

+ qvirtio_set_features(dev1, features);

+

+ /* Hotplug a secondary device with 8 queues */

+ qtest_qmp_device_add(qts, "vhost-user-blk-pci", "drv1",

+ "{'addr': %s, 'chardev': 'char2', 'num-queues': 8}",

+ stringify(PCI_SLOT_HP) ".0");

+

+ pdev8 = virtio_pci_new(pdev1->pdev->bus,

+ &(QPCIAddress) {

+ .devfn = QPCI_DEVFN(PCI_SLOT_HP, 0)

+ });

+ g_assert_nonnull(pdev8);

+ g_assert_cmpint(pdev8->vdev.device_type, ==, VIRTIO_ID_BLOCK);

+

+ qos_object_start_hw(&pdev8->obj);

+

+ dev8 = &pdev8->vdev;

+ features = qvirtio_get_features(dev8);

+ g_assert_cmpint(features & (1u << VIRTIO_BLK_F_MQ),

+ ==,

+ (1u << VIRTIO_BLK_F_MQ));

+ features = features & ~(QVIRTIO_F_BAD_FEATURE |

+ (1u << VIRTIO_RING_F_INDIRECT_DESC) |

+ (1u << VIRTIO_F_NOTIFY_ON_EMPTY) |

+ (1u << VIRTIO_BLK_F_SCSI) |

+ (1u << VIRTIO_BLK_F_MQ));

+ qvirtio_set_features(dev8, features);

+

+ num_queues = qvirtio_config_readw(dev8,

+ offsetof(struct virtio_blk_config, num_queues));

+ g_assert_cmpint(num_queues, ==, 8);

+

+ qvirtio_pci_device_disable(pdev8);

+ qos_object_destroy(&pdev8->obj);

+

+ /* unplug secondary disk */

+ qpci_unplug_acpi_device_test(qts, "drv1", PCI_SLOT_HP);

+}

+

/*

* Check that setting the vring addr on a non-existent virtqueue does

* not crash.

@@ -XXX,XX +XXX,XX @@ static void quit_storage_daemon(void *data)

g_free(data);

-static void start_vhost_user_blk(GString *cmd_line, int vus_instances)

+static void start_vhost_user_blk(GString *cmd_line, int vus_instances,

+ int num_queues)

const char *vhost_user_blk_bin = qtest_qemu_storage_daemon_binary();

int i;

@@ -XXX,XX +XXX,XX @@ static void start_vhost_user_blk(GString *cmd_line, int vus_instances)

g_string_append_printf(storage_daemon_command,

"--blockdev driver=file,node-name=disk%d,filename=%s "

"--export type=vhost-user-blk,id=disk%d,addr.type=unix,addr.path=%s,"

- "node-name=disk%i,writable=on ",

- i, img_path, i, sock_path, i);

+ "node-name=disk%i,writable=on,num-queues=%d ",

+ i, img_path, i, sock_path, i, num_queues);

g_string_append_printf(cmd_line, "-chardev socket,id=char%d,path=%s ",

i + 1, sock_path);

@@ -XXX,XX +XXX,XX @@ static void start_vhost_user_blk(GString *cmd_line, int vus_instances)

static void *vhost_user_blk_test_setup(GString *cmd_line, void *arg)

- start_vhost_user_blk(cmd_line, 1);

+ start_vhost_user_blk(cmd_line, 1, 1);

return arg;

}

@@ -XXX,XX +XXX,XX @@ static void *vhost_user_blk_test_setup(GString *cmd_line, void *arg)

static void *vhost_user_blk_hotplug_test_setup(GString *cmd_line, void *arg)

{

/* "-chardev socket,id=char2" is used for pci_hotplug*/

- start_vhost_user_blk(cmd_line, 2);

+ start_vhost_user_blk(cmd_line, 2, 1);

+ return arg;

+}

+

+static void *vhost_user_blk_multiqueue_test_setup(GString *cmd_line, void *arg)

+{

+ start_vhost_user_blk(cmd_line, 2, 8);

return arg;

}

@@ -XXX,XX +XXX,XX @@ static void register_vhost_user_blk_test(void)

opts.before = vhost_user_blk_hotplug_test_setup;

qos_add_test("hotplug", "vhost-user-blk-pci", pci_hotplug, &opts);

+

+ opts.before = vhost_user_blk_multiqueue_test_setup;

+ qos_add_test("multiqueue", "vhost-user-blk-pci", multiqueue, &opts);

}

libqos_init(register_vhost_user_blk_test);

2.30.2

From: Michael Tokarev <mjt@tls.msk.ru>

Fixes: 3d0d3c30ae3a259bff176f85a3efa2d0816695af

Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>

Message-Id: <20210508093315.393274-1-mjt@msgid.tls.msk.ru>

qapi/qom.json | 4 ++--

diff --git a/qapi/qom.json b/qapi/qom.json

--- a/qapi/qom.json

+++ b/qapi/qom.json

@@ -XXX,XX +XXX,XX @@

#

# @max_queue_size: the maximum number of packets to keep in the queue for

# comparing with incoming packets from @secondary_in. If the

-# queue is full and addtional packets are received, the

-# addtional packets are dropped. (default: 1024)

+# queue is full and additional packets are received, the

+# additional packets are dropped. (default: 1024)

#

# @vnet_hdr_support: if true, vnet header support is enabled (default: false)

#

2.30.2

VIRTIO_F_RING_PACKED and VIRTIO_F_IOMMU_PLATFORM need to be supported by

the vhost device, otherwise advertising it to the guest doesn't result

in a working configuration. They are currently not supported by the

vhost-user-blk export in QEMU.

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1935020

Signed-off-by: Kevin Wolf <kwolf@redhat.com>

Acked-by: Raphael Norwitz <raphael.norwitz@nutanix.com>

Message-Id: <20210429171316.162022-5-kwolf@redhat.com>

Reviewed-by: Michael S. Tsirkin <mst@redhat.com>

hw/block/vhost-user-blk.c | 2 ++

diff --git a/hw/block/vhost-user-blk.c b/hw/block/vhost-user-blk.c

--- a/hw/block/vhost-user-blk.c

+++ b/hw/block/vhost-user-blk.c

@@ -XXX,XX +XXX,XX @@ static const int user_feature_bits[] = {

VIRTIO_RING_F_INDIRECT_DESC,

VIRTIO_RING_F_EVENT_IDX,

VIRTIO_F_NOTIFY_ON_EMPTY,

+ VIRTIO_F_RING_PACKED,

+ VIRTIO_F_IOMMU_PLATFORM,

VHOST_INVALID_FEATURE_BIT

};

2.30.2

Creating a device with a number of queues that isn't supported by the

backend is pointless, the device won't work properly and the error

messages are rather confusing.

Just fail to create the device if num-queues is higher than what the

backend supports.

Since the relationship between num-queues and the number of virtqueues

depends on the specific device, this is an additional value that needs

to be initialised by the device. For convenience, allow leaving it 0 if

the check should be skipped. This makes sense for vhost-user-net where

separate vhost devices are used for the queues and custom initialisation

code is needed to perform the check.

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1935031

Signed-off-by: Kevin Wolf <kwolf@redhat.com>

Reviewed-by: Raphael Norwitz <raphael.norwitz@nutanix.com>

Message-Id: <20210429171316.162022-7-kwolf@redhat.com>

Reviewed-by: Michael S. Tsirkin <mst@redhat.com>

include/hw/virtio/vhost.h | 2 ++

hw/block/vhost-user-blk.c | 1 +

hw/virtio/vhost-user.c | 5 +++++

3 files changed, 8 insertions(+)

diff --git a/include/hw/virtio/vhost.h b/include/hw/virtio/vhost.h

--- a/include/hw/virtio/vhost.h

+++ b/include/hw/virtio/vhost.h

@@ -XXX,XX +XXX,XX @@ struct vhost_dev {

int nvqs;

/* the first virtqueue which would be used by this vhost dev */

int vq_index;

+ /* if non-zero, minimum required value for max_queues */

+ int num_queues;

uint64_t features;

uint64_t acked_features;

uint64_t backend_features;

diff --git a/hw/block/vhost-user-blk.c b/hw/block/vhost-user-blk.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/block/vhost-user-blk.c

+++ b/hw/block/vhost-user-blk.c

@@ -XXX,XX +XXX,XX @@ static int vhost_user_blk_connect(DeviceState *dev, Error **errp)

}

s->connected = true;

+ s->dev.num_queues = s->num_queues;

s->dev.nvqs = s->num_queues;

s->dev.vqs = s->vhost_vqs;

s->dev.vq_index = 0;

diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/virtio/vhost-user.c

+++ b/hw/virtio/vhost-user.c

@@ -XXX,XX +XXX,XX @@ static int vhost_user_backend_init(struct vhost_dev *dev, void *opaque)

return err;

}

}

+ if (dev->num_queues && dev->max_queues < dev->num_queues) {

+ error_report("The maximum number of queues supported by the "

+ "backend is %" PRIu64, dev->max_queues);

+ return -EINVAL;

+ }

if (virtio_has_feature(features, VIRTIO_F_IOMMU_PLATFORM) &&

!(virtio_has_feature(dev->protocol_features,

2.30.2

Now that vhost_user_blk_connect() is not called from an event handler

any more, but directly from vhost_user_blk_device_realize(), we can

actually make use of Error again instead of calling error_report() in

the inner function and setting a more generic and therefore less useful

error message in realize() itself.

With Error, the callers are responsible for adding context if necessary

(such as the "-device" option the error refers to). Additional prefixes

are redundant and better omitted.

Acked-by: Raphael Norwitz <raphael.norwitz@nutanix.com>

Message-Id: <20210429171316.162022-4-kwolf@redhat.com>

Reviewed-by: Michael S. Tsirkin <mst@redhat.com>

hw/block/vhost-user-blk.c | 23 +++++++++++------------

1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/hw/block/vhost-user-blk.c b/hw/block/vhost-user-blk.c

--- a/hw/block/vhost-user-blk.c

+++ b/hw/block/vhost-user-blk.c

@@ -XXX,XX +XXX,XX @@ static void vhost_user_blk_reset(VirtIODevice *vdev)

vhost_dev_free_inflight(s->inflight);

-static int vhost_user_blk_connect(DeviceState *dev)

+static int vhost_user_blk_connect(DeviceState *dev, Error **errp)

VirtIODevice *vdev = VIRTIO_DEVICE(dev);

VHostUserBlk *s = VHOST_USER_BLK(vdev);

@@ -XXX,XX +XXX,XX @@ static int vhost_user_blk_connect(DeviceState *dev)

ret = vhost_dev_init(&s->dev, &s->vhost_user, VHOST_BACKEND_TYPE_USER, 0);

if (ret < 0) {

- error_report("vhost-user-blk: vhost initialization failed: %s",

- strerror(-ret));

+ error_setg_errno(errp, -ret, "vhost initialization failed");

return ret;

@@ -XXX,XX +XXX,XX @@ static int vhost_user_blk_connect(DeviceState *dev)

if (virtio_device_started(vdev, vdev->status)) {

ret = vhost_user_blk_start(vdev);

}

@@ -XXX,XX +XXX,XX @@ static void vhost_user_blk_event(void *opaque, QEMUChrEvent event)

DeviceState *dev = opaque;

VirtIODevice *vdev = VIRTIO_DEVICE(dev);

VHostUserBlk *s = VHOST_USER_BLK(vdev);

+ Error *local_err = NULL;

switch (event) {

case CHR_EVENT_OPENED:

- if (vhost_user_blk_connect(dev) < 0) {

+ if (vhost_user_blk_connect(dev, &local_err) < 0) {

+ error_report_err(local_err);

qemu_chr_fe_disconnect(&s->chardev);

return;

@@ -XXX,XX +XXX,XX @@ static void vhost_user_blk_device_realize(DeviceState *dev, Error **errp)

int i, ret;

if (!s->chardev.chr) {

- error_setg(errp, "vhost-user-blk: chardev is mandatory");

+ error_setg(errp, "chardev is mandatory");

return;

}

@@ -XXX,XX +XXX,XX @@ static void vhost_user_blk_device_realize(DeviceState *dev, Error **errp)

s->num_queues = 1;

}

if (!s->num_queues || s->num_queues > VIRTIO_QUEUE_MAX) {

- error_setg(errp, "vhost-user-blk: invalid number of IO queues");

+ error_setg(errp, "invalid number of IO queues");

return;

}

if (!s->queue_size) {

- error_setg(errp, "vhost-user-blk: queue size must be non-zero");

+ error_setg(errp, "queue size must be non-zero");

return;

}

if (s->queue_size > VIRTQUEUE_MAX_SIZE) {

- error_setg(errp, "vhost-user-blk: queue size must not exceed %d",

+ error_setg(errp, "queue size must not exceed %d",

VIRTQUEUE_MAX_SIZE);

return;

}

@@ -XXX,XX +XXX,XX @@ static void vhost_user_blk_device_realize(DeviceState *dev, Error **errp)