From nobody Thu Nov 13 19:23:02 2025 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1582641169; cv=none; d=zohomail.com; s=zohoarc; b=T4MUDSTChiv8PCWbRUEGpg28IA2rWrvagd6GgqEDVemNMHlypXm0f50tG6MURc2+wAKKhPV0AkVfJINLNdjKieU+2k8vGeQNg+VMFuLzq7bTcNDD4RU3H9bemUygHG7icZnPlcMCPdqmslcLRzZ8DxxiQ7ljVRHH6BE5frU+9bs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1582641169; h=Content-Type: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; bh=xRTsAP4sEyii5NTzDPqB0L9DG+RxCVYCepurkg2rPhc=; b=kErgYZkrogEbq/MfansLOpg37+k3W7jiX5Jb1YWfrrR4fK9t8+Po+KefJRWoRtc07pn+uBHHuVOMJpPDBnZSAajLq2Z5x8go7kUAJhKFmKBRLJYDdxPSy6FJj5PIedBCRSURzuB2TDDL/cTgX+BiNB8gl9lJjWssoAqsPP649YU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1582641169497992.4874260052404; Tue, 25 Feb 2020 06:32:49 -0800 (PST) Received: from localhost ([::1]:57880 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6bGS-0004OF-80 for importer@patchew.org; Tue, 25 Feb 2020 09:32:48 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49135) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6bFR-0002qC-RP for qemu-devel@nongnu.org; Tue, 25 Feb 2020 09:31:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j6bFO-0008CR-56 for qemu-devel@nongnu.org; Tue, 25 Feb 2020 09:31:45 -0500 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:49311 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j6bFN-0008AG-Tq for qemu-devel@nongnu.org; Tue, 25 Feb 2020 09:31:42 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-386-fIrDQ02ZOrGsqlp1Y4L0ow-1; Tue, 25 Feb 2020 09:31:35 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8D1C7107ACCA; Tue, 25 Feb 2020 14:31:34 +0000 (UTC) Received: from localhost (ovpn-117-215.ams2.redhat.com [10.36.117.215]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 283B9385; Tue, 25 Feb 2020 14:31:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582641100; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xRTsAP4sEyii5NTzDPqB0L9DG+RxCVYCepurkg2rPhc=; b=hH9gCBc0pXyH847/sDj83JiHrcqClvEzo1Pz0Uha5jD7Do3hrHQkpNmCPWQxxy/6sdNFDQ Rs9UDs7vgvMVeGrFX2fIrJMViyCtm2AM+L0iW/d+kmdEWBt51jrU9LPOJ1zfbJd+XA9S5b BnGflJfNCwWOdY24+8rEts3NdtYBsc0= X-MC-Unique: fIrDQ02ZOrGsqlp1Y4L0ow-1 From: Max Reitz To: qemu-block@nongnu.org Subject: [PATCH 1/3] qcow2: Fix alloc_cluster_abort() for pre-existing clusters Date: Tue, 25 Feb 2020 15:31:28 +0100 Message-Id: <20200225143130.111267-2-mreitz@redhat.com> In-Reply-To: <20200225143130.111267-1-mreitz@redhat.com> References: <20200225143130.111267-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.61 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , qemu-stable@nongnu.org, qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" handle_alloc() reuses preallocated zero clusters. If anything goes wrong during the data write, we do not change their L2 entry, so we must not let qcow2_alloc_cluster_abort() free them. Fixes: 8b24cd141549b5b264baeddd4e72902cfb5de23b Cc: qemu-stable@nongnu.org Signed-off-by: Max Reitz --- block/qcow2-cluster.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c index 78c95dfa16..17f1363279 100644 --- a/block/qcow2-cluster.c +++ b/block/qcow2-cluster.c @@ -1026,7 +1026,7 @@ err: void qcow2_alloc_cluster_abort(BlockDriverState *bs, QCowL2Meta *m) { BDRVQcow2State *s =3D bs->opaque; - if (!has_data_file(bs)) { + if (!has_data_file(bs) && !m->keep_old_clusters) { qcow2_free_clusters(bs, m->alloc_offset, m->nb_clusters << s->cluster_bits, QCOW2_DISCARD_NEVER); --=20 2.24.1 From nobody Thu Nov 13 19:23:02 2025 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1582641173; cv=none; d=zohomail.com; s=zohoarc; b=gFbBFZlb8+dCafnbeE2T7l4Ug89Ko06rE/cJ1gfM2h4abtWlfNeDuyYyCB38ttyvrM+uRN+gpdrVqMgOPOXKEpHrEqT1mPU5GrYEZeArBJb3nwEutlUBp0S4Srrls+1/GBpiUVYXYit097caqhFdjm+Xhu5WRkcKL3+R3K+7o2g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1582641173; h=Content-Type: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; bh=WbiUQRXAwgj3sBgL9gakHEuoq4xLbmJQTNHL+oQM5JY=; b=bquKcIl7Nrms07Qi6gbz3pMuhSvY1imk60RZBpiQu2Gsp1BYyH2RuqGXLbh9hwhwzlQ3/sO6DZRhrof4icC/XgyfljSgceuOmLB/Vk9LC6A4xcJEY+wFLK2AVoj/nm9ImuXqjNyalCvIPqmzINnPnLin7Ku/1RtpPY30X/jtigk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1582641173742960.9639295487751; Tue, 25 Feb 2020 06:32:53 -0800 (PST) Received: from localhost ([::1]:57882 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6bGW-0004Xu-DF for importer@patchew.org; Tue, 25 Feb 2020 09:32:52 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49102) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6bFQ-0002nI-0O for qemu-devel@nongnu.org; Tue, 25 Feb 2020 09:31:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j6bFO-0008D4-9Q for qemu-devel@nongnu.org; Tue, 25 Feb 2020 09:31:43 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:41229 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j6bFO-0008Bb-4n for qemu-devel@nongnu.org; Tue, 25 Feb 2020 09:31:42 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-14-fT8xnsRUN9mpPEC1voALqw-1; Tue, 25 Feb 2020 09:31:37 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A45FB108443B; Tue, 25 Feb 2020 14:31:36 +0000 (UTC) Received: from localhost (ovpn-117-215.ams2.redhat.com [10.36.117.215]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 465A45D9E5; Tue, 25 Feb 2020 14:31:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582641101; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=WbiUQRXAwgj3sBgL9gakHEuoq4xLbmJQTNHL+oQM5JY=; b=EHFfu+GS60KYcQvx/i1QReMo/V6bpecx1+644kdnRfomc2m2kQxMI0zUPenErnL1Ev4ngJ XzYLzmUrWdj9vDU5SFWAvtsQQ3qjhyRcTXwPjL4xq9pMjoA6yIamFl3PszomIZ0FyvNpjh ioRBXPqwdQ5UtTCFO00qqIxk8SyRAJ0= X-MC-Unique: fT8xnsRUN9mpPEC1voALqw-1 From: Max Reitz To: qemu-block@nongnu.org Subject: [PATCH 2/3] iotests/026: Test EIO on preallocated zero cluster Date: Tue, 25 Feb 2020 15:31:29 +0100 Message-Id: <20200225143130.111267-3-mreitz@redhat.com> In-Reply-To: <20200225143130.111267-1-mreitz@redhat.com> References: <20200225143130.111267-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , qemu-stable@nongnu.org, qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Test what happens when writing data to a preallocated zero cluster, but the data write fails. Signed-off-by: Max Reitz --- tests/qemu-iotests/026 | 21 +++++++++++++++++++++ tests/qemu-iotests/026.out | 10 ++++++++++ tests/qemu-iotests/026.out.nocache | 10 ++++++++++ 3 files changed, 41 insertions(+) diff --git a/tests/qemu-iotests/026 b/tests/qemu-iotests/026 index a4aa74764f..0c1273c339 100755 --- a/tests/qemu-iotests/026 +++ b/tests/qemu-iotests/026 @@ -218,6 +218,27 @@ _make_test_img 64M $QEMU_IO -c "write 0 1M" -c "write 0 1M" "$BLKDBG_TEST_IMG" | _filter_qemu= _io _check_test_img =20 +echo +echo =3D=3D=3D Avoid freeing preallocated zero clusters on failure =3D=3D= =3D +echo + +cat > "$TEST_DIR/blkdebug.conf" < (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1582641246724327.5859343120262; Tue, 25 Feb 2020 06:34:06 -0800 (PST) Received: from localhost ([::1]:57924 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6bHf-0006hX-44 for importer@patchew.org; Tue, 25 Feb 2020 09:34:03 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49127) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6bFR-0002oc-9d for qemu-devel@nongnu.org; Tue, 25 Feb 2020 09:31:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j6bFQ-0008Eu-6E for qemu-devel@nongnu.org; Tue, 25 Feb 2020 09:31:45 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:51649 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j6bFQ-0008ER-2s for qemu-devel@nongnu.org; Tue, 25 Feb 2020 09:31:44 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-388-Sbe32j4YNeik9p6GPuPgVw-1; Tue, 25 Feb 2020 09:31:40 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C3971477; Tue, 25 Feb 2020 14:31:38 +0000 (UTC) Received: from localhost (ovpn-117-215.ams2.redhat.com [10.36.117.215]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 610165DA60; Tue, 25 Feb 2020 14:31:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582641103; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8NrlLHdPEWlYNVKMX5mYs4xVk+uC86xfgXcftrsMAm4=; b=PkHIRAIDVEkG0BGzaXJDJB63N1EpeYsju9qUmxNdXfFdedzO4w1M2Rv6GvZZ61G8QS/vmP lfyydv6OOWNCfbXk3SSSRVNo1HS700bDg14mbHOLygIens4hZhk7jxF+z83nQeGSABcAkR 8goGBIj+fxhB4k/5z/FUqZvA/lJixIE= X-MC-Unique: Sbe32j4YNeik9p6GPuPgVw-1 From: Max Reitz To: qemu-block@nongnu.org Subject: [PATCH 3/3] iotests/026: Test EIO on allocation in a data-file Date: Tue, 25 Feb 2020 15:31:30 +0100 Message-Id: <20200225143130.111267-4-mreitz@redhat.com> In-Reply-To: <20200225143130.111267-1-mreitz@redhat.com> References: <20200225143130.111267-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , qemu-stable@nongnu.org, qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Test what happens when writing data to an external data file, where the write requires an L2 entry to be allocated, but the data write fails. Signed-off-by: Max Reitz --- tests/qemu-iotests/026 | 32 ++++++++++++++++++++++++++++++ tests/qemu-iotests/026.out | 6 ++++++ tests/qemu-iotests/026.out.nocache | 6 ++++++ 3 files changed, 44 insertions(+) diff --git a/tests/qemu-iotests/026 b/tests/qemu-iotests/026 index 0c1273c339..b05a4692cf 100755 --- a/tests/qemu-iotests/026 +++ b/tests/qemu-iotests/026 @@ -30,6 +30,7 @@ _cleanup() { _cleanup_test_img rm "$TEST_DIR/blkdebug.conf" + rm -f "$TEST_IMG.data_file" } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 @@ -239,6 +240,37 @@ $QEMU_IO -c "write 0 $CLUSTER_SIZE" "$BLKDBG_TEST_IMG"= | _filter_qemu_io =20 _check_test_img =20 +echo +echo =3D=3D=3D Avoid freeing external data clusters on failure =3D=3D=3D +echo + +# Similar test as the last one, except we test what happens when there +# is an error when writing to an external data file instead of when +# writing to a preallocated zero cluster +_make_test_img -o "data_file=3D$TEST_IMG.data_file" $CLUSTER_SIZE + +# Put blkdebug above the data-file, and a raw node on top of that so +# that blkdebug will see a write_aio event and emit an error +$QEMU_IO -c "write 0 $CLUSTER_SIZE" \ + "json:{ + 'driver': 'qcow2', + 'file': { 'driver': 'file', 'filename': '$TEST_IMG' }, + 'data-file': { + 'driver': 'raw', + 'file': { + 'driver': 'blkdebug', + 'config': '$TEST_DIR/blkdebug.conf', + 'image': { + 'driver': 'file', + 'filename': '$TEST_IMG.data_file' + } + } + } + }" \ + | _filter_qemu_io + +_check_test_img + # success, all done echo "*** done" rm -f $seq.full diff --git a/tests/qemu-iotests/026.out b/tests/qemu-iotests/026.out index 83989996ff..c1b3b58482 100644 --- a/tests/qemu-iotests/026.out +++ b/tests/qemu-iotests/026.out @@ -653,4 +653,10 @@ wrote 1024/1024 bytes at offset 0 1 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) write failed: Input/output error No errors were found on the image. + +=3D=3D=3D Avoid freeing external data clusters on failure =3D=3D=3D + +Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1024 data_file=3DTEST_= DIR/t.IMGFMT.data_file +write failed: Input/output error +No errors were found on the image. *** done diff --git a/tests/qemu-iotests/026.out.nocache b/tests/qemu-iotests/026.ou= t.nocache index 9359d26d7e..8d5001648a 100644 --- a/tests/qemu-iotests/026.out.nocache +++ b/tests/qemu-iotests/026.out.nocache @@ -661,4 +661,10 @@ wrote 1024/1024 bytes at offset 0 1 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) write failed: Input/output error No errors were found on the image. + +=3D=3D=3D Avoid freeing external data clusters on failure =3D=3D=3D + +Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1024 data_file=3DTEST_= DIR/t.IMGFMT.data_file +write failed: Input/output error +No errors were found on the image. *** done --=20 2.24.1