From 41d94136e60418706ac46cab4fa21aead3262d85 Mon Sep 17 00:00:00 2001 From: Ben Walker Date: Thu, 19 Apr 2018 13:27:17 -0700 Subject: [PATCH] bdev: I/O stats are now kept on the io_submit_ch For bdev I/O that gets passed to another thread for handling, such as in the QoS case, make sure the I/O stats are tracked on the original submitting thread. Change-Id: Ieaba168dde5eb24314e5cf64bb063faaca2b5be7 Signed-off-by: Ben Walker Reviewed-on: https://review.gerrithub.io/408399 Reviewed-by: Daniel Verkamp Tested-by: SPDK Automated Test System Reviewed-by: Shuhei Matsumoto --- lib/bdev/bdev.c | 74 ++++++++++++++++++++++++------------------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/lib/bdev/bdev.c b/lib/bdev/bdev.c index 6e253a7ff..158328c2e 100644 --- a/lib/bdev/bdev.c +++ b/lib/bdev/bdev.c @@ -2141,6 +2141,43 @@ _spdk_bdev_io_complete(void *ctx) return; } + if (bdev_io->status == SPDK_BDEV_IO_STATUS_SUCCESS) { + switch (bdev_io->type) { + case SPDK_BDEV_IO_TYPE_READ: + bdev_io->ch->stat.bytes_read += bdev_io->u.bdev.num_blocks * bdev_io->bdev->blocklen; + bdev_io->ch->stat.num_read_ops++; + bdev_io->ch->stat.read_latency_ticks += (spdk_get_ticks() - bdev_io->submit_tsc); + break; + case SPDK_BDEV_IO_TYPE_WRITE: + bdev_io->ch->stat.bytes_written += bdev_io->u.bdev.num_blocks * bdev_io->bdev->blocklen; + bdev_io->ch->stat.num_write_ops++; + bdev_io->ch->stat.write_latency_ticks += (spdk_get_ticks() - bdev_io->submit_tsc); + break; + default: + break; + } + } + +#ifdef SPDK_CONFIG_VTUNE + uint64_t now_tsc = spdk_get_ticks(); + if (now_tsc > (bdev_io->ch->start_tsc + bdev_io->ch->interval_tsc)) { + uint64_t data[5]; + + data[0] = bdev_io->ch->stat.num_read_ops; + data[1] = bdev_io->ch->stat.bytes_read; + data[2] = bdev_io->ch->stat.num_write_ops; + data[3] = bdev_io->ch->stat.bytes_written; + data[4] = bdev_io->bdev->fn_table->get_spin_time ? + bdev_io->bdev->fn_table->get_spin_time(bdev_io->ch->channel) : 0; + + __itt_metadata_add(g_bdev_mgr.domain, __itt_null, bdev_io->ch->handle, + __itt_metadata_u64, 5, data); + + memset(&bdev_io->ch->stat, 0, sizeof(bdev_io->ch->stat)); + bdev_io->ch->start_tsc = now_tsc; + } +#endif + assert(bdev_io->cb != NULL); assert(spdk_get_thread() == spdk_io_channel_get_thread(bdev_io->ch->channel)); @@ -2243,43 +2280,6 @@ spdk_bdev_io_complete(struct spdk_bdev_io *bdev_io, enum spdk_bdev_io_status sta } } - if (status == SPDK_BDEV_IO_STATUS_SUCCESS) { - switch (bdev_io->type) { - case SPDK_BDEV_IO_TYPE_READ: - bdev_ch->stat.bytes_read += bdev_io->u.bdev.num_blocks * bdev->blocklen; - bdev_ch->stat.num_read_ops++; - bdev_ch->stat.read_latency_ticks += (spdk_get_ticks() - bdev_io->submit_tsc); - break; - case SPDK_BDEV_IO_TYPE_WRITE: - bdev_ch->stat.bytes_written += bdev_io->u.bdev.num_blocks * bdev->blocklen; - bdev_ch->stat.num_write_ops++; - bdev_ch->stat.write_latency_ticks += (spdk_get_ticks() - bdev_io->submit_tsc); - break; - default: - break; - } - } - -#ifdef SPDK_CONFIG_VTUNE - uint64_t now_tsc = spdk_get_ticks(); - if (now_tsc > (bdev_ch->start_tsc + bdev_ch->interval_tsc)) { - uint64_t data[5]; - - data[0] = bdev_ch->stat.num_read_ops; - data[1] = bdev_ch->stat.bytes_read; - data[2] = bdev_ch->stat.num_write_ops; - data[3] = bdev_ch->stat.bytes_written; - data[4] = bdev->fn_table->get_spin_time ? - bdev->fn_table->get_spin_time(bdev_ch->channel) : 0; - - __itt_metadata_add(g_bdev_mgr.domain, __itt_null, bdev_ch->handle, - __itt_metadata_u64, 5, data); - - memset(&bdev_ch->stat, 0, sizeof(bdev_ch->stat)); - bdev_ch->start_tsc = now_tsc; - } -#endif - _spdk_bdev_io_complete(bdev_io); }