From nobody Fri Nov 14 17:01:15 2025 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=1588700516; cv=none; d=zohomail.com; s=zohoarc; b=S1NDK8aQ1+NrKbuesAO/yNZ+hpuJr0tp22eFO8oSqGUhLF6Ut6NNr1V+EdWbj7r4GeNoqArYdhoX+bNlLV61rsc1LIwBwxoe8SA9EOnj4rDmws1SototdHGGJNhvn19dzUc41rTBrvfJZlbDYtELYKTVjM0KFtFLBjWkxqR9qBU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588700516; 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=IKJ70Q7rBfpK+zySpLrIIzwRyunu2R433VVxRZmS7i8=; b=LOsFTeXmOsLSgy5k5MHDWnpV8ow0AG4VZeYEVKPWanPYmP8GtzZTnP5Vo53uYpU2jg0BhgYmRzrytE75J50zUDRLUyZJa7XfoLkMAE6uhTq4Qgigwb558C9jY5qGJmdtnKz4FLbYAOvoHowoQFKfDEoHv7vexiuidKOMyso/RwI= 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 1588700516781298.2372506675117; Tue, 5 May 2020 10:41:56 -0700 (PDT) Received: from localhost ([::1]:42068 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jW1Zq-0001bk-46 for importer@patchew.org; Tue, 05 May 2020 13:41:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44082) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jW1Xc-0006pO-Lk; Tue, 05 May 2020 13:39:36 -0400 Received: from fanzine.igalia.com ([178.60.130.6]:38890) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jW1Xb-00089t-HU; Tue, 05 May 2020 13:39:36 -0400 Received: from static.160.43.0.81.ibercom.com ([81.0.43.160] helo=perseus.local) by fanzine.igalia.com with esmtpsa (Cipher TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim) id 1jW1Ws-00025X-Ca; Tue, 05 May 2020 19:38:50 +0200 Received: from berto by perseus.local with local (Exim 4.92) (envelope-from ) id 1jW1Wd-00044c-7C; Tue, 05 May 2020 19:38:35 +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=IKJ70Q7rBfpK+zySpLrIIzwRyunu2R433VVxRZmS7i8=; b=cBCCNGwLF5cZHAstxpM4jy1LUZdKnxzGhIjlVpXd1p6zuPV6GxDNm+e3YentJmvf1M7b5w5F0eQOVmXzgigVJP+sUJ/ELnXDZijYEYYbG9AM5ifACHmLAx65RhjMozNZJv/exRQ+v0kYly8xmLNzM4ekWHJmHXXo0Jd1q0WB7fWwMykQ/r/wBb8FkO4DcEw8/Xc1ui9YCSS5uqzrk0r4IpmkK4ZrB2qVjTY4oro8T6OuxHTL45ZqL/K2bN8VFG4FgUq+yqFsDpAqs9pW67raeAjJ8NaeV0wuDsl9sFTUDInBFvOtJUErM0mHVQSynLMQ+r11LakZap77as8SdBnQeg==; From: Alberto Garcia To: qemu-devel@nongnu.org Subject: [PATCH v5 24/31] qcow2: Update L2 bitmap in qcow2_alloc_cluster_link_l2() Date: Tue, 5 May 2020 19:38:24 +0200 Message-Id: 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/05/05 13:38:50 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_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN 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, 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 --- block/qcow2-cluster.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c index 2283a308d0..4544a40aa0 100644 --- a/block/qcow2-cluster.c +++ b/block/qcow2-cluster.c @@ -1000,6 +1000,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); + l2_bitmap &=3D ~QCOW_OFLAG_SUB_ZERO_RANGE(first_sc, last_sc); + set_l2_bitmap(s, l2_slice, l2_index + i, l2_bitmap); + } } =20 =20 --=20 2.20.1