From nobody Mon Feb 9 12:11:27 2026 Delivered-To: importer@patchew.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 ARC-Seal: i=1; a=rsa-sha256; t=1594398149; cv=none; d=zohomail.com; s=zohoarc; b=QpdQ6d0aVjVLKT5AW6E8G7/kGWHpNTwvVnk5kkUH55HZYf2DvLj31ZA1eXVMM662n+M0uiZiEkCiEUSrhAMXtzItDi95M8GLzJReHpigENVC0ItZ/NQjdrVqyABr6N3KZ4KXcjeY6F2MHoWYR/qwRbxsmjlULbO4JGB7HcaPgU8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594398149; 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; bh=kRWs8b0J2r7ro/blkkJyRPuIfQyqloPwSMTOgVtkpus=; b=W1Twc/1D9cCWQTIib6vcDUkUrR9RMNtH1UR9EMv9w5aDsYMCFYMUgv0zyQV68VsmEET2syisUcXxDRpQ6xJSQ77zSvWJWhDxzcvwtld2zqlYEMbTy4TnHDFBYEmtdA9IF6x6TbYVr0nPOy5+Y229cqWlxW8Mw1kmZBF2/tK6xRw= 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1594398148995313.65368177457276; Fri, 10 Jul 2020 09:22:28 -0700 (PDT) Received: from localhost ([::1]:51286 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jtvn7-0000qW-Pn for importer@patchew.org; Fri, 10 Jul 2020 12:22:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42718) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jtvfP-00038j-Uh; Fri, 10 Jul 2020 12:14:27 -0400 Received: from fanzine.igalia.com ([178.60.130.6]:43847) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jtvfJ-0004wB-E5; Fri, 10 Jul 2020 12:14:27 -0400 Received: from [81.0.43.0] (helo=perseus.local) by fanzine.igalia.com with esmtpsa (Cipher TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim) id 1jtvea-0003jv-MS; Fri, 10 Jul 2020 18:13:36 +0200 Received: from berto by perseus.local with local (Exim 4.92) (envelope-from ) id 1jtveL-0001RE-EB; Fri, 10 Jul 2020 18:13:21 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=igalia.com; s=20170329; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=kRWs8b0J2r7ro/blkkJyRPuIfQyqloPwSMTOgVtkpus=; b=fe5EySQen37iy8FIxcN7ngldNh5+3rtQ4DcyvfEr+lDsgvmUhpCseMPY08dzIaBFOXcnweSoNralvMb5XlRCtBSltW/b70a8whcZ884pQoukSeC7AsPiibe6sfnur+921RWID9z+WBBvJ7pQPNRt0tre/7aEnDiD2PKHPnhB3/Oh4ThQDIkF+SU6PcnjZ6zHap1zrwDQxZOkhemy3skXFIDwwfD61bPb8ehUOXFeeMJ9qquLVGZVc4GTSQkaQ45MZXfGSmPY56yldKbpJdtMRdx7UBWopYt9JrfoXq7trTVBYk4KLLiph7Pi9zC064E+jRHMRo7kIzGuzehhT3PAVA==; From: Alberto Garcia To: qemu-devel@nongnu.org Subject: [PATCH v11 25/34] qcow2: Update L2 bitmap in qcow2_alloc_cluster_link_l2() Date: Fri, 10 Jul 2020 18:13:07 +0200 Message-Id: <0875620d49f44320334b6a91c73b3f301f975f38.1594396418.git.berto@igalia.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: References: 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=178.60.130.6; envelope-from=berto@igalia.com; helo=fanzine.igalia.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/10 12:13:35 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x (no timestamps) [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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 , Vladimir Sementsov-Ogievskiy , Alberto Garcia , qemu-block@nongnu.org, Derek Su , 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" The L2 bitmap needs to be updated after each write to indicate what new subclusters are now allocated. This needs to happen even if the cluster was already allocated and the L2 entry was otherwise valid. In some cases however a write operation doesn't need change the L2 bitmap (because all affected subclusters were already allocated). This is detected in calculate_l2_meta(), and qcow2_alloc_cluster_link_l2() is never called in those cases. Signed-off-by: Alberto Garcia Reviewed-by: Eric Blake Reviewed-by: Max Reitz --- block/qcow2-cluster.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c index ea025dc531..5bdbb65e7b 100644 --- a/block/qcow2-cluster.c +++ b/block/qcow2-cluster.c @@ -1062,6 +1062,24 @@ int qcow2_alloc_cluster_link_l2(BlockDriverState *bs= , QCowL2Meta *m) assert((offset & L2E_OFFSET_MASK) =3D=3D offset); =20 set_l2_entry(s, l2_slice, l2_index + i, offset | QCOW_OFLAG_COPIED= ); + + /* Update bitmap with the subclusters that were just written */ + if (has_subclusters(s)) { + uint64_t l2_bitmap =3D get_l2_bitmap(s, l2_slice, l2_index + i= ); + unsigned written_from =3D m->cow_start.offset; + unsigned written_to =3D m->cow_end.offset + m->cow_end.nb_byte= s ?: + m->nb_clusters << s->cluster_bits; + int first_sc, last_sc; + /* Narrow written_from and written_to down to the current clus= ter */ + written_from =3D MAX(written_from, i << s->cluster_bits); + written_to =3D MIN(written_to, (i + 1) << s->cluster_bits); + assert(written_from < written_to); + first_sc =3D offset_to_sc_index(s, written_from); + last_sc =3D offset_to_sc_index(s, written_to - 1); + l2_bitmap |=3D QCOW_OFLAG_SUB_ALLOC_RANGE(first_sc, last_sc + = 1); + l2_bitmap &=3D ~QCOW_OFLAG_SUB_ZERO_RANGE(first_sc, last_sc + = 1); + set_l2_bitmap(s, l2_slice, l2_index + i, l2_bitmap); + } } =20 =20 --=20 2.20.1