From patchwork Mon Aug 8 15:05:18 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Sementsov-Ogievskiy X-Patchwork-Id: 9268577 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3BB4E607D6 for ; Mon, 8 Aug 2016 15:32:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2E0A6283FD for ; Mon, 8 Aug 2016 15:32:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 22D7C283FE; Mon, 8 Aug 2016 15:32:40 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B515B283F8 for ; Mon, 8 Aug 2016 15:32:39 +0000 (UTC) Received: from localhost ([::1]:58123 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bWmXe-00008W-Ri for patchwork-qemu-devel@patchwork.kernel.org; Mon, 08 Aug 2016 11:32:38 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42460) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bWm7U-00070x-Qp for qemu-devel@nongnu.org; Mon, 08 Aug 2016 11:05:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bWm7Q-0004TM-9F for qemu-devel@nongnu.org; Mon, 08 Aug 2016 11:05:36 -0400 Received: from mailhub.sw.ru ([195.214.232.25]:26501 helo=relay.sw.ru) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bWm7P-0004RA-OD for qemu-devel@nongnu.org; Mon, 08 Aug 2016 11:05:32 -0400 Received: from kvm.qa.sw.ru. ([10.28.8.145]) by relay.sw.ru (8.13.4/8.13.4) with ESMTP id u77NfZcd001857; Mon, 8 Aug 2016 02:41:39 +0300 (MSK) From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org, qemu-devel@nongnu.org Date: Mon, 8 Aug 2016 18:05:18 +0300 Message-Id: <1470668720-211300-28-git-send-email-vsementsov@virtuozzo.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1470668720-211300-1-git-send-email-vsementsov@virtuozzo.com> References: <1470668720-211300-1-git-send-email-vsementsov@virtuozzo.com> X-detected-operating-system: by eggs.gnu.org: OpenBSD 3.x X-Received-From: 195.214.232.25 Subject: [Qemu-devel] [PATCH 27/29] qcow2-bitmap: delete in_use bitmaps on image load 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: kwolf@redhat.com, vsementsov@virtuozzo.com, famz@redhat.com, armbru@redhat.com, mreitz@redhat.com, stefanha@redhat.com, pbonzini@redhat.com, den@openvz.org, jsnow@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Vladimir Sementsov-Ogievskiy Signed-off-by: Denis V. Lunev --- block/qcow2-bitmap.c | 95 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 95 insertions(+) diff --git a/block/qcow2-bitmap.c b/block/qcow2-bitmap.c index 49066bd..e94019c 100644 --- a/block/qcow2-bitmap.c +++ b/block/qcow2-bitmap.c @@ -28,6 +28,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "qemu/cutils.h" +#include "qemu/log.h" #include "block/block_int.h" #include "block/qcow2.h" @@ -132,6 +133,17 @@ static inline QCow2BitmapHeader *next_dir_entry(QCow2BitmapHeader *entry) return (QCow2BitmapHeader *)((uint8_t *)entry + dir_entry_size(entry)); } +static inline void bitmap_directory_to_cpu(uint8_t *dir, size_t size) +{ + QCow2BitmapHeader *h; + + /* loop is safe because next entry offset is calculated after conversion to + * cpu format */ + for_each_bitmap_header_in_dir(h, dir, size) { + bitmap_header_to_cpu(h); + } +} + static inline void bitmap_directory_to_be(uint8_t *dir, size_t size) { uint8_t *end = dir + size; @@ -241,6 +253,7 @@ static int load_autoload_bitmaps(BlockDriverState *bs, Error **errp) return 0; } +static int handle_in_use_bitmaps(BlockDriverState *bs); int qcow2_read_bitmaps(BlockDriverState *bs, Error **errp) { int ret; @@ -262,6 +275,19 @@ int qcow2_read_bitmaps(BlockDriverState *bs, Error **errp) return -EINVAL; } + if (can_write(bs)) { + ret = handle_in_use_bitmaps(bs); + if (ret < 0) { + error_setg_errno(errp, -ret, "Can't delete in_use bitmaps."); + goto fail; + } + + if (s->nb_bitmaps == 0) { + /* No bitmaps - nothing to do */ + return 0; + } + } + ret = load_autoload_bitmaps(bs, errp); if (ret < 0) { goto fail; @@ -685,6 +711,75 @@ int qcow2_delete_bitmaps(BlockDriverState *bs) return directory_update(bs, NULL, 0, 0); } +static int handle_in_use_bitmaps(BlockDriverState *bs) +{ + int ret; + BDRVQcow2State *s = bs->opaque; + uint64_t new_size = 0; + uint32_t new_nb_bitmaps = 0; + uint8_t *new_dir = NULL, *p; + QCow2BitmapHeader *h; + + /* free in_use bitmaps clusters */ + for_each_bitmap_header(h, s) { + if (h->flags & BME_FLAG_IN_USE) { + free_bitmap_clusters(bs, h); + h->bitmap_table_offset = 0; + h->bitmap_table_size = 0; + } else { + new_size += dir_entry_size(h); + new_nb_bitmaps++; + } + } + + /* no in_use bitmaps */ + if (new_nb_bitmaps == s->nb_bitmaps) { + return 0; + } + + /* just update bitmap directory with freed out in_use bitmaps */ + if (!(bdrv_get_flags(bs) & BDRV_O_CHECK)) { + bitmap_directory_to_be(s->bitmap_directory, s->bitmap_directory_size); + ret = bdrv_pwrite(bs->file, + s->bitmap_directory_offset, + s->bitmap_directory, + s->bitmap_directory_size); + bitmap_directory_to_cpu(s->bitmap_directory, s->bitmap_directory_size); + + return ret; + } + + if (new_nb_bitmaps == 0) { + goto update; + } + + p = new_dir = g_try_malloc(new_size); + if (new_dir == NULL) { + return -ENOMEM; + } + + for_each_bitmap_header(h, s) { + if (h->flags & BME_FLAG_IN_USE) { + char *bitmap_name = g_strndup((char *)(h + 1), h->name_size); + qemu_log("Delete corrupted (in_use) bitmap '%s' from device '%s'\n", + bitmap_name, bdrv_get_device_or_node_name(bs)); + g_free(bitmap_name); + } else { + memcpy(p, h, dir_entry_size(h)); + p += dir_entry_size(h); + } + } + +update: + ret = directory_update(bs, new_dir, new_size, new_nb_bitmaps); + if (ret < 0) { + g_free(new_dir); + return ret; + } + + return 0; +} + /* store_bitmap_data() * Store bitmap to image, filling bitamp table accordingly. */