From patchwork Sat Jul 29 16:41:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Sementsov-Ogievskiy X-Patchwork-Id: 795221 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xKWkt72c7z9sMN for ; Sun, 30 Jul 2017 02:44:06 +1000 (AEST) Received: from localhost ([::1]:52921 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dbUqS-00081i-UC for incoming@patchwork.ozlabs.org; Sat, 29 Jul 2017 12:44:04 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37698) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dbUo7-00060Q-1R for qemu-devel@nongnu.org; Sat, 29 Jul 2017 12:41:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dbUo5-00019E-1m for qemu-devel@nongnu.org; Sat, 29 Jul 2017 12:41:39 -0400 Received: from mailhub.sw.ru ([195.214.232.25]:49014 helo=relay.sw.ru) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dbUo4-00017q-HA for qemu-devel@nongnu.org; Sat, 29 Jul 2017 12:41:36 -0400 Received: from kvm.sw.ru (msk-vpn.virtuozzo.com [195.214.232.6]) by relay.sw.ru (8.13.4/8.13.4) with ESMTP id v6TGf4Nm031171; Sat, 29 Jul 2017 19:41:05 +0300 (MSK) From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org, qemu-block@nongnu.org Date: Sat, 29 Jul 2017 19:41:02 +0300 Message-Id: <20170729164104.29537-2-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.11.1 In-Reply-To: <20170729164104.29537-1-vsementsov@virtuozzo.com> References: <20170729164104.29537-1-vsementsov@virtuozzo.com> X-detected-operating-system: by eggs.gnu.org: OpenBSD 3.x [fuzzy] X-Received-From: 195.214.232.25 Subject: [Qemu-devel] [PATCH v4 1/3] block: add bdrv_get_format_alloc_stat format interface 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, armbru@redhat.com, mreitz@redhat.com, den@openvz.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The function should collect statistics, about used/unused by top-level format driver space (in its .file) and allocation status (data/zero/discarded/after-eof) of corresponding areas in this .file. Signed-off-by: Vladimir Sementsov-Ogievskiy --- block.c | 16 +++++++++++ include/block/block.h | 3 ++ include/block/block_int.h | 2 ++ qapi/block-core.json | 72 +++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 93 insertions(+) diff --git a/block.c b/block.c index 50ba264143..7d720ae0c2 100644 --- a/block.c +++ b/block.c @@ -3407,6 +3407,22 @@ int64_t bdrv_get_allocated_file_size(BlockDriverState *bs) } /** + * Collect format allocation info. See BlockFormatAllocInfo definition in + * qapi/block-core.json. + */ +int bdrv_get_format_alloc_stat(BlockDriverState *bs, BlockFormatAllocInfo *bfai) +{ + BlockDriver *drv = bs->drv; + if (!drv) { + return -ENOMEDIUM; + } + if (drv->bdrv_get_format_alloc_stat) { + return drv->bdrv_get_format_alloc_stat(bs, bfai); + } + return -ENOTSUP; +} + +/** * Return number of sectors on success, -errno on error. */ int64_t bdrv_nb_sectors(BlockDriverState *bs) diff --git a/include/block/block.h b/include/block/block.h index 9b355e92d8..646376a772 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -335,6 +335,9 @@ typedef enum { int bdrv_check(BlockDriverState *bs, BdrvCheckResult *res, BdrvCheckMode fix); +int bdrv_get_format_alloc_stat(BlockDriverState *bs, + BlockFormatAllocInfo *bfai); + /* The units of offset and total_work_size may be chosen arbitrarily by the * block driver; total_work_size may change during the course of the amendment * operation */ diff --git a/include/block/block_int.h b/include/block/block_int.h index 8d3724cce6..458c715e99 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -208,6 +208,8 @@ struct BlockDriver { int64_t (*bdrv_getlength)(BlockDriverState *bs); bool has_variable_length; int64_t (*bdrv_get_allocated_file_size)(BlockDriverState *bs); + int (*bdrv_get_format_alloc_stat)(BlockDriverState *bs, + BlockFormatAllocInfo *bfai); int coroutine_fn (*bdrv_co_pwritev_compressed)(BlockDriverState *bs, uint64_t offset, uint64_t bytes, QEMUIOVector *qiov); diff --git a/qapi/block-core.json b/qapi/block-core.json index ea0b3e8b13..93f6995381 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -139,6 +139,78 @@ '*format-specific': 'ImageInfoSpecific' } } ## +# @BlockFormatAllocInfo: +# +# +# Allocation information of an underlying protocol file, as partitioned by a +# format driver's utilization of said allocations. +# All fields are in bytes. +# +# Regions of the underlying protocol file may be considered used or unused by +# the format driver interpreting these regions. It is at the discretion of the +# format driver (e.g. qcow2) which regions of its backing storage are considered +# in-use or not. +# +# For now, the only format driver supporting this feature is Qcow2 which is a +# cluster based format. Clusters considered in-use by qcow2 are those with a +# non-zero refcount in the format metadata. All other clusters, if present, are +# considered unused. Examples of unused allocations for the Qcow2 format are +# leaked clusters, pre-allocated clusters, and recently freed clusters. +# +# Note: the whole underlying protocol file is described as well as all format +# file allocations, not only virtual disk data (metadata, internal snapshots, +# etc. are included). +# +# For the underlying protocol file there are native block-status types of the +# regions: +# - data: allocated data +# - zero: reported as zero (for example, this type corresponds to holes for +# POSIX files on sparce file-system) +# - discarded: not allocated +# 4th additional type is 'overrun', is data referenced by the format driver +# located beyond EOF of the underlying protocol file. For example, a partially +# allocated cluster at the end of a QCOW2 file, where Qcow2 generally operates +# on complete clusters. +# +# So, the fields are: +# +# @used-data: used by the format file and backed by data in the underlying +# protocol file +# +# @used-zero: used by the format file and backed by zeroes in the underlying +# protocol file; which may be a filesystem hole for POSIX files. +# +# @used-discarded: used by the format file but actually unallocated in the +# underlying protocol file +# +# @used-overrun: used by the format file beyond the end of the underlying +# protocol file +# +# @unused-data: allocated data in the underlying protocol file not used by the +# format file +# +# @unused-zero: reported-as-zero regions in the underlying protocol file not +# used by the format file +# +# @unused-discarded: unallocated areas in the underlying protocol file not used +# by the format file +# +# Note: sum of 6 fields {used,unused}-{data,zero,discarded} is equal to the +# length of the underlying protocol file. +# +# Since: 2.11 +# +## +{ 'struct': 'BlockFormatAllocInfo', + 'data': {'used-data': 'uint64', + 'used-zero': 'uint64', + 'used-discarded': 'uint64', + 'used-overrun': 'uint64', + 'unused-data': 'uint64', + 'unused-zero': 'uint64', + 'unused-discarded': 'uint64' } } + +## # @ImageCheck: # # Information about a QEMU image file check