From nobody Mon Nov 25 07:21:39 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1716755391109260.19295355886516; Sun, 26 May 2024 13:29:51 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sBKU7-00054N-7G; Sun, 26 May 2024 16:28:51 -0400 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 1sBJZF-0007Cq-Rr; Sun, 26 May 2024 15:30:06 -0400 Received: from icts-p-cavuit-1.kulnet.kuleuven.be ([134.58.240.132]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sBJZB-0004iD-Id; Sun, 26 May 2024 15:30:03 -0400 Received: from icts-p-ceifnet-smtps-1.kuleuven.be (icts-p-ceifnet-smtps.service.icts.svcd [IPv6:2a02:2c40:0:51:133:242:ac11:42]) by icts-p-cavuit-1.kulnet.kuleuven.be (Postfix) with ESMTP id 6A8952005B; Sun, 26 May 2024 21:29:55 +0200 (CEST) Received: from flutterbat.volkihar.be (unknown [IPv6:2a02:a03f:8ada:7900:dd0a:a068:3e21:22de]) (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 icts-p-ceifnet-smtps-1.kuleuven.be (Postfix) with ESMTPSA id 46CA6D4E60C0E; Sun, 26 May 2024 21:29:55 +0200 (CEST) Received: by flutterbat.volkihar.be (Postfix, from userid 1000) id 04D002822F6; Sun, 26 May 2024 21:29:55 +0200 (CEST) X-KULeuven-Envelope-From: libvirt-e6954efa@volkihar.be X-KULeuven-Scanned: Found to be clean X-KULeuven-ID: 6A8952005B.AC773 X-KULeuven-Information: Katholieke Universiteit Leuven BCmilterd-Mark-Subject: no BCmilterd-Errors: BCmilterd-Report: X-CAV-Cluster: smtps X-Kuleuven: This mail passed the K.U.Leuven mailcluster From: Vincent Vanlaer To: qemu-devel@nongnu.org Cc: John Snow , Vladimir Sementsov-Ogievskiy , Kevin Wolf , qemu-block@nongnu.org, Hanna Reitz , Vincent Vanlaer Subject: [PATCH 1/2] block: allow commit to unmap zero blocks Date: Sun, 26 May 2024 21:29:16 +0200 Message-ID: <20240526192918.3503128-2-libvirt-e6954efa@volkihar.be> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240526192918.3503128-1-libvirt-e6954efa@volkihar.be> References: <20240526192918.3503128-1-libvirt-e6954efa@volkihar.be> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=134.58.240.132; envelope-from=libvirt-e6954efa@volkihar.be; helo=icts-p-cavuit-1.kulnet.kuleuven.be X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Sun, 26 May 2024 16:28:49 -0400 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-ZM-MESSAGEID: 1716755393221100001 Content-Type: text/plain; charset="utf-8" Non-active block commits do not discard blocks only containing zeros, causing images to lose sparseness after the commit. This commit fixes that by writing zero blocks using blk_co_pwrite_zeroes rather than writing them out as any oother arbitrary data. Signed-off-by: Vincent Vanlaer --- block/commit.c | 71 +++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 58 insertions(+), 13 deletions(-) diff --git a/block/commit.c b/block/commit.c index 7c3fdcb0ca..5bd97b5a74 100644 --- a/block/commit.c +++ b/block/commit.c @@ -12,9 +12,13 @@ * */ =20 +#include "bits/time.h" #include "qemu/osdep.h" #include "qemu/cutils.h" +#include "time.h" #include "trace.h" +#include "block/block-common.h" +#include "block/coroutines.h" #include "block/block_int.h" #include "block/blockjob_int.h" #include "qapi/error.h" @@ -126,6 +130,12 @@ static void commit_clean(Job *job) blk_unref(s->top); } =20 +typedef enum CommitMethod { + COMMIT_METHOD_COPY, + COMMIT_METHOD_ZERO, + COMMIT_METHOD_IGNORE, +} CommitMethod; + static int coroutine_fn commit_run(Job *job, Error **errp) { CommitBlockJob *s =3D container_of(job, CommitBlockJob, common.job); @@ -156,8 +166,9 @@ static int coroutine_fn commit_run(Job *job, Error **er= rp) buf =3D blk_blockalign(s->top, COMMIT_BUFFER_SIZE); =20 for (offset =3D 0; offset < len; offset +=3D n) { - bool copy; bool error_in_source =3D true; + CommitMethod commit_method =3D COMMIT_METHOD_COPY; + =20 /* Note that even when no rate limit is applied we need to yield * with no pending I/O here so that bdrv_drain_all() returns. @@ -167,21 +178,54 @@ static int coroutine_fn commit_run(Job *job, Error **= errp) break; } /* Copy if allocated above the base */ - ret =3D blk_co_is_allocated_above(s->top, s->base_overlay, true, - offset, COMMIT_BUFFER_SIZE, &n); - copy =3D (ret > 0); + WITH_GRAPH_RDLOCK_GUARD() { + ret =3D bdrv_co_common_block_status_above(blk_bs(s->top), + s->base_overlay, true, true, offset, COMMIT_BUFFER_SIZE, + &n, NULL, NULL, NULL); + } + trace_commit_one_iteration(s, offset, n, ret); - if (copy) { - assert(n < SIZE_MAX); - - ret =3D blk_co_pread(s->top, offset, n, buf, 0); - if (ret >=3D 0) { - ret =3D blk_co_pwrite(s->base, offset, n, buf, 0); - if (ret < 0) { - error_in_source =3D false; + + if (ret >=3D 0 && !(ret & BDRV_BLOCK_ALLOCATED)) { + commit_method =3D COMMIT_METHOD_IGNORE; + } else if (ret >=3D 0 && ret & BDRV_BLOCK_ZERO) { + int64_t target_offset; + int64_t target_bytes; + WITH_GRAPH_RDLOCK_GUARD() { + bdrv_round_to_subclusters(s->base_bs, offset, n, + &target_offset, &target_bytes); + } + + if (target_offset =3D=3D offset && + target_bytes =3D=3D n) { + commit_method =3D COMMIT_METHOD_ZERO; + } + } + + if (ret >=3D 0) { + switch (commit_method) { + case COMMIT_METHOD_COPY: + assert(n < SIZE_MAX); + ret =3D blk_co_pread(s->top, offset, n, buf, 0); + if (ret >=3D 0) { + ret =3D blk_co_pwrite(s->base, offset, n, buf, 0); + if (ret < 0) { + error_in_source =3D false; + } } + break; + case COMMIT_METHOD_ZERO: + ret =3D blk_co_pwrite_zeroes(s->base, offset, n, + BDRV_REQ_MAY_UNMAP); + error_in_source =3D false; + break; + case COMMIT_METHOD_IGNORE: + break; + default: + abort(); } } + if (ret < 0) { BlockErrorAction action =3D block_job_error_action(&s->common, s->on_error, @@ -193,10 +237,11 @@ static int coroutine_fn commit_run(Job *job, Error **= errp) continue; } } + /* Publish progress */ job_progress_update(&s->common.job, n); =20 - if (copy) { + if (commit_method =3D=3D COMMIT_METHOD_COPY) { block_job_ratelimit_processed_bytes(&s->common, n); } } --=20 2.42.0 From nobody Mon Nov 25 07:21:39 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1716755385185846.0203796566262; Sun, 26 May 2024 13:29:45 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sBKUF-00057m-Ff; Sun, 26 May 2024 16:28:59 -0400 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 1sBJZF-0007Cp-Rf; Sun, 26 May 2024 15:30:06 -0400 Received: from icts-p-cavuit-4.kulnet.kuleuven.be ([2a02:2c40:0:c0::25:134]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sBJZB-0004iB-KB; Sun, 26 May 2024 15:30:04 -0400 Received: from icts-p-ceifnet-smtps-0.kuleuven.be (icts-p-ceifnet-smtps.service.icts.svcd [IPv6:2a02:2c40:0:51:139:242:ac11:3b]) by icts-p-cavuit-4.kulnet.kuleuven.be (Postfix) with ESMTP id 7810BE8; Sun, 26 May 2024 21:29:55 +0200 (CEST) Received: from flutterbat.volkihar.be (unknown [IPv6:2a02:a03f:8ada:7900:dd0a:a068:3e21:22de]) (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 icts-p-ceifnet-smtps-0.kuleuven.be (Postfix) with ESMTPSA id 535E1D4E628CF; Sun, 26 May 2024 21:29:55 +0200 (CEST) Received: by flutterbat.volkihar.be (Postfix, from userid 1000) id 1A04328217A; Sun, 26 May 2024 21:29:55 +0200 (CEST) X-KULeuven-Envelope-From: libvirt-e6954efa@volkihar.be X-KULeuven-Scanned: Found to be clean X-KULeuven-ID: 7810BE8.ABFA7 X-KULeuven-Information: Katholieke Universiteit Leuven BCmilterd-Mark-Subject: no BCmilterd-Errors: BCmilterd-Report: X-CAV-Cluster: smtps X-Kuleuven: This mail passed the K.U.Leuven mailcluster From: Vincent Vanlaer To: qemu-devel@nongnu.org Cc: John Snow , Vladimir Sementsov-Ogievskiy , Kevin Wolf , qemu-block@nongnu.org, Hanna Reitz , Vincent Vanlaer Subject: [PATCH 2/2] block: add test non-active commit with zeroed data Date: Sun, 26 May 2024 21:29:17 +0200 Message-ID: <20240526192918.3503128-3-libvirt-e6954efa@volkihar.be> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240526192918.3503128-1-libvirt-e6954efa@volkihar.be> References: <20240526192918.3503128-1-libvirt-e6954efa@volkihar.be> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=2a02:2c40:0:c0::25:134; envelope-from=libvirt-e6954efa@volkihar.be; helo=icts-p-cavuit-4.kulnet.kuleuven.be X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Sun, 26 May 2024 16:28:49 -0400 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-ZM-MESSAGEID: 1716755388637100003 Content-Type: text/plain; charset="utf-8" Signed-off-by: Vincent Vanlaer --- tests/qemu-iotests/315 | 95 ++++++++++++++++++++++++++++++++++++++ tests/qemu-iotests/315.out | 54 ++++++++++++++++++++++ 2 files changed, 149 insertions(+) create mode 100755 tests/qemu-iotests/315 create mode 100644 tests/qemu-iotests/315.out diff --git a/tests/qemu-iotests/315 b/tests/qemu-iotests/315 new file mode 100755 index 0000000000..84865f8001 --- /dev/null +++ b/tests/qemu-iotests/315 @@ -0,0 +1,95 @@ +#!/usr/bin/env bash +# group: rw quick +# +# Test for commit of discarded blocks +# +# This tests committing a live snapshot where some of the blocks that +# are present in the base image are discarded in the intermediate image. +# This intends to check that these blocks are also discarded in the base +# image after the commit. +# +# Copyright (C) 2024 Vincent Vanlaer. +# +# 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=3Dlibvirt-e6954efa@volkihar.be + +seq=3D`basename $0` +echo "QA output created by $seq" + +status=3D1 # failure is the default! + +_cleanup() +{ + _cleanup_qemu + _rm_test_img "${TEST_IMG}.base" + _rm_test_img "${TEST_IMG}.mid" + _cleanup_test_img +} +trap "_cleanup; exit \$status" 0 1 2 3 15 + +# get standard environment, filters and checks +. ./common.rc +. ./common.filter +. ./common.qemu + +_supported_fmt qcow2 +_supported_proto file + +size=3D"1M" + +TEST_IMG=3D"$TEST_IMG.base" _make_test_img $size +TEST_IMG=3D"$TEST_IMG.mid" _make_test_img -b "$TEST_IMG.base" -F $IMGFMT $= size +_make_test_img -b "${TEST_IMG}.mid" -F $IMGFMT $size + +$QEMU_IO -c "write -P 0x01 64k 128k" "$TEST_IMG.base" | _filter_qemu_io +$QEMU_IO -c "discard 64k 64k" "$TEST_IMG.mid" | _filter_qemu_io + +echo +echo "=3D=3D=3D Base image info before commit =3D=3D=3D" +TEST_IMG=3D"${TEST_IMG}.base" _img_info | _filter_img_info +$QEMU_IMG map --output=3Djson "$TEST_IMG.base" | _filter_qemu_img_map + +echo +echo "=3D=3D=3D Middle image info before commit =3D=3D=3D" +TEST_IMG=3D"${TEST_IMG}.mid" _img_info | _filter_img_info +$QEMU_IMG map --output=3Djson "$TEST_IMG.mid" | _filter_qemu_img_map + +echo +echo =3D=3D=3D Running QEMU Live Commit Test =3D=3D=3D +echo + +qemu_comm_method=3D"qmp" +_launch_qemu -drive file=3D"${TEST_IMG}",if=3Dvirtio,id=3Dtest +h=3D$QEMU_HANDLE + +_send_qemu_cmd $h "{ 'execute': 'qmp_capabilities' }" "return" + +_send_qemu_cmd $h "{ 'execute': 'block-commit', + 'arguments': { 'device': 'test', + 'top': '"${TEST_IMG}.mid"', + 'base': '"${TEST_IMG}.base"'} }" '"status= ": "null"' + +_cleanup_qemu + +echo +echo "=3D=3D=3D Base image info after commit =3D=3D=3D" +TEST_IMG=3D"${TEST_IMG}.base" _img_info | _filter_img_info +$QEMU_IMG map --output=3Djson "$TEST_IMG.base" | _filter_qemu_img_map + +# success, all done +echo "*** done" +rm -f $seq.full +status=3D0 diff --git a/tests/qemu-iotests/315.out b/tests/qemu-iotests/315.out new file mode 100644 index 0000000000..146ec117fb --- /dev/null +++ b/tests/qemu-iotests/315.out @@ -0,0 +1,54 @@ +QA output created by 315 +Formatting 'TEST_DIR/t.IMGFMT.base', fmt=3DIMGFMT size=3D1048576 +Formatting 'TEST_DIR/t.IMGFMT.mid', fmt=3DIMGFMT size=3D1048576 backing_fi= le=3DTEST_DIR/t.IMGFMT.base backing_fmt=3DIMGFMT +Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1048576 backing_file= =3DTEST_DIR/t.IMGFMT.mid backing_fmt=3DIMGFMT +wrote 131072/131072 bytes at offset 65536 +128 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +discard 65536/65536 bytes at offset 65536 +64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) + +=3D=3D=3D Base image info before commit =3D=3D=3D +image: TEST_DIR/t.IMGFMT.base +file format: IMGFMT +virtual size: 1 MiB (1048576 bytes) +[{ "start": 0, "length": 65536, "depth": 0, "present": false, "zero": true= , "data": false, "compressed": false}, +{ "start": 65536, "length": 131072, "depth": 0, "present": true, "zero": f= alse, "data": true, "compressed": false, "offset": OFFSET}, +{ "start": 196608, "length": 851968, "depth": 0, "present": false, "zero":= true, "data": false, "compressed": false}] + +=3D=3D=3D Middle image info before commit =3D=3D=3D +image: TEST_DIR/t.IMGFMT.mid +file format: IMGFMT +virtual size: 1 MiB (1048576 bytes) +backing file: TEST_DIR/t.IMGFMT.base +backing file format: IMGFMT +[{ "start": 0, "length": 65536, "depth": 1, "present": false, "zero": true= , "data": false, "compressed": false}, +{ "start": 65536, "length": 65536, "depth": 0, "present": true, "zero": tr= ue, "data": false, "compressed": false}, +{ "start": 131072, "length": 65536, "depth": 1, "present": true, "zero": f= alse, "data": true, "compressed": false, "offset": OFFSET}, +{ "start": 196608, "length": 851968, "depth": 1, "present": false, "zero":= true, "data": false, "compressed": false}] + +=3D=3D=3D Running QEMU Live Commit Test =3D=3D=3D + +{ 'execute': 'qmp_capabilities' } +{"return": {}} +{ 'execute': 'block-commit', + 'arguments': { 'device': 'test', + 'top': 'TEST_DIR/t.IMGFMT.mid', + 'base': 'TEST_DIR/t.IMGFMT.base'} } +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "test"}} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "test"}} +{"return": {}} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "JOB_STATUS_CHANGE", "data": {"status": "waiting", "id": "test"}} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "JOB_STATUS_CHANGE", "data": {"status": "pending", "id": "test"}} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "BLOCK_JOB_COMPLETED", "data": {"device": "test", "len": 1048576, "offset= ": 1048576, "speed": 0, "type": "commit"}} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "JOB_STATUS_CHANGE", "data": {"status": "concluded", "id": "test"}} +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "JOB_STATUS_CHANGE", "data": {"status": "null", "id": "test"}} + +=3D=3D=3D Base image info after commit =3D=3D=3D +image: TEST_DIR/t.IMGFMT.base +file format: IMGFMT +virtual size: 1 MiB (1048576 bytes) +[{ "start": 0, "length": 65536, "depth": 0, "present": false, "zero": true= , "data": false, "compressed": false}, +{ "start": 65536, "length": 65536, "depth": 0, "present": true, "zero": tr= ue, "data": false, "compressed": false}, +{ "start": 131072, "length": 65536, "depth": 0, "present": true, "zero": f= alse, "data": true, "compressed": false, "offset": OFFSET}, +{ "start": 196608, "length": 851968, "depth": 0, "present": false, "zero":= true, "data": false, "compressed": false}] +*** done --=20 2.42.0