Commit d9245599 authored by Anton Nefedov's avatar Anton Nefedov Committed by Max Reitz
Browse files

qapi: query-blockstat: add driver specific file-posix stats 



A block driver can provide a callback to report driver-specific
statistics.

file-posix driver now reports discard statistics

Signed-off-by: default avatarAnton Nefedov <anton.nefedov@virtuozzo.com>
Reviewed-by: default avatarVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Acked-by: default avatarMarkus Armbruster <armbru@redhat.com>
Message-id: 20190923121737.83281-10-anton.nefedov@virtuozzo.com
Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
parent 1c450366

block.c

+9 −0
Original line number Diff line number Diff line
@@ -5155,6 +5155,15 @@ ImageInfoSpecific *bdrv_get_specific_info(BlockDriverState *bs, 
    return NULL;

}



BlockStatsSpecific *bdrv_get_specific_stats(BlockDriverState *bs)

{

    BlockDriver *drv = bs->drv;

    if (!drv || !drv->bdrv_get_specific_stats) {

        return NULL;

    }

    return drv->bdrv_get_specific_stats(bs);

}



void bdrv_debug_event(BlockDriverState *bs, BlkdebugEvent event)

{

    if (!bs || !bs->drv || !bs->drv->bdrv_debug_event) {

block/file-posix.c

+32 −0
Original line number Diff line number Diff line
@@ -2753,6 +2753,36 @@ static int raw_get_info(BlockDriverState *bs, BlockDriverInfo *bdi) 
    return 0;

}



static BlockStatsSpecificFile get_blockstats_specific_file(BlockDriverState *bs)

{

    BDRVRawState *s = bs->opaque;

    return (BlockStatsSpecificFile) {

        .discard_nb_ok = s->stats.discard_nb_ok,

        .discard_nb_failed = s->stats.discard_nb_failed,

        .discard_bytes_ok = s->stats.discard_bytes_ok,

    };

}



static BlockStatsSpecific *raw_get_specific_stats(BlockDriverState *bs)

{

    BlockStatsSpecific *stats = g_new(BlockStatsSpecific, 1);



    stats->driver = BLOCKDEV_DRIVER_FILE;

    stats->u.file = get_blockstats_specific_file(bs);



    return stats;

}



static BlockStatsSpecific *hdev_get_specific_stats(BlockDriverState *bs)

{

    BlockStatsSpecific *stats = g_new(BlockStatsSpecific, 1);



    stats->driver = BLOCKDEV_DRIVER_HOST_DEVICE;

    stats->u.host_device = get_blockstats_specific_file(bs);



    return stats;

}



static QemuOptsList raw_create_opts = {

    .name = "raw-create-opts",

    .head = QTAILQ_HEAD_INITIALIZER(raw_create_opts.head),
@@ -2960,6 +2990,7 @@ BlockDriver bdrv_file = { 
    .bdrv_get_info = raw_get_info,

    .bdrv_get_allocated_file_size

                        = raw_get_allocated_file_size,

    .bdrv_get_specific_stats = raw_get_specific_stats,

    .bdrv_check_perm = raw_check_perm,

    .bdrv_set_perm   = raw_set_perm,

    .bdrv_abort_perm_update = raw_abort_perm_update,
@@ -3438,6 +3469,7 @@ static BlockDriver bdrv_host_device = { 
    .bdrv_get_info = raw_get_info,

    .bdrv_get_allocated_file_size

                        = raw_get_allocated_file_size,

    .bdrv_get_specific_stats = hdev_get_specific_stats,

    .bdrv_check_perm = raw_check_perm,

    .bdrv_set_perm   = raw_set_perm,

    .bdrv_abort_perm_update = raw_abort_perm_update,

block/qapi.c

+5 −0
Original line number Diff line number Diff line
@@ -543,6 +543,11 @@ static BlockStats *bdrv_query_bds_stats(BlockDriverState *bs, 


    s->stats->wr_highest_offset = stat64_get(&bs->wr_highest_offset);



    s->driver_specific = bdrv_get_specific_stats(bs);

    if (s->driver_specific) {

        s->has_driver_specific = true;

    }



    if (bs->file) {

        s->has_parent = true;

        s->parent = bdrv_query_bds_stats(bs->file->bs, blk_level);

include/block/block.h

+1 −0
Original line number Diff line number Diff line
@@ -501,6 +501,7 @@ int bdrv_get_flags(BlockDriverState *bs); 
int bdrv_get_info(BlockDriverState *bs, BlockDriverInfo *bdi);

ImageInfoSpecific *bdrv_get_specific_info(BlockDriverState *bs,

                                          Error **errp);

BlockStatsSpecific *bdrv_get_specific_stats(BlockDriverState *bs);

void bdrv_round_to_clusters(BlockDriverState *bs,

                            int64_t offset, int64_t bytes,

                            int64_t *cluster_offset,

include/block/block_int.h

+1 −0
Original line number Diff line number Diff line
@@ -366,6 +366,7 @@ struct BlockDriver { 
    int (*bdrv_get_info)(BlockDriverState *bs, BlockDriverInfo *bdi);

    ImageInfoSpecific *(*bdrv_get_specific_info)(BlockDriverState *bs,

                                                 Error **errp);

    BlockStatsSpecific *(*bdrv_get_specific_stats)(BlockDriverState *bs);



    int coroutine_fn (*bdrv_save_vmstate)(BlockDriverState *bs,

                                          QEMUIOVector *qiov,