From: "Denis V. Lunev" <den@openvz.org>
To: andrey.drobyshev@virtuozzo.com
Cc: svt-core@virtuozzo.com, den@openvz.org
Subject: [PATCH hci-8.1 5/5] virtio-scsi-test: test UNMAP and WRITE SAME during inactivation #VSTOR-151532
Date: Mon, 26 Oct 2026 18:49:29 +0100 [thread overview]
Message-ID: <20261026174929.685720-6-den@openvz.org> (raw)
In-Reply-To: <20261026174929.685720-1-den@openvz.org>
From: Denis V. Lunev <den@openvz.org>
Inactivate all nodes while a multi-descriptor UNMAP, or a WRITE SAME
spanning several chunks, is in flight on a slow node and check that the
command completes. QEMU used to abort when the drain in
bdrv_inactivate_all() ended and resumed the request queued for the next
descriptor or chunk on an inactive node.
Signed-off-by: Denis V. Lunev <den@openvz.org>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Kevin Wolf <kwolf@redhat.com>
Cc: Hanna Reitz <hreitz@redhat.com>
Cc: Fabiano Rosas <farosas@suse.de>
Cc: Laurent Vivier <lvivier@redhat.com>
---
tests/qtest/virtio-scsi-test.c | 88 ++++++++++++++++++++++++++++++++++
1 file changed, 88 insertions(+)
diff --git a/tests/qtest/virtio-scsi-test.c b/tests/qtest/virtio-scsi-test.c
index bc1edf046c2..16153c6e9ec 100644
--- a/tests/qtest/virtio-scsi-test.c
+++ b/tests/qtest/virtio-scsi-test.c
@@ -269,6 +269,68 @@ static void test_unmap_large_lba(void *obj, void *data,
qvirtio_scsi_pci_free(vs);
}
+static void inactivate_during_command(QVirtioSCSIPCI *scsi_pci,
+ QGuestAllocator *t_alloc,
+ const uint8_t *cdb,
+ uint8_t *data_out, size_t data_out_len)
+{
+ QVirtioSCSIQueues *vs;
+ VirtioSCSICmd cmd;
+ struct virtio_scsi_cmd_resp resp;
+
+ alloc = t_alloc;
+ vs = qvirtio_scsi_init(scsi_pci->scsi.vdev);
+
+ virtio_scsi_submit_command(vs, cdb, NULL, 0, data_out, data_out_len,
+ &cmd);
+ qtest_qmp_assert_success(scsi_pci->pci_vdev.pdev->bus->qts,
+ "{'execute': 'blockdev-set-active',"
+ " 'arguments': {'active': false}}");
+
+ /* The drain must have waited for the whole command */
+ virtio_scsi_wait_command(vs, &cmd, &resp, 0);
+ g_assert_cmphex(resp.response, ==, 0);
+ g_assert_cmphex(resp.status, ==, GOOD);
+
+ qvirtio_scsi_pci_free(vs);
+}
+
+static void test_unmap_inactivate(void *obj, void *data,
+ QGuestAllocator *t_alloc)
+{
+ const uint8_t unmap[VIRTIO_SCSI_CDB_SIZE] = {
+ 0x42, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x48, 0x00
+ };
+ uint8_t unmap_params[0x48] = {
+ 0x00, 0x46, /* unmap data length */
+ 0x00, 0x40, /* unmap block descriptor data length */
+ };
+ int i;
+
+ for (i = 0; i < 4; i++) {
+ uint8_t *desc = &unmap_params[8 + i * 16];
+
+ desc[7] = i * 8; /* LBA */
+ desc[11] = 1; /* sector count */
+ }
+
+ inactivate_during_command(obj, t_alloc, unmap, unmap_params,
+ sizeof(unmap_params));
+}
+
+static void test_write_same_inactivate(void *obj, void *data,
+ QGuestAllocator *t_alloc)
+{
+ /* 2 MiB of non-zero data is written in 512 KiB chunks */
+ const uint8_t write_same[VIRTIO_SCSI_CDB_SIZE] = {
+ 0x41, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00
+ };
+ uint8_t buf[512];
+
+ memset(buf, 0xa5, sizeof(buf));
+ inactivate_during_command(obj, t_alloc, write_same, buf, sizeof(buf));
+}
+
static void test_write_to_cdrom(void *obj, void *data,
QGuestAllocator *t_alloc)
{
@@ -373,6 +435,20 @@ static void *virtio_scsi_setup_4k(GString *cmd_line, void *arg)
return arg;
}
+/* Each request must outlast the kick-to-QMP round trip on a loaded host */
+static void *virtio_scsi_setup_slow(GString *cmd_line, void *arg)
+{
+ g_string_append_printf(cmd_line,
+ " -blockdev null-co,node-name=null0,read-zeroes=on"
+ " -blockdev blkdebug,image=null0,node-name=dbg,"
+ "discard=unmap,inject-error.0.event=none,"
+ "inject-error.0.iotype=%s,inject-error.0.errno=0,"
+ "inject-error.0.delay-ns=100000000"
+ " -device scsi-hd,drive=dbg,lun=0,scsi-id=1",
+ (const char *)arg);
+ return arg;
+}
+
static void *virtio_scsi_setup_cd(GString *cmd_line, void *arg)
{
g_string_append(cmd_line,
@@ -410,6 +486,18 @@ static void register_virtio_scsi_test(void)
opts.before = virtio_scsi_setup_cd;
qos_add_test("write-to-cdrom", "virtio-scsi", test_write_to_cdrom, &opts);
+ /* ioeventfd=off starts the command before the kick returns */
+ opts.before = virtio_scsi_setup_slow;
+ opts.edge = (QOSGraphEdgeOptions) {
+ .extra_device_opts = "ioeventfd=off",
+ };
+ opts.arg = (void *)"discard";
+ qos_add_test("unmap-inactivate", "virtio-scsi-pci",
+ test_unmap_inactivate, &opts);
+ opts.arg = (void *)"write";
+ qos_add_test("write-same-inactivate", "virtio-scsi-pci",
+ test_write_same_inactivate, &opts);
+
opts.before = virtio_scsi_setup_iothread;
opts.edge = (QOSGraphEdgeOptions) {
.extra_device_opts = "iothread=thread0",
--
2.53.0
next prev parent reply other threads:[~2026-10-26 17:49 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-26 17:49 [PATCH hci-8.1 0/5] scsi-disk: fix UNMAP and WRITE SAME racing with " Denis V. Lunev
2026-10-26 17:49 ` [PATCH hci-8.1 1/5] scsi-disk: check all UNMAP descriptors before discarding any #VSTOR-151532 Denis V. Lunev
2026-10-26 17:49 ` [PATCH hci-8.1 2/5] scsi-disk: fix UNMAP racing with inactivation of block nodes #VSTOR-151532 Denis V. Lunev
2026-10-26 17:49 ` [PATCH hci-8.1 3/5] scsi-disk: fix WRITE SAME " Denis V. Lunev
2026-10-26 17:49 ` [PATCH hci-8.1 4/5] virtio-scsi-test: split virtio_scsi_do_command() into submit and wait #VSTOR-151532 Denis V. Lunev
2026-10-26 17:49 ` Denis V. Lunev [this message]
2026-10-27 10:56 ` [PATCH hci-8.1 0/5] scsi-disk: fix UNMAP and WRITE SAME racing with inactivation #VSTOR-151532 Andrey Drobyshev
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261026174929.685720-6-den@openvz.org \
--to=den@openvz.org \
--cc=andrey.drobyshev@virtuozzo.com \
--cc=svt-core@virtuozzo.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox