qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Kevin Wolf <kwolf@redhat.com>
To: qemu-block@nongnu.org
Cc: kwolf@redhat.com, stefanha@redhat.com, hreitz@redhat.com,
	eblake@redhat.com, qemu-devel@nongnu.org
Subject: [PATCH 12/12] iotests: Test blockdev-create in iothread
Date: Thu, 25 May 2023 14:47:13 +0200	[thread overview]
Message-ID: <20230525124713.401149-13-kwolf@redhat.com> (raw)
In-Reply-To: <20230525124713.401149-1-kwolf@redhat.com>

If blockdev-create references an existing node in an iothread (e.g. as
it's 'file' child), then suddenly all of the image creation code must
run in that AioContext, too. Test that this actually works.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 tests/qemu-iotests/tests/iothreads-create     | 67 +++++++++++++++++++
 tests/qemu-iotests/tests/iothreads-create.out |  4 ++
 2 files changed, 71 insertions(+)
 create mode 100755 tests/qemu-iotests/tests/iothreads-create
 create mode 100644 tests/qemu-iotests/tests/iothreads-create.out

diff --git a/tests/qemu-iotests/tests/iothreads-create b/tests/qemu-iotests/tests/iothreads-create
new file mode 100755
index 0000000000..0c862d73f2
--- /dev/null
+++ b/tests/qemu-iotests/tests/iothreads-create
@@ -0,0 +1,67 @@
+#!/usr/bin/env python3
+# group: rw quick
+#
+# Copyright (C) 2023 Red Hat, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Creator/Owner: Kevin Wolf <kwolf@redhat.com>
+
+import asyncio
+import iotests
+
+iotests.script_initialize(supported_fmts=['qcow2', 'qcow', 'qed', 'vdi',
+                                          'vmdk', 'parallels'])
+iotests.verify_virtio_scsi_pci_or_ccw()
+
+with iotests.FilePath('disk.img') as img_path, \
+     iotests.VM() as vm:
+
+    iotests.qemu_img_create('-f', 'raw', img_path, '0')
+
+    vm.add_object('iothread,id=iothread0')
+    vm.add_blockdev(f'file,node-name=img-file,read-only=on,'
+                    f'filename={img_path}')
+    vm.add_device('virtio-scsi,iothread=iothread0')
+    vm.add_device('scsi-hd,drive=img-file,share-rw=on')
+
+    vm.launch()
+
+    iotests.log(vm.qmp(
+        'blockdev-reopen',
+        options=[{
+            'driver': 'file',
+            'filename': img_path,
+            'node-name': 'img-file',
+            'read-only': False,
+        }],
+    ))
+    iotests.log(vm.qmp(
+        'blockdev-create',
+        job_id='job0',
+        options={
+            'driver': iotests.imgfmt,
+            'file': 'img-file',
+            'size': 1024 * 1024,
+        },
+    ))
+
+    # Should succeed and not time out
+    try:
+        vm.run_job('job0', wait=5.0)
+        vm.shutdown()
+    except asyncio.TimeoutError:
+        # VM may be stuck, kill it
+        vm.kill()
+        raise
diff --git a/tests/qemu-iotests/tests/iothreads-create.out b/tests/qemu-iotests/tests/iothreads-create.out
new file mode 100644
index 0000000000..5c974ff77e
--- /dev/null
+++ b/tests/qemu-iotests/tests/iothreads-create.out
@@ -0,0 +1,4 @@
+{"return": {}}
+{"return": {}}
+{"execute": "job-dismiss", "arguments": {"id": "job0"}}
+{"return": {}}
-- 
2.40.1



  parent reply	other threads:[~2023-05-25 12:49 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-05-25 12:47 [PATCH 00/12] block: Fix blockdev-create with iothreads Kevin Wolf
2023-05-25 12:47 ` [PATCH 01/12] block-coroutine-wrapper: Take AioContext lock in no_co_wrappers Kevin Wolf
2023-05-25 18:15   ` Stefan Hajnoczi
2023-05-25 12:47 ` [PATCH 02/12] block: Clarify locking rules for bdrv_open(_inherit)() Kevin Wolf
2023-05-25 18:16   ` Stefan Hajnoczi
2023-05-25 12:47 ` [PATCH 03/12] block: Take main AioContext lock when calling bdrv_open() Kevin Wolf
2023-05-25 18:20   ` Stefan Hajnoczi
2023-05-26  8:27     ` Kevin Wolf
2023-05-25 12:47 ` [PATCH 04/12] block-backend: Fix blk_new_open() for iothreads Kevin Wolf
2023-05-25 18:37   ` Stefan Hajnoczi
2023-05-25 12:47 ` [PATCH 05/12] mirror: Hold main AioContext lock for calling bdrv_open_backing_file() Kevin Wolf
2023-05-25 18:40   ` Stefan Hajnoczi
2023-05-25 12:47 ` [PATCH 06/12] qcow2: Fix open with 'file' in iothread Kevin Wolf
2023-05-25 18:51   ` Stefan Hajnoczi
2023-05-26  8:40     ` Kevin Wolf
2023-05-26  9:04       ` Kevin Wolf
2023-05-25 12:47 ` [PATCH 07/12] raw-format: " Kevin Wolf
2023-05-25 18:52   ` Stefan Hajnoczi
2023-05-25 12:47 ` [PATCH 08/12] copy-before-write: Fix open with child " Kevin Wolf
2023-05-25 18:55   ` Stefan Hajnoczi
2023-05-26 14:30   ` Eric Blake
2023-05-25 12:47 ` [PATCH 09/12] block: Take AioContext lock in bdrv_open_driver() Kevin Wolf
2023-05-25 18:56   ` Stefan Hajnoczi
2023-05-25 12:47 ` [PATCH 10/12] block: Fix AioContext locking in bdrv_insert_node() Kevin Wolf
2023-05-25 18:58   ` Stefan Hajnoczi
2023-05-25 12:47 ` [PATCH 11/12] iotests: Make verify_virtio_scsi_pci_or_ccw() public Kevin Wolf
2023-05-25 18:59   ` Stefan Hajnoczi
2023-05-25 12:47 ` Kevin Wolf [this message]
2023-05-25 19:01   ` [PATCH 12/12] iotests: Test blockdev-create in iothread Stefan Hajnoczi

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=20230525124713.401149-13-kwolf@redhat.com \
    --to=kwolf@redhat.com \
    --cc=eblake@redhat.com \
    --cc=hreitz@redhat.com \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=stefanha@redhat.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;
as well as URLs for NNTP newsgroup(s).