From nobody Sun Feb 8 20:17:54 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1558466334; cv=none; d=zoho.com; s=zohoarc; b=N+tIUlZBwEnJMIfGQ6+91Df4ugrW0YLOsCahjB3pRdL2HEp5e+mfR0/sVGQET1CVjARhbCH28Wi9pV1meN8TuF7nQLaYxS8fKzrbCEtStWsKlQZSiQUagMxkdSMgTcK+m+o1HVRADPIPi7KG8vRPn225Sne8XSBE+mx0Cem7VEM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1558466334; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=WCAogiLeDNbpk3fyDfqMpUYNWOQv062Sqhu/D/Ny81M=; b=DhuyCYJtV0q3lBKAUqLoFJw9GaB8iAah5//oneTaIyvOdQPt+eubmhwFHYpM2FPqQy0rYPlxSL9PRhXW2dq8xGWYZOVoXSU0TtP4Pny0L9Jbkp72M5FWPPiFa0n6HQb4dHqsVYJEbfq8z0DEYySC02yHU3mqKsYLxwkrLYpqPAo= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1558466334389714.6490816504041; Tue, 21 May 2019 12:18:54 -0700 (PDT) Received: from localhost ([127.0.0.1]:58214 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hTAHe-0000i5-GQ for importer@patchew.org; Tue, 21 May 2019 15:18:46 -0400 Received: from eggs.gnu.org ([209.51.188.92]:46795) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hTAFv-0007v1-94 for qemu-devel@nongnu.org; Tue, 21 May 2019 15:17:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hTAFu-0000DV-BM for qemu-devel@nongnu.org; Tue, 21 May 2019 15:16:59 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52050) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hTAFr-0000B6-Nt; Tue, 21 May 2019 15:16:55 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 71C3F5D61C; Tue, 21 May 2019 19:16:48 +0000 (UTC) Received: from linux.fritz.box.com (ovpn-117-63.ams2.redhat.com [10.36.117.63]) by smtp.corp.redhat.com (Postfix) with ESMTP id 613DC6013B; Tue, 21 May 2019 19:16:45 +0000 (UTC) From: Kevin Wolf To: qemu-block@nongnu.org Date: Tue, 21 May 2019 21:16:37 +0200 Message-Id: <20190521191638.32713-2-kwolf@redhat.com> In-Reply-To: <20190521191638.32713-1-kwolf@redhat.com> References: <20190521191638.32713-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Tue, 21 May 2019 19:16:55 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 1/2] block: Drain source node in bdrv_replace_node() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, qemu-devel@nongnu.org, mreitz@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Instead of just asserting that no requests are in flight in bdrv_replace_node(), which is a requirement that most callers ignore, we can just drain the source node right there. This fixes at least starting a commit job while I/O is active on the backing chain, but probably other callers, too. Having requests in flight on the target node isn't a problem because the target just gets new parents, but the call path of running requests isn't modified. So we can just drop this assertion without a replacement. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=3D1711643 Signed-off-by: Kevin Wolf Reviewed-by: Max Reitz --- block.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/block.c b/block.c index cb11537029..75f370dbba 100644 --- a/block.c +++ b/block.c @@ -4021,13 +4021,13 @@ void bdrv_replace_node(BlockDriverState *from, Bloc= kDriverState *to, uint64_t perm =3D 0, shared =3D BLK_PERM_ALL; int ret; =20 - assert(!atomic_read(&from->in_flight)); - assert(!atomic_read(&to->in_flight)); - /* Make sure that @from doesn't go away until we have successfully att= ached * all of its parents to @to. */ bdrv_ref(from); =20 + assert(qemu_get_current_aio_context() =3D=3D qemu_get_aio_context()); + bdrv_drained_begin(from); + /* Put all parents into @list and calculate their cumulative permissio= ns */ QLIST_FOREACH_SAFE(c, &from->parents, next_parent, next) { assert(c->bs =3D=3D from); @@ -4068,6 +4068,7 @@ void bdrv_replace_node(BlockDriverState *from, BlockD= riverState *to, =20 out: g_slist_free(list); + bdrv_drained_end(from); bdrv_unref(from); } =20 --=20 2.20.1 From nobody Sun Feb 8 20:17:54 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1558466359; cv=none; d=zoho.com; s=zohoarc; b=X/vnP/zjZMK6xqj87LcCXs5vQPVEaiFO66sYhZz+XE7rKvSqizKT1P/lMFU3qgecKpRMe9t9Mfi/nm1wRE2PCiMwx8xQ8gOeZAeueQ67v4z/OrKJhTsv2E/R/ITiF2yvl9UdXttO+wlcBfdJ07TwiRpsOC4Z5Y6uz/RAeK5CpKo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1558466359; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=5/fV9D4E5Q+q6+/hdnzUDct8hCi2oYT7+F+f1c4uLbI=; b=L9rE8k5HUWiZzPXIQNz7aYvzkPf5Gbq71A/fZoZaE64hZ3b9WdlXaxYWdqAI4DzEOCkLvqXydKRmiggRsG8Gk8rJJ9XPBaoIjG5pSWm7BhVf97ffnqdEI5SVwJwCPyUNCa9LQsYkJ597nP0D9tn0LlzNBnGqz51SrCcx9Q0Tt5g= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1558466359530174.1740149069558; Tue, 21 May 2019 12:19:19 -0700 (PDT) Received: from localhost ([127.0.0.1]:58216 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hTAI5-000133-FN for importer@patchew.org; Tue, 21 May 2019 15:19:13 -0400 Received: from eggs.gnu.org ([209.51.188.92]:46819) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hTAG1-00089d-Av for qemu-devel@nongnu.org; Tue, 21 May 2019 15:17:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hTAG0-0000ND-0p for qemu-devel@nongnu.org; Tue, 21 May 2019 15:17:05 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54740) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hTAFw-0000Es-Pi; Tue, 21 May 2019 15:17:00 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D17AB30917AB; Tue, 21 May 2019 19:16:49 +0000 (UTC) Received: from linux.fritz.box.com (ovpn-117-63.ams2.redhat.com [10.36.117.63]) by smtp.corp.redhat.com (Postfix) with ESMTP id C153D6013C; Tue, 21 May 2019 19:16:48 +0000 (UTC) From: Kevin Wolf To: qemu-block@nongnu.org Date: Tue, 21 May 2019 21:16:38 +0200 Message-Id: <20190521191638.32713-3-kwolf@redhat.com> In-Reply-To: <20190521191638.32713-1-kwolf@redhat.com> References: <20190521191638.32713-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]); Tue, 21 May 2019 19:16:54 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 2/2] iotests: Test commit job start with concurrent I/O X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, qemu-devel@nongnu.org, mreitz@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" This tests that concurrent requests are correctly drained before making graph modifications instead of running into assertions in bdrv_replace_node(). Signed-off-by: Kevin Wolf Reviewed-by: Max Reitz --- tests/qemu-iotests/255 | 83 +++++++++++++++++++++++++++++++++++ tests/qemu-iotests/255.out | 16 +++++++ tests/qemu-iotests/group | 1 + tests/qemu-iotests/iotests.py | 10 ++++- 4 files changed, 109 insertions(+), 1 deletion(-) create mode 100755 tests/qemu-iotests/255 create mode 100644 tests/qemu-iotests/255.out diff --git a/tests/qemu-iotests/255 b/tests/qemu-iotests/255 new file mode 100755 index 0000000000..c0bb37a9b0 --- /dev/null +++ b/tests/qemu-iotests/255 @@ -0,0 +1,83 @@ +#!/usr/bin/env python +# +# Test commit job graph modifications while requests are active +# +# Copyright (C) 2019 Red Hat, Inc. +# +# Creator/Owner: Kevin Wolf +# +# 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 . +# + +import iotests +from iotests import imgfmt + +iotests.verify_image_format(supported_fmts=3D['qcow2']) + +def blockdev_create(vm, options): + result =3D vm.qmp_log('blockdev-create', + filters=3D[iotests.filter_qmp_testfiles], + job_id=3D'job0', options=3Doptions) + + if 'return' in result: + assert result['return'] =3D=3D {} + vm.run_job('job0') + iotests.log("") + +with iotests.FilePath('t.qcow2') as disk_path, \ + iotests.FilePath('t.qcow2.mid') as mid_path, \ + iotests.FilePath('t.qcow2.base') as base_path, \ + iotests.VM() as vm: + + iotests.log("=3D=3D=3D Create backing chain and start VM =3D=3D=3D") + iotests.log("") + + size =3D 128 * 1024 * 1024 + size_str =3D str(size) + + iotests.create_image(base_path, size) + iotests.qemu_img_log('create', '-f', iotests.imgfmt, mid_path, size_st= r) + iotests.qemu_img_log('create', '-f', iotests.imgfmt, disk_path, size_s= tr) + + # Create a backing chain like this: + # base <- [throttled: bps-read=3D4096] <- mid <- overlay + + vm.add_object('throttle-group,x-bps-read=3D4096,id=3Dthrottle0') + vm.add_blockdev('file,filename=3D%s,node-name=3Dbase' % (base_path)) + vm.add_blockdev('throttle,throttle-group=3Dthrottle0,file=3Dbase,node-= name=3Dthrottled') + vm.add_blockdev('file,filename=3D%s,node-name=3Dmid-file' % (mid_path)) + vm.add_blockdev('qcow2,file=3Dmid-file,node-name=3Dmid,backing=3Dthrot= tled') + vm.add_drive_raw('if=3Dnone,id=3Doverlay,driver=3Dqcow2,file=3D%s,back= ing=3Dmid' % (disk_path)) + + vm.launch() + + iotests.log("=3D=3D=3D Start background read requests =3D=3D=3D") + iotests.log("") + + def start_requests(): + vm.hmp_qemu_io('overlay', 'aio_read 0 4k') + vm.hmp_qemu_io('overlay', 'aio_read 0 4k') + + start_requests() + + iotests.log("=3D=3D=3D Run a commit job =3D=3D=3D") + iotests.log("") + + result =3D vm.qmp_log('block-commit', job_id=3D'job0', auto_finalize= =3DFalse, + device=3D'overlay', top_node=3D'mid') + + vm.run_job('job0', auto_finalize=3DFalse, pre_finalize=3Dstart_request= s, + auto_dismiss=3DTrue) + + vm.shutdown() diff --git a/tests/qemu-iotests/255.out b/tests/qemu-iotests/255.out new file mode 100644 index 0000000000..9a2d7cbb77 --- /dev/null +++ b/tests/qemu-iotests/255.out @@ -0,0 +1,16 @@ +=3D=3D=3D Create backing chain and start VM =3D=3D=3D + +Formatting 'TEST_DIR/PID-t.qcow2.mid', fmt=3Dqcow2 size=3D134217728 cluste= r_size=3D65536 lazy_refcounts=3Doff refcount_bits=3D16 + +Formatting 'TEST_DIR/PID-t.qcow2', fmt=3Dqcow2 size=3D134217728 cluster_si= ze=3D65536 lazy_refcounts=3Doff refcount_bits=3D16 + +=3D=3D=3D Start background read requests =3D=3D=3D + +=3D=3D=3D Run a commit job =3D=3D=3D + +{"execute": "block-commit", "arguments": {"auto-finalize": false, "device"= : "overlay", "job-id": "job0", "top-node": "mid"}} +{"return": {}} +{"execute": "job-finalize", "arguments": {"id": "job0"}} +{"return": {}} +{"data": {"id": "job0", "type": "commit"}, "event": "BLOCK_JOB_PENDING", "= timestamp": {"microseconds": "USECS", "seconds": "SECS"}} +{"data": {"device": "job0", "len": 134217728, "offset": 134217728, "speed"= : 0, "type": "commit"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"micr= oseconds": "USECS", "seconds": "SECS"}} diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group index 52b7c16e15..2758f48143 100644 --- a/tests/qemu-iotests/group +++ b/tests/qemu-iotests/group @@ -251,3 +251,4 @@ 249 rw auto quick 252 rw auto backing quick 253 rw auto quick +255 rw auto quick diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index 7bde380d96..6bcddd8870 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -126,6 +126,11 @@ def qemu_img_pipe(*args): sys.stderr.write('qemu-img received signal %i: %s\n' % (-exitcode,= ' '.join(qemu_img_args + list(args)))) return subp.communicate()[0] =20 +def qemu_img_log(*args): + result =3D qemu_img_pipe(*args) + log(result, filters=3D[filter_testfiles]) + return result + def img_info_log(filename, filter_path=3DNone, imgopts=3DFalse, extra_args= =3D[]): args =3D [ 'info' ] if imgopts: @@ -533,7 +538,8 @@ class VM(qtest.QEMUQtestMachine): return result =20 # Returns None on success, and an error string on failure - def run_job(self, job, auto_finalize=3DTrue, auto_dismiss=3DFalse): + def run_job(self, job, auto_finalize=3DTrue, auto_dismiss=3DFalse, + pre_finalize=3DNone): error =3D None while True: for ev in self.get_qmp_events_filtered(wait=3DTrue): @@ -546,6 +552,8 @@ class VM(qtest.QEMUQtestMachine): error =3D j['error'] log('Job failed: %s' % (j['error'])) elif status =3D=3D 'pending' and not auto_finalize: + if pre_finalize: + pre_finalize() self.qmp_log('job-finalize', id=3Djob) elif status =3D=3D 'concluded' and not auto_dismiss: self.qmp_log('job-dismiss', id=3Djob) --=20 2.20.1