this series adds the long missing multiread support to virtio-blk.
v4 cover this series adds the long missing multiread support to virtio-blk.
some remarks:
- i introduced rd_merged and wr_merged block accounting stats to blockstats as a generic interface which can be set from any driver that will introduce multirequest merging in the future.
- the old multiwrite interface is still there and might be removed.
v3->v4:
- added a patch to disable request merging in the virtio-blk device
- changed some static function names [Max]
- removed _identifiers [Max]
- removed to +1 in the check for max iovectors merged [Max, Kevin]
- changed type & 0xff to type & ~(VIRTIO_BLK_T_OUT | VIRTIO_BLK_T_BARRIER) [Max]
- initialize qiov before bounds check [Max]
- added an assertion to avoid overflowing mrb->reqs array [Max]
- added comments about the usage of qiov (internal vs. external) [Max]
v2->v3:
- completely reworked Patch 4 as it turned out that depending on the kernel even sequential requests fly in out of order or we receive a mix from different software queues.
v1->v2:
- add overflow checking for nb_sectors [Kevin]
- do not change the name of the macro of max mergable requests. [Fam]
RFC v2->v1:
- added Erics grammar corrections to Patch 4
- Patch 4
- reworked the IF tree to a SWITCH statement to make it easier to understand in virtio_blk_handle_request
- stop merging if requests switch from read to write or vice versa. e..g, otherwise we could introduce big delays as a small read request could be followed by a lot of write requests and the read requests sits there until the queue is empty.
RFC v1->RFC v2:
- completed Patch 1 by the example in qmp-commands.hx [Eric]
- used bool for merge in Patch 4 [Max]
- fixed a few typos in the commit msg of Patch 4 [Max]
- do not start merging and directly pass req[0]->qiov in case of num_reqs == 1
- avoid allocating memory for the multireq [Kevin]
- do not import block_int.h and add appropiate iface to block-backend [Kevin]
- removed debug output and added trace event for multireq [Kevin]
- fixed alloc hint for the merge qiov [Kevin]
- currently did not split virtio_submit_multireq into rw code since the redundant code would now be much bigger part than in the original patch.
- added a merge_qiov to VirtioBlockRequest. Abusing the qiov was not possible because it is initialized externally with guest memory [Kevin]
- added a pointer to VirtioBlockRequest to create a linked list of VirtioBlockBlockRequests. This list is used to complete all requests belonging to a multireq [Kevin]
Peter Lieven (5):
block: add accounting for merged requests hw/virtio-blk: add a constant for max number of merged requests
block-backend: expose bs->bl.max_transfer_length
virtio-blk: introduce multiread
virtio-blk: add a knob to disable request merging
block.c | 2 + block/accounting.c | 7 + block/block-backend.c | 5 + block/qapi.c | 2 + hmp.c | 6 +- hw/block/dataplane/virtio-blk.c | 8 +- hw/block/virtio-blk.c | 299 +++++++++++++++++++++++++++------------- include/block/accounting.h | 3 + include/hw/virtio/virtio-blk.h | 18 ++- include/sysemu/block-backend.h | 1 + qapi/block-core.json | 9 +- qmp-commands.hx | 22 ++- trace-events | 1 + 13 files changed, 273 insertions(+), 110 deletions(-)
Signature · 1 line
1.9.1
PATCH v4 1/5 block: add accounting for merged requests
--- block.c | 2 ++ block/accounting.c | 7 +++++++ block/qapi.c | 2 ++ hmp.c | 6 +++++- include/block/accounting.h | 3 +++ qapi/block-core.json | 9 ++++++++- qmp-commands.hx | 22 ++++++++++++++++++---- 7 files changed, 45 insertions(+), 6 deletions(-)
block.c +2 -0
@@ -4562,6 +4562,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 ; }
block/accounting.c +7 -0
@@ -54,3 +54,10 @@ void block_acct_highest_sector(BlockAcctStats *stats, int64_t sector_num, 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; +}
block/qapi.c +2 -0
@@ -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->rd_operations = bs->stats.nr_ops[BLOCK_ACCT_READ ]; 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 = bs->stats.wr_highest_sector *BDRV_SECTOR_SIZE ; s->stats->flush_operations = bs->stats.nr_ops[BLOCK_ACCT_FLUSH ];
hmp.c +5 -1
@@ -474,6 +474,8 @@ void hmp_info_blockstats(Monitor *mon, const QDict *qdict)" wr_total_time_ns=%" PRId64" rd_total_time_ns=%" PRId64" flush_total_time_ns=%" PRId64 +" rd_merged=%" PRId64 +" wr_merged=%" PRId64"\n" , stats->value->stats->rd_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->wr_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);
include/block/accounting.h +3 -0
@@ -39,6 +39,7 @@ typedef struct BlockAcctStats {uint64_t nr_bytes[BLOCK_MAX_IOTYPE ];uint64_t nr_ops[BLOCK_MAX_IOTYPE ];uint64_t total_time_ns[BLOCK_MAX_IOTYPE ]; +uint64_t merged[BLOCK_MAX_IOTYPE ];uint64_t wr_highest_sector; } BlockAcctStats;
@@ -53,5 +54,7 @@ void block_acct_start(BlockAcctStats *stats, BlockAcctCookie *cookie,void block_acct_done (BlockAcctStats *stats,BlockAcctCookie *cookie);void block_acct_highest_sector (BlockAcctStats *stats,int64_t sector_num,unsigned int nb_sectors); +void block_acct_merge_done (BlockAcctStats *stats,enum BlockAcctType type, +int num_requests);#endif
qapi/block-core.json +8 -1
@@ -407,13 +407,20 @@ # growable sparse files (like qcow2) that are used on top # 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 ## { 'type': 'BlockDeviceStats', 'data': {'rd_bytes': 'int', 'wr_bytes': 'int', 'rd_operations': 'int', 'wr_operations': 'int', 'flush_operations': '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:
qmp-commands.hx +18 -4
@@ -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) - "wr_highest_offset": Highest offset of a sector written since the 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 protocol (e.g. the host file for a qcow2 image). If there is no underlying protocol, this field is omitted
@@ -2326,6 +2330,8 @@ Example: "rd_total_times_ns":3465673657 "flush_total_times_ns":49653 "flush_operations":61, + "rd_merged":0, + "wr_merged":0 } }, "stats":{
@@ -2337,7 +2343,9 @@ Example: "flush_operations":51, "wr_total_times_ns":313253456 "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, "wr_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, "wr_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, "wr_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 } } ]
Signature · 1 line
1.9.1
PATCH v4 2/5 hw/virtio-blk: add a constant for max number of merged requests
In reply to Peter LievenAs it was not obvious (at least for me) where the 32 comes from; add a constant for it.
--- hw/block/virtio-blk.c | 2 +- include/hw/virtio/virtio-blk.h | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-)
hw/block/virtio-blk.c +1 -1
@@ -360,7 +360,7 @@ static void virtio_blk_handle_write(VirtIOBlockReq *req, MultiReqBuffer *mrb)block_acct_start (blk_get_stats (req->dev->blk), &req->acct, req->qiov.size,BLOCK_ACCT_WRITE ); -if (mrb->num_writes ==32 ) { +if (mrb->num_writes ==VIRTIO_BLK_MAX_MERGE_REQS ) {virtio_submit_multiwrite (req->dev->blk, mrb); }
include/hw/virtio/virtio-blk.h +3 -1
@@ -134,8 +134,10 @@ typedef struct VirtIOBlock {struct VirtIOBlockDataPlane *dataplane; } VirtIOBlock; +#define VIRTIO_BLK_MAX_MERGE_REQS 32 +typedef struct MultiReqBuffer { -BlockRequest blkreq[32 ]; +BlockRequest blkreq[VIRTIO_BLK_MAX_MERGE_REQS ];unsigned int num_writes; }MultiReqBuffer ;
Signature · 1 line
1.9.1
PATCH v4 3/5 block-backend: expose bs->bl.max_transfer_length
In reply to Peter Lieven--- block/block-backend.c | 5 +++++ include/sysemu/block-backend.h | 1 + 2 files changed, 6 insertions(+)
block/block-backend.c +5 -0
@@ -580,6 +580,11 @@ int blk_get_flags(BlockBackend *blk)return bdrv_get_flags (blk->bs); } +int blk_get_max_transfer_length (BlockBackend *blk) +{ +return blk->bs->bl.max_transfer_length; +} +void blk_set_guest_block_size (BlockBackend *blk,int align) {bdrv_set_guest_block_size (blk->bs, align);
include/sysemu/block-backend.h +1 -0
@@ -127,6 +127,7 @@ int blk_is_inserted(BlockBackend *blk);void blk_lock_medium (BlockBackend *blk,bool locked);void blk_eject (BlockBackend *blk,bool eject_flag);int blk_get_flags (BlockBackend *blk); +int blk_get_max_transfer_length (BlockBackend *blk);void blk_set_guest_block_size (BlockBackend *blk,int align);void *blk_blockalign (BlockBackend *blk,size_t size);bool blk_op_is_blocked (BlockBackend *blk,BlockOpType op,Error **errp);
Signature · 1 line
1.9.1
PATCH v4 4/5 virtio-blk: introduce multiread
In reply to Peter Lieventhis patch finally introduces multiread support to virtio-blk. While multiwrite support was there for a long time, read support was missing.
The complete merge logic is moved into virtio-blk.c which has been the only user of request merging ever since. This is required to be able to merge chunks of requests and immediately invoke callbacks for those requests. Secondly, this is required to switch to direct invocation of coroutines which is planned at a later stage.
The following benchmarks show the performance of running fio with 4 worker threads on a local ram disk. The numbers show the average of 10 test runs after 1 run as warmup phase.
| 4k | 64k | 4k MB/s | rd seq | rd rand | rd seq | rd rand | wr seq | wr rand --------------+--------+---------+--------+---------+--------+-------- master | 1221 | 1187 | 4178 | 4114 | 1745 | 1213 multiread | 1829 | 1189 | 4639 | 4110 | 1894 | 1216
--- hw/block/dataplane/virtio-blk.c | 8 +- hw/block/virtio-blk.c | 296 +++++++++++++++++++++++++++------------- include/hw/virtio/virtio-blk.h | 19 +-- trace-events | 1 + 4 files changed, 218 insertions(+), 106 deletions(-)
hw/block/dataplane/virtio-blk.c +4 -4
@@ -96,9 +96,7 @@ static void handle_notify(EventNotifier *e)event_notifier_test_and_clear (&s->host_notifier);blk_io_plug (s->conf->conf.blk);for (;;) { -MultiReqBuffer mrb = { - .num_writes =0 , - }; +MultiReqBuffer mrb = {};int ret;/* Disable guest->host notifies to avoid unnecessary vmexits */
@@ -120,7 +118,9 @@ static void handle_notify(EventNotifier *e)virtio_blk_handle_request (req, &mrb); } -virtio_submit_multiwrite (s->conf->conf.blk, &mrb); +if (mrb.num_reqs) { +virtio_blk_submit_multireq (s->conf->conf.blk, &mrb); + }if (likely (ret == -EAGAIN )) {/* vring emptied */ /* Re-enable guest->host notifies and stop processing the vring.
hw/block/virtio-blk.c +202 -94
382 lines not on this page · raw message
include/hw/virtio/virtio-blk.h +11 -8
@@ -134,29 +134,32 @@ typedef struct VirtIOBlock { struct VirtIOBlockDataPlane *dataplane; } VirtIOBlock; -#define VIRTIO_BLK_MAX_MERGE_REQS 32 - -typedef struct MultiReqBuffer { -BlockRequest blkreq[VIRTIO_BLK_MAX_MERGE_REQS ]; -unsigned int num_writes; -}MultiReqBuffer ; -typedef struct VirtIOBlockReq { +int64_t sector_num;VirtIOBlock *dev;VirtQueueElement elem;struct virtio_blk_inhdr *in;struct virtio_blk_outhdr out;QEMUIOVector qiov;struct VirtIOBlockReq *next; +struct VirtIOBlockReq *mr_next;BlockAcctCookie acct; }VirtIOBlockReq ; +#define VIRTIO_BLK_MAX_MERGE_REQS 32 + +typedef struct MultiReqBuffer { +VirtIOBlockReq *reqs[VIRTIO_BLK_MAX_MERGE_REQS ]; +unsigned int num_reqs; +bool is_write; +}MultiReqBuffer ; +VirtIOBlockReq *virtio_blk_alloc_request (VirtIOBlock *s);void virtio_blk_free_request (VirtIOBlockReq *req);void virtio_blk_handle_request (VirtIOBlockReq *req,MultiReqBuffer *mrb); -void virtio_submit_multiwrite (BlockBackend *blk,MultiReqBuffer *mrb); +void virtio_blk_submit_multireq (BlockBackend *blk,MultiReqBuffer *mrb);#endif
trace-events +1 -0
@@ -116,6 +116,7 @@ virtio_blk_req_complete(void *req, int status) "req %p status %d" virtio_blk_rw_complete(void *req, int ret) "req %p ret %d" virtio_blk_handle_write(void *req, uint64_t sector, size_t nsectors) "req %p sector %"PRIu64" nsectors %zu" virtio_blk_handle_read(void *req, uint64_t sector, size_t nsectors) "req %p sector %"PRIu64" nsectors %zu" +virtio_blk_submit_multireq(void *mrb, int start, int num_reqs, uint64_t sector, size_t nsectors, bool is_write) "mrb %p start %d num_reqs %d sector %"PRIu64" nsectors %zu is_write %d" # hw/block/dataplane/virtio-blk.c virtio_blk_data_plane_start(void *s) "dataplane %p"
Signature · 1 line
1.9.1
PATCH v4 5/5 virtio-blk: add a knob to disable request merging
In reply to Peter Lieventhis adds a knob to disable request merging for debugging or benchmarks if dedired.
--- hw/block/virtio-blk.c | 5 ++++- include/hw/virtio/virtio-blk.h | 1 + 2 files changed, 5 insertions(+), 1 deletion(-)
hw/block/virtio-blk.c +4 -1
@@ -531,7 +531,8 @@ void virtio_blk_handle_request(VirtIOBlockReq *req, MultiReqBuffer *mrb)/* merge would exceed maximum number of requests or IO direction * changes */ if (mrb->num_reqs >0 && (mrb->num_reqs ==VIRTIO_BLK_MAX_MERGE_REQS || - is_write != mrb->is_write)) { + is_write != mrb->is_write || + !req->dev->conf.request_merging)) {virtio_blk_submit_multireq (req->dev->blk, mrb); }
@@ -950,6 +951,8 @@ static Property virtio_blk_properties[] = {#ifdef __linux__DEFINE_PROP_BIT ("scsi" , VirtIOBlock, conf.scsi,0 , true), #endif +DEFINE_PROP_BIT ("request-merging" , VirtIOBlock, conf.request_merging,0 , + true),DEFINE_PROP_BIT ("x-data-plane" , VirtIOBlock, conf.data_plane,0 , false), DEFINE_PROP_END_OF_LIST(), };
include/hw/virtio/virtio-blk.h +1 -0
@@ -113,6 +113,7 @@ struct VirtIOBlkConfuint32_t scsi;uint32_t config_wce;uint32_t data_plane; +uint32_t request_merging; };struct VirtIOBlockDataPlane ;
Signature · 1 line
1.9.1
Kevin Wolf
AppliedAm 02.02.2015 um 14:52 hat Peter Lieven geschrieben:
Quoted 5 lines
some remarks:
- i introducedrd_mergedandwr_mergedblock accounting stats to blockstats as a generic interface which can be set from any driver that will introduce multirequest merging in the future.
- the old multiwrite interface is still there and might be removed.
Thanks, applied to the block branch.
Kevin