block: add accounting for merged requests
Signed-off-by: Peter Lieven <pl@kamp.de> Reviewed-by: Eric Blake <eblake@redhat.com> Reviewed-by: Max Reitz <mreitz@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
parent
35f5a49374
commit
f4564d53c6
2
block.c
2
block.c
|
@ -4559,6 +4559,8 @@ static int multiwrite_merge(BlockDriverState *bs, BlockRequest *reqs,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
block_acct_merge_done(&bs->stats, BLOCK_ACCT_WRITE, num_reqs - outidx - 1);
|
||||||
|
|
||||||
return outidx + 1;
|
return outidx + 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -54,3 +54,10 @@ void block_acct_highest_sector(BlockAcctStats *stats, int64_t sector_num,
|
||||||
stats->wr_highest_sector = sector_num + nb_sectors - 1;
|
stats->wr_highest_sector = sector_num + nb_sectors - 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void block_acct_merge_done(BlockAcctStats *stats, enum BlockAcctType type,
|
||||||
|
int num_requests)
|
||||||
|
{
|
||||||
|
assert(type < BLOCK_MAX_IOTYPE);
|
||||||
|
stats->merged[type] += num_requests;
|
||||||
|
}
|
||||||
|
|
|
@ -335,6 +335,8 @@ static BlockStats *bdrv_query_stats(const BlockDriverState *bs,
|
||||||
s->stats->wr_bytes = bs->stats.nr_bytes[BLOCK_ACCT_WRITE];
|
s->stats->wr_bytes = bs->stats.nr_bytes[BLOCK_ACCT_WRITE];
|
||||||
s->stats->rd_operations = bs->stats.nr_ops[BLOCK_ACCT_READ];
|
s->stats->rd_operations = bs->stats.nr_ops[BLOCK_ACCT_READ];
|
||||||
s->stats->wr_operations = bs->stats.nr_ops[BLOCK_ACCT_WRITE];
|
s->stats->wr_operations = bs->stats.nr_ops[BLOCK_ACCT_WRITE];
|
||||||
|
s->stats->rd_merged = bs->stats.merged[BLOCK_ACCT_READ];
|
||||||
|
s->stats->wr_merged = bs->stats.merged[BLOCK_ACCT_WRITE];
|
||||||
s->stats->wr_highest_offset =
|
s->stats->wr_highest_offset =
|
||||||
bs->stats.wr_highest_sector * BDRV_SECTOR_SIZE;
|
bs->stats.wr_highest_sector * BDRV_SECTOR_SIZE;
|
||||||
s->stats->flush_operations = bs->stats.nr_ops[BLOCK_ACCT_FLUSH];
|
s->stats->flush_operations = bs->stats.nr_ops[BLOCK_ACCT_FLUSH];
|
||||||
|
|
6
hmp.c
6
hmp.c
|
@ -474,6 +474,8 @@ void hmp_info_blockstats(Monitor *mon, const QDict *qdict)
|
||||||
" wr_total_time_ns=%" PRId64
|
" wr_total_time_ns=%" PRId64
|
||||||
" rd_total_time_ns=%" PRId64
|
" rd_total_time_ns=%" PRId64
|
||||||
" flush_total_time_ns=%" PRId64
|
" flush_total_time_ns=%" PRId64
|
||||||
|
" rd_merged=%" PRId64
|
||||||
|
" wr_merged=%" PRId64
|
||||||
"\n",
|
"\n",
|
||||||
stats->value->stats->rd_bytes,
|
stats->value->stats->rd_bytes,
|
||||||
stats->value->stats->wr_bytes,
|
stats->value->stats->wr_bytes,
|
||||||
|
@ -482,7 +484,9 @@ void hmp_info_blockstats(Monitor *mon, const QDict *qdict)
|
||||||
stats->value->stats->flush_operations,
|
stats->value->stats->flush_operations,
|
||||||
stats->value->stats->wr_total_time_ns,
|
stats->value->stats->wr_total_time_ns,
|
||||||
stats->value->stats->rd_total_time_ns,
|
stats->value->stats->rd_total_time_ns,
|
||||||
stats->value->stats->flush_total_time_ns);
|
stats->value->stats->flush_total_time_ns,
|
||||||
|
stats->value->stats->rd_merged,
|
||||||
|
stats->value->stats->wr_merged);
|
||||||
}
|
}
|
||||||
|
|
||||||
qapi_free_BlockStatsList(stats_list);
|
qapi_free_BlockStatsList(stats_list);
|
||||||
|
|
|
@ -39,6 +39,7 @@ typedef struct BlockAcctStats {
|
||||||
uint64_t nr_bytes[BLOCK_MAX_IOTYPE];
|
uint64_t nr_bytes[BLOCK_MAX_IOTYPE];
|
||||||
uint64_t nr_ops[BLOCK_MAX_IOTYPE];
|
uint64_t nr_ops[BLOCK_MAX_IOTYPE];
|
||||||
uint64_t total_time_ns[BLOCK_MAX_IOTYPE];
|
uint64_t total_time_ns[BLOCK_MAX_IOTYPE];
|
||||||
|
uint64_t merged[BLOCK_MAX_IOTYPE];
|
||||||
uint64_t wr_highest_sector;
|
uint64_t wr_highest_sector;
|
||||||
} BlockAcctStats;
|
} BlockAcctStats;
|
||||||
|
|
||||||
|
@ -53,5 +54,7 @@ void block_acct_start(BlockAcctStats *stats, BlockAcctCookie *cookie,
|
||||||
void block_acct_done(BlockAcctStats *stats, BlockAcctCookie *cookie);
|
void block_acct_done(BlockAcctStats *stats, BlockAcctCookie *cookie);
|
||||||
void block_acct_highest_sector(BlockAcctStats *stats, int64_t sector_num,
|
void block_acct_highest_sector(BlockAcctStats *stats, int64_t sector_num,
|
||||||
unsigned int nb_sectors);
|
unsigned int nb_sectors);
|
||||||
|
void block_acct_merge_done(BlockAcctStats *stats, enum BlockAcctType type,
|
||||||
|
int num_requests);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -407,13 +407,20 @@
|
||||||
# growable sparse files (like qcow2) that are used on top
|
# growable sparse files (like qcow2) that are used on top
|
||||||
# of a physical device.
|
# of a physical device.
|
||||||
#
|
#
|
||||||
|
# @rd_merged: Number of read requests that have been merged into another
|
||||||
|
# request (Since 2.3).
|
||||||
|
#
|
||||||
|
# @wr_merged: Number of write requests that have been merged into another
|
||||||
|
# request (Since 2.3).
|
||||||
|
#
|
||||||
# Since: 0.14.0
|
# Since: 0.14.0
|
||||||
##
|
##
|
||||||
{ 'type': 'BlockDeviceStats',
|
{ 'type': 'BlockDeviceStats',
|
||||||
'data': {'rd_bytes': 'int', 'wr_bytes': 'int', 'rd_operations': 'int',
|
'data': {'rd_bytes': 'int', 'wr_bytes': 'int', 'rd_operations': 'int',
|
||||||
'wr_operations': 'int', 'flush_operations': 'int',
|
'wr_operations': 'int', 'flush_operations': 'int',
|
||||||
'flush_total_time_ns': 'int', 'wr_total_time_ns': 'int',
|
'flush_total_time_ns': 'int', 'wr_total_time_ns': 'int',
|
||||||
'rd_total_time_ns': 'int', 'wr_highest_offset': 'int' } }
|
'rd_total_time_ns': 'int', 'wr_highest_offset': 'int',
|
||||||
|
'rd_merged': 'int', 'wr_merged': 'int' } }
|
||||||
|
|
||||||
##
|
##
|
||||||
# @BlockStats:
|
# @BlockStats:
|
||||||
|
|
|
@ -2303,6 +2303,10 @@ Each json-object contain the following:
|
||||||
- "flush_total_time_ns": total time spend on cache flushes in nano-seconds (json-int)
|
- "flush_total_time_ns": total time spend on cache flushes in nano-seconds (json-int)
|
||||||
- "wr_highest_offset": Highest offset of a sector written since the
|
- "wr_highest_offset": Highest offset of a sector written since the
|
||||||
BlockDriverState has been opened (json-int)
|
BlockDriverState has been opened (json-int)
|
||||||
|
- "rd_merged": number of read requests that have been merged into
|
||||||
|
another request (json-int)
|
||||||
|
- "wr_merged": number of write requests that have been merged into
|
||||||
|
another request (json-int)
|
||||||
- "parent": Contains recursively the statistics of the underlying
|
- "parent": Contains recursively the statistics of the underlying
|
||||||
protocol (e.g. the host file for a qcow2 image). If there is
|
protocol (e.g. the host file for a qcow2 image). If there is
|
||||||
no underlying protocol, this field is omitted
|
no underlying protocol, this field is omitted
|
||||||
|
@ -2326,6 +2330,8 @@ Example:
|
||||||
"rd_total_times_ns":3465673657
|
"rd_total_times_ns":3465673657
|
||||||
"flush_total_times_ns":49653
|
"flush_total_times_ns":49653
|
||||||
"flush_operations":61,
|
"flush_operations":61,
|
||||||
|
"rd_merged":0,
|
||||||
|
"wr_merged":0
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"stats":{
|
"stats":{
|
||||||
|
@ -2337,7 +2343,9 @@ Example:
|
||||||
"flush_operations":51,
|
"flush_operations":51,
|
||||||
"wr_total_times_ns":313253456
|
"wr_total_times_ns":313253456
|
||||||
"rd_total_times_ns":3465673657
|
"rd_total_times_ns":3465673657
|
||||||
"flush_total_times_ns":49653
|
"flush_total_times_ns":49653,
|
||||||
|
"rd_merged":0,
|
||||||
|
"wr_merged":0
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -2351,7 +2359,9 @@ Example:
|
||||||
"flush_operations":0,
|
"flush_operations":0,
|
||||||
"wr_total_times_ns":0
|
"wr_total_times_ns":0
|
||||||
"rd_total_times_ns":0
|
"rd_total_times_ns":0
|
||||||
"flush_total_times_ns":0
|
"flush_total_times_ns":0,
|
||||||
|
"rd_merged":0,
|
||||||
|
"wr_merged":0
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -2365,7 +2375,9 @@ Example:
|
||||||
"flush_operations":0,
|
"flush_operations":0,
|
||||||
"wr_total_times_ns":0
|
"wr_total_times_ns":0
|
||||||
"rd_total_times_ns":0
|
"rd_total_times_ns":0
|
||||||
"flush_total_times_ns":0
|
"flush_total_times_ns":0,
|
||||||
|
"rd_merged":0,
|
||||||
|
"wr_merged":0
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -2379,7 +2391,9 @@ Example:
|
||||||
"flush_operations":0,
|
"flush_operations":0,
|
||||||
"wr_total_times_ns":0
|
"wr_total_times_ns":0
|
||||||
"rd_total_times_ns":0
|
"rd_total_times_ns":0
|
||||||
"flush_total_times_ns":0
|
"flush_total_times_ns":0,
|
||||||
|
"rd_merged":0,
|
||||||
|
"wr_merged":0
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|
Loading…
Reference in New Issue