[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 08/13] tests/qtest/virtio-scsi-test: add unmap large LBA with 4k b
From: |
Paolo Bonzini |
Subject: |
[PULL 08/13] tests/qtest/virtio-scsi-test: add unmap large LBA with 4k blocks test |
Date: |
Fri, 4 Jun 2021 17:17:40 +0200 |
From: Kit Westneat <kit.westneat@gmail.com>
Add test for issue #345
Signed-off-by: Kit Westneat <kit.westneat@gmail.com>
Message-Id: <20210603142022.676395-1-kit.westneat@gmail.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
tests/qtest/virtio-scsi-test.c | 51 ++++++++++++++++++++++++++++++++++
1 file changed, 51 insertions(+)
diff --git a/tests/qtest/virtio-scsi-test.c b/tests/qtest/virtio-scsi-test.c
index 1b7ecc1c8f..8ceb12aacd 100644
--- a/tests/qtest/virtio-scsi-test.c
+++ b/tests/qtest/virtio-scsi-test.c
@@ -200,6 +200,42 @@ static void test_unaligned_write_same(void *obj, void
*data,
qvirtio_scsi_pci_free(vs);
}
+/* Test UNMAP with a large LBA, issue #345 */
+static void test_unmap_large_lba(void *obj, void *data,
+ QGuestAllocator *t_alloc)
+{
+ QVirtioSCSI *scsi = obj;
+ QVirtioSCSIQueues *vs;
+ const uint8_t unmap[VIRTIO_SCSI_CDB_SIZE] = {
+ 0x42, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00
+ };
+
+ /*
+ * Default null-co device size is 2**30
+ * LBA 0x7fff is ~ 1/8 into device, with 4k blocks
+ * if check_lba_range incorrectly using 512 bytes, will trigger sense error
+ */
+ uint8_t unmap_params[0x18] = {
+ 0x00, 0x16, /* unmap data length */
+ 0x00, 0x10, /* unmap block descriptor data length */
+ 0x00, 0x00, 0x00, 0x00, /* reserved */
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0xff, /* LBA */
+ 0x00, 0x00, 0x03, 0xff, /* sector count */
+ 0x00, 0x00, 0x00, 0x00, /* reserved */
+ };
+ struct virtio_scsi_cmd_resp resp;
+
+ alloc = t_alloc;
+ vs = qvirtio_scsi_init(scsi->vdev);
+
+ virtio_scsi_do_command(vs, unmap, NULL, 0, unmap_params,
+ sizeof(unmap_params), &resp);
+ g_assert_cmphex(resp.response, ==, 0);
+ g_assert_cmphex(resp.status, !=, CHECK_CONDITION);
+
+ qvirtio_scsi_pci_free(vs);
+}
+
static void test_write_to_cdrom(void *obj, void *data,
QGuestAllocator *t_alloc)
{
@@ -293,6 +329,17 @@ static void *virtio_scsi_setup(GString *cmd_line, void
*arg)
return arg;
}
+static void *virtio_scsi_setup_4k(GString *cmd_line, void *arg)
+{
+ g_string_append(cmd_line,
+ " -drive file=blkdebug::null-co://,"
+ "file.image.read-zeroes=on,"
+ "if=none,id=dr1,format=raw "
+ "-device scsi-hd,drive=dr1,lun=0,scsi-id=1"
+ ",logical_block_size=4k,physical_block_size=4k");
+ return arg;
+}
+
static void *virtio_scsi_setup_cd(GString *cmd_line, void *arg)
{
g_string_append(cmd_line,
@@ -323,6 +370,10 @@ static void register_virtio_scsi_test(void)
qos_add_test("unaligned-write-same", "virtio-scsi",
test_unaligned_write_same, &opts);
+ opts.before = virtio_scsi_setup_4k;
+ qos_add_test("large-lba-unmap", "virtio-scsi",
+ test_unmap_large_lba, &opts);
+
opts.before = virtio_scsi_setup_cd;
qos_add_test("write-to-cdrom", "virtio-scsi", test_write_to_cdrom, &opts);
--
2.31.1
- [PULL 00/13] Misc bugfix patches for 2021-06-04, Paolo Bonzini, 2021/06/04
- [PULL 02/13] iscsi: link libm into the module, Paolo Bonzini, 2021/06/04
- [PULL 01/13] meson: allow optional dependencies for block modules, Paolo Bonzini, 2021/06/04
- [PULL 03/13] oslib-posix: Remove OpenBSD workaround for fcntl("/dev/null", F_SETFL, O_NONBLOCK) failure, Paolo Bonzini, 2021/06/04
- [PULL 04/13] target/i386: tcg: fix segment register offsets for 16-bit TSS, Paolo Bonzini, 2021/06/04
- [PULL 05/13] target/i386: tcg: fix loading of registers from 16-bit TSS, Paolo Bonzini, 2021/06/04
- [PULL 08/13] tests/qtest/virtio-scsi-test: add unmap large LBA with 4k blocks test,
Paolo Bonzini <=
- [PULL 07/13] target/i386: Fix decode of cr8, Paolo Bonzini, 2021/06/04
- [PULL 06/13] target/i386: tcg: fix switching from 16-bit to 32-bit tasks or vice versa, Paolo Bonzini, 2021/06/04
- [PULL 09/13] i386: reorder call to cpu_exec_realizefn, Paolo Bonzini, 2021/06/04
- [PULL 12/13] vl: plumb keyval-based options into -readconfig, Paolo Bonzini, 2021/06/04
- [PULL 10/13] i386: run accel_cpu_instance_init as post_init, Paolo Bonzini, 2021/06/04
- [PULL 11/13] qemu-config: parse configuration files to a QDict, Paolo Bonzini, 2021/06/04
- [PULL 13/13] vl: plug -object back into -readconfig, Paolo Bonzini, 2021/06/04
- Re: [PULL 00/13] Misc bugfix patches for 2021-06-04, Peter Maydell, 2021/06/05