ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bdev: encapsulate more members of spdk_bdev_io

Browse Source 
These submission related variables are not accessed from any of our
current bdev modules.

Change-Id: I69e21eea736273183dfeb48922890a4dc9a244cc
Signed-off-by: Seth Howell <seth.howell@intel.com>
Reviewed-on: https://review.gerrithub.io/416058
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
This commit is contained in:
Seth Howell 2018-06-19 16:27:19 -07:00 committed by Jim Harris
parent 90906933ac
commit 6e456969ab
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
include/spdk/bdev_module.h
View File

@ -311,17 +311,6 @@ struct spdk_bdev_io {
/** Context that will be passed to the completion callback */ /** Context that will be passed to the completion callback */
void *caller_ctx; void *caller_ctx;
/** Current tsc at submit time. Used to calculate latency at completion. */
uint64_t submit_tsc;
/**
* Set to true while the bdev module submit_request function is in progress.
*
* This is used to decide whether spdk_bdev_io_complete() can complete the I/O directly
* or if completion must be deferred via an event.
*/
bool in_submit_request;
/** Error information from a device */ /** Error information from a device */
union { union {
/** Only valid when status is SPDK_BDEV_IO_STATUS_NVME_ERROR */ /** Only valid when status is SPDK_BDEV_IO_STATUS_NVME_ERROR */
@ -405,6 +394,17 @@ struct spdk_bdev_io {
* must not read or write to these fields. * must not read or write to these fields.
*/ */
struct __bdev_io_internal_fields { struct __bdev_io_internal_fields {
/** Current tsc at submit time. Used to calculate latency at completion. */
uint64_t submit_tsc;
/**
* Set to true while the bdev module submit_request function is in progress.
*
* This is used to decide whether spdk_bdev_io_complete() can complete the I/O directly
* or if completion must be deferred via an event.
*/
bool in_submit_request;
/** Status for the IO */ /** Status for the IO */
int8_t status; int8_t status;

18
lib/bdev/bdev.c
View File

@ -1026,10 +1026,10 @@ _spdk_bdev_io_submit(void *ctx)
struct spdk_io_channel *ch = bdev_ch->channel; struct spdk_io_channel *ch = bdev_ch->channel;
struct spdk_bdev_shared_resource *shared_resource = bdev_ch->shared_resource; struct spdk_bdev_shared_resource *shared_resource = bdev_ch->shared_resource;
bdev_io->submit_tsc = spdk_get_ticks(); bdev_io->internal.submit_tsc = spdk_get_ticks();
bdev_ch->io_outstanding++; bdev_ch->io_outstanding++;
shared_resource->io_outstanding++; shared_resource->io_outstanding++;
bdev_io->in_submit_request = true; bdev_io->internal.in_submit_request = true;
if (spdk_likely(bdev_ch->flags == 0)) { if (spdk_likely(bdev_ch->flags == 0)) {
if (spdk_likely(TAILQ_EMPTY(&shared_resource->nomem_io))) { if (spdk_likely(TAILQ_EMPTY(&shared_resource->nomem_io))) {
bdev->fn_table->submit_request(ch, bdev_io); bdev->fn_table->submit_request(ch, bdev_io);
@ -1049,7 +1049,7 @@ _spdk_bdev_io_submit(void *ctx)
SPDK_ERRLOG("unknown bdev_ch flag %x found\n", bdev_ch->flags); SPDK_ERRLOG("unknown bdev_ch flag %x found\n", bdev_ch->flags);
spdk_bdev_io_complete(bdev_io, SPDK_BDEV_IO_STATUS_FAILED); spdk_bdev_io_complete(bdev_io, SPDK_BDEV_IO_STATUS_FAILED);
} }
bdev_io->in_submit_request = false; bdev_io->internal.in_submit_request = false;
} }
static void static void
@ -1082,9 +1082,9 @@ spdk_bdev_io_submit_reset(struct spdk_bdev_io *bdev_io)
assert(bdev_io->internal.status == SPDK_BDEV_IO_STATUS_PENDING); assert(bdev_io->internal.status == SPDK_BDEV_IO_STATUS_PENDING);
bdev_io->in_submit_request = true; bdev_io->internal.in_submit_request = true;
bdev->fn_table->submit_request(ch, bdev_io); bdev->fn_table->submit_request(ch, bdev_io);
bdev_io->in_submit_request = false; bdev_io->internal.in_submit_request = false;
} }
static void static void
@ -1096,7 +1096,7 @@ spdk_bdev_io_init(struct spdk_bdev_io *bdev_io,
bdev_io->caller_ctx = cb_arg; bdev_io->caller_ctx = cb_arg;
bdev_io->cb = cb; bdev_io->cb = cb;
bdev_io->internal.status = SPDK_BDEV_IO_STATUS_PENDING; bdev_io->internal.status = SPDK_BDEV_IO_STATUS_PENDING;
bdev_io->in_submit_request = false; bdev_io->internal.in_submit_request = false;
bdev_io->internal.buf = NULL; bdev_io->internal.buf = NULL;
bdev_io->io_submit_ch = NULL; bdev_io->io_submit_ch = NULL;
} }
@ -2340,7 +2340,7 @@ _spdk_bdev_io_complete(void *ctx)
{ {
struct spdk_bdev_io *bdev_io = ctx; struct spdk_bdev_io *bdev_io = ctx;
if (spdk_unlikely(bdev_io->in_submit_request || bdev_io->io_submit_ch)) { if (spdk_unlikely(bdev_io->internal.in_submit_request || bdev_io->io_submit_ch)) {
/* /*
* Send the completion to the thread that originally submitted the I/O, * Send the completion to the thread that originally submitted the I/O,
* which may not be the current thread in the case of QoS. * which may not be the current thread in the case of QoS.
@ -2364,12 +2364,12 @@ _spdk_bdev_io_complete(void *ctx)
case SPDK_BDEV_IO_TYPE_READ: 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.bytes_read += bdev_io->u.bdev.num_blocks * bdev_io->bdev->blocklen;
bdev_io->ch->stat.num_read_ops++; bdev_io->ch->stat.num_read_ops++;
bdev_io->ch->stat.read_latency_ticks += (spdk_get_ticks() - bdev_io->submit_tsc); bdev_io->ch->stat.read_latency_ticks += (spdk_get_ticks() - bdev_io->internal.submit_tsc);
break; break;
case SPDK_BDEV_IO_TYPE_WRITE: 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.bytes_written += bdev_io->u.bdev.num_blocks * bdev_io->bdev->blocklen;
bdev_io->ch->stat.num_write_ops++; bdev_io->ch->stat.num_write_ops++;
bdev_io->ch->stat.write_latency_ticks += (spdk_get_ticks() - bdev_io->submit_tsc); bdev_io->ch->stat.write_latency_ticks += (spdk_get_ticks() - bdev_io->internal.submit_tsc);
break; break;
default: default:
break; break;