From nobody Tue Feb 10 05:10:39 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1528855962674359.3526058517597; Tue, 12 Jun 2018 19:12:42 -0700 (PDT) Received: from localhost ([::1]:59354 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fSvH7-0006Dg-Qz for importer@patchew.org; Tue, 12 Jun 2018 22:12:41 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46025) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fSvB0-0001P3-57 for qemu-devel@nongnu.org; Tue, 12 Jun 2018 22:06:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fSvAy-0001f4-3h for qemu-devel@nongnu.org; Tue, 12 Jun 2018 22:06:22 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:53550 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fSvAt-0001Zh-7q; Tue, 12 Jun 2018 22:06:15 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D7A2A859B2; Wed, 13 Jun 2018 02:06:14 +0000 (UTC) Received: from probe.bos.redhat.com (dhcp-17-177.bos.redhat.com [10.18.17.177]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9691F20284F0; Wed, 13 Jun 2018 02:06:14 +0000 (UTC) From: John Snow To: qemu-devel@nongnu.org, qemu-block@nongnu.org Date: Tue, 12 Jun 2018 22:06:06 -0400 Message-Id: <20180613020613.1343-4-jsnow@redhat.com> In-Reply-To: <20180613020613.1343-1-jsnow@redhat.com> References: <20180613020613.1343-1-jsnow@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.2]); Wed, 13 Jun 2018 02:06:14 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.2]); Wed, 13 Jun 2018 02:06:14 +0000 (UTC) for IP:'10.11.54.6' DOMAIN:'int-mx06.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'jsnow@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH v2 03/10] qcow2/bitmap: cache bm_list X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Vladimir Sementsov-Ogievskiy , Markus Armbruster , Max Reitz , John Snow Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" We don't need to re-read this list every time, exactly. We can keep it cach= ed and delete our copy when we flush to disk. Because we don't try to flush bitmaps on close if there's nothing to flush, add a new conditional to delete the state anyway for a clean exit. Signed-off-by: John Snow --- block/qcow2-bitmap.c | 74 ++++++++++++++++++++++++++++++++++--------------= ---- block/qcow2.c | 2 ++ block/qcow2.h | 2 ++ 3 files changed, 52 insertions(+), 26 deletions(-) diff --git a/block/qcow2-bitmap.c b/block/qcow2-bitmap.c index 85c1b5afe3..5ae9b17928 100644 --- a/block/qcow2-bitmap.c +++ b/block/qcow2-bitmap.c @@ -636,6 +636,34 @@ fail: return NULL; } =20 +static Qcow2BitmapList *get_bitmap_list(BlockDriverState *bs, Error **errp) +{ + BDRVQcow2State *s =3D bs->opaque; + Qcow2BitmapList *bm_list; + + if (s->bitmap_list) { + return (Qcow2BitmapList *)s->bitmap_list; + } + + if (s->nb_bitmaps) { + bm_list =3D bitmap_list_load(bs, errp); + } else { + bm_list =3D bitmap_list_new(); + } + s->bitmap_list =3D bm_list; + return bm_list; +} + +static void del_bitmap_list(BlockDriverState *bs) +{ + BDRVQcow2State *s =3D bs->opaque; + + if (s->bitmap_list) { + bitmap_list_free(s->bitmap_list); + s->bitmap_list =3D NULL; + } +} + int qcow2_check_bitmaps_refcounts(BlockDriverState *bs, BdrvCheckResult *r= es, void **refcount_table, int64_t *refcount_table_size) @@ -656,7 +684,7 @@ int qcow2_check_bitmaps_refcounts(BlockDriverState *bs,= BdrvCheckResult *res, return ret; } =20 - bm_list =3D bitmap_list_load(bs, NULL); + bm_list =3D get_bitmap_list(bs, NULL); if (bm_list =3D=3D NULL) { res->corruptions++; return -EINVAL; @@ -706,8 +734,6 @@ int qcow2_check_bitmaps_refcounts(BlockDriverState *bs,= BdrvCheckResult *res, } =20 out: - bitmap_list_free(bm_list); - return ret; } =20 @@ -944,7 +970,7 @@ bool qcow2_load_dirty_bitmaps(BlockDriverState *bs, Err= or **errp) return false; } =20 - bm_list =3D bitmap_list_load(bs, errp); + bm_list =3D get_bitmap_list(bs, errp); if (bm_list =3D=3D NULL) { return false; } @@ -978,8 +1004,6 @@ bool qcow2_load_dirty_bitmaps(BlockDriverState *bs, Er= ror **errp) } } =20 - bitmap_list_free(bm_list); - return needs_update; =20 fail: @@ -988,8 +1012,7 @@ fail: bdrv_release_dirty_bitmap(bs, bm->dirty_bitmap); } } - bitmap_list_free(bm_list); - + del_bitmap_list(bs); return false; } =20 @@ -1016,7 +1039,7 @@ int qcow2_reopen_bitmaps_rw_hint(BlockDriverState *bs= , bool *header_updated, return -EINVAL; } =20 - bm_list =3D bitmap_list_load(bs, errp); + bm_list =3D get_bitmap_list(bs, errp); if (bm_list =3D=3D NULL) { return -EINVAL; } @@ -1056,7 +1079,6 @@ int qcow2_reopen_bitmaps_rw_hint(BlockDriverState *bs= , bool *header_updated, =20 out: g_slist_free(ro_dirty_bitmaps); - bitmap_list_free(bm_list); =20 return ret; } @@ -1265,7 +1287,7 @@ void qcow2_remove_persistent_dirty_bitmap(BlockDriver= State *bs, return; } =20 - bm_list =3D bitmap_list_load(bs, errp); + bm_list =3D get_bitmap_list(bs, errp); if (bm_list =3D=3D NULL) { return; } @@ -1287,7 +1309,11 @@ void qcow2_remove_persistent_dirty_bitmap(BlockDrive= rState *bs, =20 fail: bitmap_free(bm); - bitmap_list_free(bm_list); +} + +void qcow2_persistent_dirty_bitmaps_cache_destroy(BlockDriverState *bs) +{ + del_bitmap_list(bs); } =20 void qcow2_store_persistent_dirty_bitmaps(BlockDriverState *bs, Error **er= rp) @@ -1304,23 +1330,19 @@ void qcow2_store_persistent_dirty_bitmaps(BlockDriv= erState *bs, Error **errp) =20 if (!bdrv_has_changed_persistent_bitmaps(bs)) { /* nothing to do */ - return; + goto out; } =20 if (!can_write(bs)) { error_setg(errp, "No write access"); - return; + goto out; } =20 QSIMPLEQ_INIT(&drop_tables); =20 - if (s->nb_bitmaps =3D=3D 0) { - bm_list =3D bitmap_list_new(); - } else { - bm_list =3D bitmap_list_load(bs, errp); - if (bm_list =3D=3D NULL) { - return; - } + bm_list =3D get_bitmap_list(bs, errp); + if (bm_list =3D=3D NULL) { + goto out; } =20 /* check constraints and names */ @@ -1400,8 +1422,7 @@ void qcow2_store_persistent_dirty_bitmaps(BlockDriver= State *bs, Error **errp) g_free(tb); } =20 - bitmap_list_free(bm_list); - return; + goto out; =20 fail: QSIMPLEQ_FOREACH(bm, bm_list, entry) { @@ -1416,7 +1437,9 @@ fail: g_free(tb); } =20 - bitmap_list_free(bm_list); + out: + del_bitmap_list(bs); + return; } =20 int qcow2_reopen_bitmaps_ro(BlockDriverState *bs, Error **errp) @@ -1481,13 +1504,12 @@ bool qcow2_can_store_new_dirty_bitmap(BlockDriverSt= ate *bs, goto fail; } =20 - bm_list =3D bitmap_list_load(bs, errp); + bm_list =3D get_bitmap_list(bs, errp); if (bm_list =3D=3D NULL) { goto fail; } =20 found =3D find_bitmap_by_name(bm_list, name); - bitmap_list_free(bm_list); if (found) { error_setg(errp, "Bitmap with the same name is already stored"); goto fail; diff --git a/block/qcow2.c b/block/qcow2.c index 6fa5e1d71a..dbd334b150 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -2148,6 +2148,8 @@ static void qcow2_close(BlockDriverState *bs) =20 if (!(s->flags & BDRV_O_INACTIVE)) { qcow2_inactivate(bs); + } else { + qcow2_persistent_dirty_bitmaps_cache_destroy(bs); } =20 cache_clean_timer_del(bs); diff --git a/block/qcow2.h b/block/qcow2.h index 01b5250415..29b637a0ee 100644 --- a/block/qcow2.h +++ b/block/qcow2.h @@ -295,6 +295,7 @@ typedef struct BDRVQcow2State { uint64_t bitmap_directory_size; uint64_t bitmap_directory_offset; bool dirty_bitmaps_loaded; + void *bitmap_list; =20 int flags; int qcow_version; @@ -671,6 +672,7 @@ bool qcow2_load_dirty_bitmaps(BlockDriverState *bs, Err= or **errp); int qcow2_reopen_bitmaps_rw_hint(BlockDriverState *bs, bool *header_update= d, Error **errp); int qcow2_reopen_bitmaps_rw(BlockDriverState *bs, Error **errp); +void qcow2_persistent_dirty_bitmaps_cache_destroy(BlockDriverState *bs); void qcow2_store_persistent_dirty_bitmaps(BlockDriverState *bs, Error **er= rp); int qcow2_reopen_bitmaps_ro(BlockDriverState *bs, Error **errp); bool qcow2_can_store_new_dirty_bitmap(BlockDriverState *bs, --=20 2.14.3