From patchwork Sun Sep 1 14:24:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vincent Vanlaer X-Patchwork-Id: 13786493 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 65297C54FC6 for ; Sun, 1 Sep 2024 14:27:03 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sklWI-0002OO-5v; Sun, 01 Sep 2024 10:25:34 -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 1sklWD-0002Ag-8v; Sun, 01 Sep 2024 10:25:29 -0400 Received: from icts-p-cavuit-2.kulnet.kuleuven.be ([2a02:2c40:0:c0::25:131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sklWB-0003XJ-Ij; Sun, 01 Sep 2024 10:25:28 -0400 X-KULeuven-Envelope-From: libvirt-e6954efa@volkihar.be X-KULeuven-Scanned: Found to be clean X-KULeuven-ID: 02D6D200B4.ADEE3 X-KULeuven-Information: Katholieke Universiteit Leuven Received: from icts-p-ceifnet-smtps-0.kuleuven.be (icts-p-ceifnet-smtps.service.icts.svcd [IPv6:2a02:2c40:0:51:144:242:ac11:2e]) by icts-p-cavuit-2.kulnet.kuleuven.be (Postfix) with ESMTP id 02D6D200B4; Sun, 1 Sep 2024 16:25:22 +0200 (CEST) BCmilterd-Mark-Subject: no BCmilterd-Errors: BCmilterd-Report: X-CAV-Cluster: smtps Received: from flutterbat.volkihar.be (unknown [IPv6:2a02:a03f:8ada:7900:da25:11b6:eb0b:9b9d]) (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 D75ADD4F7A477; Sun, 1 Sep 2024 16:25:21 +0200 (CEST) Received: by flutterbat.volkihar.be (Postfix, from userid 1000) id A3C3016E054; Sun, 01 Sep 2024 16:25:21 +0200 (CEST) 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 v3 4/5] block: allow commit to unmap zero blocks Date: Sun, 1 Sep 2024 16:24:04 +0200 Message-ID: <20240901142405.3183874-5-libvirt-e6954efa@volkihar.be> X-Mailer: git-send-email 2.44.1 In-Reply-To: <20240901142405.3183874-1-libvirt-e6954efa@volkihar.be> References: <20240901142405.3183874-1-libvirt-e6954efa@volkihar.be> MIME-Version: 1.0 Received-SPF: pass client-ip=2a02:2c40:0:c0::25:131; envelope-from=libvirt-e6954efa@volkihar.be; helo=icts-p-cavuit-2.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-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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org 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 other arbitrary data. Signed-off-by: Vincent Vanlaer --- block/commit.c | 34 +++++++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/block/commit.c b/block/commit.c index 288e413be3..2594917a74 100644 --- a/block/commit.c +++ b/block/commit.c @@ -146,19 +146,35 @@ static int commit_iteration(CommitBlockJob *s, int64_t offset, int64_t *n, void trace_commit_one_iteration(s, offset, *n, ret); if (ret & BDRV_BLOCK_ALLOCATED) { - assert(*n < SIZE_MAX); + if (ret & BDRV_BLOCK_ZERO) { + /* If the top (sub)clusters are smaller than the base + * (sub)clusters, this will not unmap unless the underlying device + * does some tracking of these requests. Ideally, we would find + * the maximal extent of the zero clusters. */ + ret = blk_co_pwrite_zeroes(s->base, offset, *n, + BDRV_REQ_MAY_UNMAP); + if (ret < 0) { + error_in_source = false; + goto handle_error; + } + } else { + assert(*n < SIZE_MAX); - ret = blk_co_pread(s->top, offset, *n, buf, 0); - if (ret < 0) { - goto handle_error; - } + ret = blk_co_pread(s->top, offset, *n, buf, 0); + if (ret < 0) { + goto handle_error; + } - ret = blk_co_pwrite(s->base, offset, *n, buf, 0); - if (ret < 0) { - error_in_source = false; - goto handle_error; + ret = blk_co_pwrite(s->base, offset, *n, buf, 0); + if (ret < 0) { + error_in_source = false; + goto handle_error; + } } + /* Whether zeroes actually end up on disk depends on the details of + * the underlying driver. Therefore, this might rate limit more than + * is necessary. */ block_job_ratelimit_processed_bytes(&s->common, *n); }