From nobody Wed Nov 27 09:42:35 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1700068911; cv=none; d=zohomail.com; s=zohoarc; b=iPQYC9W2qYR035yfWr+9DyYj+8boU8UJPJY0UAL5/enNCdEYC7K8+PJADXpHvO+ZVPDulHUSfzV8JkPi7Q8mW7HQxQv4H6+9DO2nhRa8+/v03ahLRRfDPJInIO9L3nyrFA3BYNnpEPOpHJa15f3Ydv2NIb+UrWWa6iGwEO2stm8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1700068911; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Na9PGV5lIOmwX1vov5wPeUWg4rBYLA40ZnySEIc1aCg=; b=krQ/ob8bI9fri9YMHGMCFisZJqJmgbk9pGSvu2u8okZi6Nyyu7jI/E7b8FyKjuO5nKxUvZOVU1z+nfCzgdCil6X2DlY5ye0o8+wC3c5d/70DtiE9QjJQ5gVcZZkgBkIz5I+leJ+Ip/g/MLZA58EVBdYOF74xPqJpv8N0LB/Kj9M= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1700068911943458.4835123714579; Wed, 15 Nov 2023 09:21:51 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r3JZ4-0007iQ-9y; Wed, 15 Nov 2023 12:20:34 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r3JZ1-0007ed-Sl for qemu-devel@nongnu.org; Wed, 15 Nov 2023 12:20:31 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r3JYz-0003DM-Oj for qemu-devel@nongnu.org; Wed, 15 Nov 2023 12:20:31 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-287-aKxu888iMS2lCCgn3PwGQg-1; Wed, 15 Nov 2023 12:20:27 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 44BDC89970C; Wed, 15 Nov 2023 17:20:23 +0000 (UTC) Received: from merkur.fritz.box (unknown [10.39.194.188]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6BC1936EE; Wed, 15 Nov 2023 17:20:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1700068828; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Na9PGV5lIOmwX1vov5wPeUWg4rBYLA40ZnySEIc1aCg=; b=TdohKf1bfSVLGSvTIKLKPZezA5rIH8E52PBzm0VG734PQHo6+1zxjCTrQRebNPBq1rppeE pymAacJhUOcoFYb3NyXVYryyXXvCMJKGHmuRHh3NiyQp+a0IkOsvpsx0MBUBhotY+Jq7a7 V1UNv6qznJ6zvkyVwgL/7Q/Jc83hOKk= X-MC-Unique: aKxu888iMS2lCCgn3PwGQg-1 From: Kevin Wolf To: qemu-block@nongnu.org Cc: kwolf@redhat.com, hreitz@redhat.com, stefanha@redhat.com, qemu-devel@nongnu.org Subject: [PATCH for-8.2 4/4] iotests: Test two stream jobs in a single iothread Date: Wed, 15 Nov 2023 18:20:12 +0100 Message-ID: <20231115172012.112727-5-kwolf@redhat.com> In-Reply-To: <20231115172012.112727-1-kwolf@redhat.com> References: <20231115172012.112727-1-kwolf@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.1 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=kwolf@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.099, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1700068912719100012 Content-Type: text/plain; charset="utf-8" This tests two parallel stream jobs that will complete around the same time and run on two different disks in the same iothreads. It is loosely based on the bug report at https://issues.redhat.com/browse/RHEL-1761. For me, this test hangs reliably with the originally reported bug in blk_remove_bs(). After fixing it, it intermittently hangs for the bugs fixed after it, missing AioContext unlocking in bdrv_graph_wrunlock() and in stream_prepare(). The deadlocks seem to happen more frequently when the test directory is on tmpfs. Signed-off-by: Kevin Wolf --- tests/qemu-iotests/tests/iothreads-stream | 73 +++++++++++++++++++ tests/qemu-iotests/tests/iothreads-stream.out | 11 +++ 2 files changed, 84 insertions(+) create mode 100755 tests/qemu-iotests/tests/iothreads-stream create mode 100644 tests/qemu-iotests/tests/iothreads-stream.out diff --git a/tests/qemu-iotests/tests/iothreads-stream b/tests/qemu-iotests= /tests/iothreads-stream new file mode 100755 index 0000000000..dfd52ac2cc --- /dev/null +++ b/tests/qemu-iotests/tests/iothreads-stream @@ -0,0 +1,73 @@ +#!/usr/bin/env python3 +# group: rw quick auto +# +# 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 . +# +# Creator/Owner: Kevin Wolf + +import iotests + +iotests.script_initialize(supported_fmts=3D['qcow2'], + supported_platforms=3D['linux']) +iotests.verify_virtio_scsi_pci_or_ccw() + +with iotests.FilePath('disk1.img') as base1_path, \ + iotests.FilePath('disk1-snap.img') as snap1_path, \ + iotests.FilePath('disk2.img') as base2_path, \ + iotests.FilePath('disk2-snap.img') as snap2_path, \ + iotests.VM() as vm: + + img_size =3D '10M' + + # Only one iothread for both disks + vm.add_object('iothread,id=3Diothread0') + vm.add_device('virtio-scsi,iothread=3Diothread0') + + iotests.log('Preparing disks...') + for i, base_path, snap_path in ((0, base1_path, snap1_path), + (1, base2_path, snap2_path)): + iotests.qemu_img_create('-f', iotests.imgfmt, base_path, img_size) + iotests.qemu_img_create('-f', iotests.imgfmt, '-b', base_path, + '-F', iotests.imgfmt, snap_path) + + iotests.qemu_io_log('-c', f'write 0 {img_size}', base_path) + + vm.add_blockdev(f'file,node-name=3Ddisk{i}-base-file,filename=3D{b= ase_path}') + vm.add_blockdev(f'qcow2,node-name=3Ddisk{i}-base,file=3Ddisk{i}-ba= se-file') + vm.add_blockdev(f'file,node-name=3Ddisk{i}-file,filename=3D{snap_p= ath}') + vm.add_blockdev(f'qcow2,node-name=3Ddisk{i},file=3Ddisk{i}-file,' + f'backing=3Ddisk{i}-base') + vm.add_device(f'scsi-hd,drive=3Ddisk{i}') + + iotests.log('Launching VM...') + vm.launch() + + iotests.log('Starting stream jobs...') + iotests.log(vm.qmp('block-stream', device=3D'disk0', job_id=3D'job0')) + iotests.log(vm.qmp('block-stream', device=3D'disk1', job_id=3D'job1')) + + finished =3D 0 + while True: + try: + ev =3D vm.event_wait('JOB_STATUS_CHANGE', timeout=3D0.1) + if ev is not None and ev['data']['status'] =3D=3D 'null': + finished +=3D 1 + # The test is done once both jobs are gone + if finished =3D=3D 2: + break + except TimeoutError: + pass + vm.cmd('query-jobs') diff --git a/tests/qemu-iotests/tests/iothreads-stream.out b/tests/qemu-iot= ests/tests/iothreads-stream.out new file mode 100644 index 0000000000..ef134165e5 --- /dev/null +++ b/tests/qemu-iotests/tests/iothreads-stream.out @@ -0,0 +1,11 @@ +Preparing disks... +wrote 10485760/10485760 bytes at offset 0 +10 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) + +wrote 10485760/10485760 bytes at offset 0 +10 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) + +Launching VM... +Starting stream jobs... +{"return": {}} +{"return": {}} --=20 2.41.0