From patchwork Sat Oct 26 21:25:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alberto Garcia X-Patchwork-Id: 11213875 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C8A60913 for ; Sat, 26 Oct 2019 21:37:22 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 9CF5320863 for ; Sat, 26 Oct 2019 21:37:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=igalia.com header.i=@igalia.com header.b="b4zoCeGq" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9CF5320863 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=igalia.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:42564 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iOTkP-00006S-5A for patchwork-qemu-devel@patchwork.kernel.org; Sat, 26 Oct 2019 17:37:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60312) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iOTZw-0000Xf-R4 for qemu-devel@nongnu.org; Sat, 26 Oct 2019 17:26:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iOTZv-0005RG-EX for qemu-devel@nongnu.org; Sat, 26 Oct 2019 17:26:32 -0400 Received: from fanzine.igalia.com ([178.60.130.6]:42493) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iOTZu-0005F1-VI; Sat, 26 Oct 2019 17:26:31 -0400 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=KNvEic0lP8ruWMnEMEuIGNQ67obFk+Zkwqmzfxp6gz8=; b=b4zoCeGqb9EGw75E5VGfQDTyEJxPhcPYKhrJZMh6Pz8NgnDLfETIa8sAiPmGordt3zcR4mSKsntFlqitpDxllIMrysn1g0UZCVrT/L87feBRMg71Audk+DslWe3JZtYPinOSoEr3LpWoB2UrCbZbBFshYFngpZCsZmgtbD8rUvAfpzkjOeLs00hJjbvmOKD2PmHGTFMGkVEGvPpdMxRf2fgAbmzrISQPDcvDOM2IZbBGlwiY9jFioy06Qm7+aVxFKfOWohnpx0eeYeAKAJ2EPANtVLTIU1npC+zEOUhahZiPKR+j4zjizvN8Jq7wEAiFzYEk2klE2mWgz6oL7GvB5Q==; Received: from 87-100-137-117.bb.dnainternet.fi ([87.100.137.117] helo=perseus.local) by fanzine.igalia.com with esmtpsa (Cipher TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim) id 1iOTZJ-000469-7G; Sat, 26 Oct 2019 23:25:53 +0200 Received: from berto by perseus.local with local (Exim 4.92) (envelope-from ) id 1iOTZ0-0001Pf-Ui; Sun, 27 Oct 2019 00:25:34 +0300 From: Alberto Garcia To: qemu-devel@nongnu.org Subject: [RFC PATCH v2 20/26] qcow2: Update L2 bitmap in qcow2_alloc_cluster_link_l2() Date: Sun, 27 Oct 2019 00:25:22 +0300 Message-Id: <289ea5edc3f1530787c8fe905b1a524cc48945a9.1572125022.git.berto@igalia.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: References: MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x (no timestamps) [generic] [fuzzy] X-Received-From: 178.60.130.6 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 , Anton Nefedov , Alberto Garcia , qemu-block@nongnu.org, Max Reitz , Vladimir Sementsov-Ogievskiy , "Denis V . Lunev" Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" 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. Signed-off-by: Alberto Garcia --- block/qcow2-cluster.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c index fb6cf8df17..acb7226e03 100644 --- a/block/qcow2-cluster.c +++ b/block/qcow2-cluster.c @@ -980,6 +980,22 @@ int qcow2_alloc_cluster_link_l2(BlockDriverState *bs, QCowL2Meta *m) set_l2_entry(s, l2_slice, l2_index + i, QCOW_OFLAG_COPIED | (cluster_offset + (i << s->cluster_bits))); + + /* Update bitmap with the subclusters that were just written */ + if (has_subclusters(s)) { + uint64_t written_from = m->cow_start.offset; + uint64_t written_to = m->cow_end.offset + m->cow_end.nb_bytes; + uint64_t l2_bitmap = get_l2_bitmap(s, l2_slice, l2_index + i); + int sc; + for (sc = 0; sc < s->subclusters_per_cluster; sc++) { + uint64_t sc_off = i * s->cluster_size + sc * s->subcluster_size; + if (sc_off >= written_from && sc_off < written_to) { + l2_bitmap |= QCOW_OFLAG_SUB_ALLOC(sc); + l2_bitmap &= ~QCOW_OFLAG_SUB_ZERO(sc); + } + } + set_l2_bitmap(s, l2_slice, l2_index + i, l2_bitmap); + } }