From nobody Sat Nov 15 22:35:14 2025 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=quarantine dis=none) header.from=virtuozzo.com ARC-Seal: i=1; a=rsa-sha256; t=1747100223; cv=none; d=zohomail.com; s=zohoarc; b=XrzHiW80VqeJt8BhrcjqO4a8QmebRe2ZvxIc2bggCYDbGVw3OY/YJxqTz9Mqh1ckNNNMctzFgcQlU5a2bkGU/5AFIbf04lZhZ8bNZy/XXAkDDaw4gAjlqDAA5ldsVGVeZjn7olJoe+lvvJknpbaXJGkLKpHC3gdZ3/TLt7wETtk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1747100223; 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=t1AoeW5+yWy2YGfiL3VknobGzbBoiHSM2roimpSm4Xc=; b=AbPvP7KloLMXSZKt7tVn394jipAZezb6r4/na47cOyv3JoS6zceFEl3DnkXugDMsaOLguYUrEkm66f8Cjirf0+b7/baTIsIcTNNtADX5IcqjIIhZ+ZGpA4QWE6PPqVh66m/2t2h48S4LYS8lvRqz1qvhEZwN+vUGCsoF6L9cYZs= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1747100223576922.1725224164477; Mon, 12 May 2025 18:37:03 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uEeYk-0002Go-Q8; Mon, 12 May 2025 21:35:54 -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 1uEeYi-0002Ey-8J; Mon, 12 May 2025 21:35:52 -0400 Received: from relay.virtuozzo.com ([130.117.225.111]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uEeYg-00021Z-6k; Mon, 12 May 2025 21:35:51 -0400 Received: from ch-vpn.virtuozzo.com ([130.117.225.6] helo=debian.fritz.box) by relay.virtuozzo.com with esmtp (Exim 4.96) (envelope-from ) id 1uEeUf-00DboQ-18; Tue, 13 May 2025 03:35:38 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=virtuozzo.com; s=relay; h=MIME-Version:Message-ID:Date:Subject:From: Content-Type; bh=t1AoeW5+yWy2YGfiL3VknobGzbBoiHSM2roimpSm4Xc=; b=FEhJgPZGgukQ aiUOT9l8c0zq61uLDwXRtl9hLV9N3DbJUjrsmvBvsApfN/5uH3iL7etV3cQN+SNAXTO79NrpVh4vP buUMblYHQ5Q6V4h29HS5GHgQiNVGc27MDNPsdu+IS1QSK5oNxmX7PQRZpP/nQ7N9h1P2m3xhJYFMh B3J4lzy8zDOBeewsDb75+JQa8FDBKa9BYgiB44gYEJPcgHgLydm6q1VJ27PSqR8HahsWq6jSRgt4C x4vJwKtPQ+RajpHMCFjrMDRN5MlJwxeoUSrggjN1KcfngrIcer84+MYzZT/jMtOBxQij48Q2Djvtc JWAHFojyFavTWkCY9W38pQ==; From: Andrey Zhadchenko To: qemu-block@nongnu.org, vsementsov@yandex-team.ru, eblake@redhat.com Cc: jsnow@redhat.com, kwolf@redhat.com, hreitz@redhat.com, qemu-devel@nongnu.org, andrey.drobyshev@virtuozzo.com, den@virtuozzo.com Subject: [PATCH 4/4] block/copy-before-write: report partial block status to snapshot Date: Tue, 13 May 2025 03:32:38 +0200 Message-ID: <20250513013238.1213539-5-andrey.zhadchenko@virtuozzo.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250513013238.1213539-1-andrey.zhadchenko@virtuozzo.com> References: <20250513013238.1213539-1-andrey.zhadchenko@virtuozzo.com> 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=130.117.225.111; envelope-from=andrey.zhadchenko@virtuozzo.com; helo=relay.virtuozzo.com X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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 @virtuozzo.com) X-ZM-MESSAGEID: 1747100225741116600 Content-Type: text/plain; charset="utf-8" until the non-accessible area Signed-off-by: Andrey Zhadchenko --- block/copy-before-write.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/block/copy-before-write.c b/block/copy-before-write.c index 5f5b3e7515..81d7f40b13 100644 --- a/block/copy-before-write.c +++ b/block/copy-before-write.c @@ -207,10 +207,11 @@ static int coroutine_fn GRAPH_RDLOCK cbw_co_flush(Blo= ckDriverState *bs) */ static BlockReq * coroutine_fn GRAPH_RDLOCK cbw_snapshot_read_lock(BlockDriverState *bs, int64_t offset, int64_t bytes, - int64_t *pnum, BdrvChild **file) + int64_t *pnum, BdrvChild **file, bool query) { BDRVCopyBeforeWriteState *s =3D bs->opaque; BlockReq *req =3D g_new(BlockReq, 1); + int64_t next_dirty; bool done; =20 QEMU_LOCK_GUARD(&s->lock); @@ -220,9 +221,13 @@ cbw_snapshot_read_lock(BlockDriverState *bs, int64_t o= ffset, int64_t bytes, return NULL; } =20 - if (bdrv_dirty_bitmap_next_dirty(s->access_bitmap, offset, bytes) !=3D= -1) { - g_free(req); - return NULL; + next_dirty =3D bdrv_dirty_bitmap_next_dirty(s->access_bitmap, offset, = bytes); + if (next_dirty !=3D -1) { + if (!query || next_dirty =3D=3D offset) { + g_free(req); + return NULL; + } + bytes =3D offset + bytes - next_dirty; } =20 done =3D bdrv_dirty_bitmap_status(s->done_bitmap, offset, bytes, pnum); @@ -270,7 +275,8 @@ cbw_co_preadv_snapshot(BlockDriverState *bs, int64_t of= fset, int64_t bytes, while (bytes) { int64_t cur_bytes; =20 - req =3D cbw_snapshot_read_lock(bs, offset, bytes, &cur_bytes, &fil= e); + req =3D cbw_snapshot_read_lock(bs, offset, bytes, &cur_bytes, &fil= e, + false); if (!req) { return -EACCES; } @@ -302,7 +308,7 @@ cbw_co_snapshot_block_status(BlockDriverState *bs, int64_t cur_bytes; BdrvChild *child; =20 - req =3D cbw_snapshot_read_lock(bs, offset, bytes, &cur_bytes, &child); + req =3D cbw_snapshot_read_lock(bs, offset, bytes, &cur_bytes, &child, = true); if (!req) { return -EACCES; } --=20 2.43.0