bdev: Add counts per I/O error status into I/O statistics
Define struct spdk_bdev_io_error_stat privately in lib/bdev/bdev.c. Add a pointer to struct spdk_bdev_io_error_stat to struct spdk_bdev_io_stat. Allocate spdk_bdev_io_error_stat for bdev and RPC, but do not allocate spdk_bdev_io_error_stat for I/O channel. Dump the contents of spdk_bdev_io_error_stat only if its total is non-zero. As a result of these, only spdk_bdev_get_device_stat() can query spdk_bdev_io_error_stat for the bdev_get_iostat RPC. This will be acceptable. Signed-off-by: Shuhei Matsumoto <smatsumoto@nvidia.com> Change-Id: Idae868afe65347a96529eedc3dcc692101de4a29 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/14826 Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Reviewed-by: Konrad Sztyber <konrad.sztyber@intel.com> Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
This commit is contained in:
Shuhei Matsumoto
Tomasz Zawadzki
parent
99de60a36f
commit
53a9a8c4d1
@ -25,7 +25,7 @@ New APIs `spdk_bdev_for_each_channel` and `spdk_bdev_for_each_channel_continue`
|
||||
associated function pointers were added to iterate each channel of the required bdev.
|
||||
|
||||
The RPC `bdev_get_iostat` now allows a user to query the per channel IO statistics for
|
||||
required bdev.
|
||||
required bdev, and displays maximum and minimum latencies and I/O error counts.
|
||||
|
||||
New `spdk_bdev_copy_blocks` and `spdk_bdev_get_max_copy` APIs to support copy commands.
|
||||
|
||||
|
||||
@ -150,6 +150,8 @@ typedef void (*spdk_bdev_io_completion_cb)(struct spdk_bdev_io *bdev_io,
|
||||
bool success,
|
||||
void *cb_arg);
|
||||
|
||||
struct spdk_bdev_io_error_stat;
|
||||
|
||||
struct spdk_bdev_io_stat {
|
||||
uint64_t bytes_read;
|
||||
uint64_t num_read_ops;
|
||||
@ -172,6 +174,13 @@ struct spdk_bdev_io_stat {
|
||||
uint64_t max_copy_latency_ticks;
|
||||
uint64_t min_copy_latency_ticks;
|
||||
uint64_t ticks_rate;
|
||||
|
||||
/* This data structure is privately defined in the bdev library.
|
||||
* This data structure is only used by the bdev_get_iostat RPC now.
|
||||
*/
|
||||
struct spdk_bdev_io_error_stat *io_error;
|
||||
|
||||
/* For efficient deep copy, no members should be added after io_error. */
|
||||
};
|
||||
|
||||
struct spdk_bdev_opts {
|
||||
|
||||
@ -335,6 +335,10 @@ struct spdk_bdev_channel_iter {
|
||||
void *ctx;
|
||||
};
|
||||
|
||||
struct spdk_bdev_io_error_stat {
|
||||
uint32_t error_status[-SPDK_MIN_BDEV_IO_STATUS];
|
||||
};
|
||||
|
||||
#define __bdev_to_io_dev(bdev) (((char *)bdev) + 1)
|
||||
#define __bdev_from_io_dev(io_dev) ((struct spdk_bdev *)(((char *)io_dev) - 1))
|
||||
#define __io_ch_to_bdev_ch(io_ch) ((struct spdk_bdev_channel *)spdk_io_channel_get_ctx(io_ch))
|
||||
@ -502,6 +506,38 @@ spdk_bdev_get_by_name(const char *bdev_name)
|
||||
return bdev;
|
||||
}
|
||||
|
||||
struct bdev_io_status_string {
|
||||
enum spdk_bdev_io_status status;
|
||||
const char *str;
|
||||
};
|
||||
|
||||
static const struct bdev_io_status_string bdev_io_status_strings[] = {
|
||||
{ SPDK_BDEV_IO_STATUS_AIO_ERROR, "aio_error" },
|
||||
{ SPDK_BDEV_IO_STATUS_ABORTED, "aborted" },
|
||||
{ SPDK_BDEV_IO_STATUS_FIRST_FUSED_FAILED, "first_fused_failed" },
|
||||
{ SPDK_BDEV_IO_STATUS_MISCOMPARE, "miscompare" },
|
||||
{ SPDK_BDEV_IO_STATUS_NOMEM, "nomem" },
|
||||
{ SPDK_BDEV_IO_STATUS_SCSI_ERROR, "scsi_error" },
|
||||
{ SPDK_BDEV_IO_STATUS_NVME_ERROR, "nvme_error" },
|
||||
{ SPDK_BDEV_IO_STATUS_FAILED, "failed" },
|
||||
{ SPDK_BDEV_IO_STATUS_PENDING, "pending" },
|
||||
{ SPDK_BDEV_IO_STATUS_SUCCESS, "success" },
|
||||
};
|
||||
|
||||
static const char *
|
||||
bdev_io_status_get_string(enum spdk_bdev_io_status status)
|
||||
{
|
||||
uint32_t i;
|
||||
|
||||
for (i = 0; i < SPDK_COUNTOF(bdev_io_status_strings); i++) {
|
||||
if (bdev_io_status_strings[i].status == status) {
|
||||
return bdev_io_status_strings[i].str;
|
||||
}
|
||||
}
|
||||
|
||||
return "reserved";
|
||||
}
|
||||
|
||||
struct spdk_bdev_wait_for_examine_ctx {
|
||||
struct spdk_poller *poller;
|
||||
spdk_bdev_wait_for_examine_cb cb_fn;
|
||||
@ -3417,7 +3453,7 @@ bdev_channel_create(void *io_device, void *ctx_buf)
|
||||
TAILQ_INIT(&ch->io_submitted);
|
||||
TAILQ_INIT(&ch->io_locked);
|
||||
|
||||
ch->stat = bdev_alloc_io_stat();
|
||||
ch->stat = bdev_alloc_io_stat(false);
|
||||
if (ch->stat == NULL) {
|
||||
bdev_channel_destroy_resource(ch);
|
||||
return -1;
|
||||
@ -3438,7 +3474,7 @@ bdev_channel_create(void *io_device, void *ctx_buf)
|
||||
free(name);
|
||||
ch->start_tsc = spdk_get_ticks();
|
||||
ch->interval_tsc = spdk_get_ticks_hz() / 100;
|
||||
ch->prev_stat = bdev_alloc_io_stat();
|
||||
ch->prev_stat = bdev_alloc_io_stat(false);
|
||||
if (ch->prev_stat == NULL) {
|
||||
bdev_channel_destroy_resource(ch);
|
||||
return -1;
|
||||
@ -3690,7 +3726,12 @@ bdev_add_io_stat(struct spdk_bdev_io_stat *total, struct spdk_bdev_io_stat *add)
|
||||
static void
|
||||
bdev_get_io_stat(struct spdk_bdev_io_stat *to_stat, struct spdk_bdev_io_stat *from_stat)
|
||||
{
|
||||
memcpy(to_stat, from_stat, sizeof(struct spdk_bdev_io_stat));
|
||||
memcpy(to_stat, from_stat, offsetof(struct spdk_bdev_io_stat, io_error));
|
||||
|
||||
if (to_stat->io_error != NULL && from_stat->io_error != NULL) {
|
||||
memcpy(to_stat->io_error, from_stat->io_error,
|
||||
sizeof(struct spdk_bdev_io_error_stat));
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
@ -3718,30 +3759,49 @@ bdev_reset_io_stat(struct spdk_bdev_io_stat *stat, enum bdev_reset_stat_mode mod
|
||||
stat->read_latency_ticks = 0;
|
||||
stat->write_latency_ticks = 0;
|
||||
stat->unmap_latency_ticks = 0;
|
||||
|
||||
if (stat->io_error != NULL) {
|
||||
memset(stat->io_error, 0, sizeof(struct spdk_bdev_io_error_stat));
|
||||
}
|
||||
}
|
||||
|
||||
struct spdk_bdev_io_stat *
|
||||
bdev_alloc_io_stat(void)
|
||||
bdev_alloc_io_stat(bool io_error_stat)
|
||||
{
|
||||
struct spdk_bdev_io_stat *stat;
|
||||
|
||||
stat = malloc(sizeof(struct spdk_bdev_io_stat));
|
||||
if (stat != NULL) {
|
||||
bdev_reset_io_stat(stat, BDEV_RESET_STAT_ALL);
|
||||
if (stat == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
if (io_error_stat) {
|
||||
stat->io_error = malloc(sizeof(struct spdk_bdev_io_error_stat));
|
||||
if (stat->io_error == NULL) {
|
||||
free(stat);
|
||||
return NULL;
|
||||
}
|
||||
} else {
|
||||
stat->io_error = NULL;
|
||||
}
|
||||
|
||||
bdev_reset_io_stat(stat, BDEV_RESET_STAT_ALL);
|
||||
|
||||
return stat;
|
||||
}
|
||||
|
||||
void
|
||||
bdev_free_io_stat(struct spdk_bdev_io_stat *stat)
|
||||
{
|
||||
free(stat->io_error);
|
||||
free(stat);
|
||||
}
|
||||
|
||||
void
|
||||
bdev_dump_io_stat_json(struct spdk_bdev_io_stat *stat, struct spdk_json_write_ctx *w)
|
||||
{
|
||||
int i;
|
||||
|
||||
spdk_json_write_named_uint64(w, "bytes_read", stat->bytes_read);
|
||||
spdk_json_write_named_uint64(w, "num_read_ops", stat->num_read_ops);
|
||||
spdk_json_write_named_uint64(w, "bytes_written", stat->bytes_written);
|
||||
@ -3770,6 +3830,17 @@ bdev_dump_io_stat_json(struct spdk_bdev_io_stat *stat, struct spdk_json_write_ct
|
||||
spdk_json_write_named_uint64(w, "min_copy_latency_ticks",
|
||||
stat->min_copy_latency_ticks != UINT64_MAX ?
|
||||
stat->min_copy_latency_ticks : 0);
|
||||
|
||||
if (stat->io_error != NULL) {
|
||||
spdk_json_write_named_object_begin(w, "io_error");
|
||||
for (i = 0; i < -SPDK_MIN_BDEV_IO_STATUS; i++) {
|
||||
if (stat->io_error->error_status[i] != 0) {
|
||||
spdk_json_write_named_uint32(w, bdev_io_status_get_string(-(i + 1)),
|
||||
stat->io_error->error_status[i]);
|
||||
}
|
||||
}
|
||||
spdk_json_write_object_end(w);
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
@ -6161,11 +6232,12 @@ spdk_bdev_queue_io_wait(struct spdk_bdev *bdev, struct spdk_io_channel *ch,
|
||||
static inline void
|
||||
bdev_io_update_io_stat(struct spdk_bdev_io *bdev_io, uint64_t tsc_diff)
|
||||
{
|
||||
enum spdk_bdev_io_status io_status = bdev_io->internal.status;
|
||||
struct spdk_bdev_io_stat *io_stat = bdev_io->internal.ch->stat;
|
||||
uint64_t num_blocks = bdev_io->u.bdev.num_blocks;
|
||||
uint32_t blocklen = bdev_io->bdev->blocklen;
|
||||
|
||||
if (spdk_likely(bdev_io->internal.status == SPDK_BDEV_IO_STATUS_SUCCESS)) {
|
||||
if (spdk_likely(io_status == SPDK_BDEV_IO_STATUS_SUCCESS)) {
|
||||
switch (bdev_io->type) {
|
||||
case SPDK_BDEV_IO_TYPE_READ:
|
||||
io_stat->bytes_read += num_blocks * blocklen;
|
||||
@ -6240,6 +6312,13 @@ bdev_io_update_io_stat(struct spdk_bdev_io *bdev_io, uint64_t tsc_diff)
|
||||
default:
|
||||
break;
|
||||
}
|
||||
} else if (io_status <= SPDK_BDEV_IO_STATUS_FAILED && io_status >= SPDK_MIN_BDEV_IO_STATUS) {
|
||||
io_stat = bdev_io->bdev->internal.stat;
|
||||
assert(io_stat->io_error != NULL);
|
||||
|
||||
spdk_spin_lock(&bdev_io->bdev->internal.spinlock);
|
||||
io_stat->io_error->error_status[-io_status - 1]++;
|
||||
spdk_spin_unlock(&bdev_io->bdev->internal.spinlock);
|
||||
}
|
||||
|
||||
#ifdef SPDK_CONFIG_VTUNE
|
||||
@ -6606,7 +6685,7 @@ bdev_register(struct spdk_bdev *bdev)
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
bdev->internal.stat = bdev_alloc_io_stat();
|
||||
bdev->internal.stat = bdev_alloc_io_stat(true);
|
||||
if (!bdev->internal.stat) {
|
||||
SPDK_ERRLOG("Unable to allocate I/O statistics structure.\n");
|
||||
free(bdev_name);
|
||||
|
||||
@ -21,7 +21,7 @@ void bdev_io_init(struct spdk_bdev_io *bdev_io, struct spdk_bdev *bdev, void *cb
|
||||
|
||||
void bdev_io_submit(struct spdk_bdev_io *bdev_io);
|
||||
|
||||
struct spdk_bdev_io_stat *bdev_alloc_io_stat(void);
|
||||
struct spdk_bdev_io_stat *bdev_alloc_io_stat(bool io_error_stat);
|
||||
void bdev_free_io_stat(struct spdk_bdev_io_stat *stat);
|
||||
void bdev_dump_io_stat_json(struct spdk_bdev_io_stat *stat, struct spdk_json_write_ctx *w);
|
||||
|
||||
|
||||
@ -217,7 +217,7 @@ rpc_get_iostat_done(struct rpc_get_iostat_ctx *rpc_ctx)
|
||||
}
|
||||
|
||||
static struct bdev_get_iostat_ctx *
|
||||
bdev_iostat_ctx_alloc(void)
|
||||
bdev_iostat_ctx_alloc(bool iostat_ext)
|
||||
{
|
||||
struct bdev_get_iostat_ctx *ctx;
|
||||
|
||||
@ -226,7 +226,7 @@ bdev_iostat_ctx_alloc(void)
|
||||
return NULL;
|
||||
}
|
||||
|
||||
ctx->stat = bdev_alloc_io_stat();
|
||||
ctx->stat = bdev_alloc_io_stat(iostat_ext);
|
||||
if (ctx->stat == NULL) {
|
||||
free(ctx);
|
||||
return NULL;
|
||||
@ -293,7 +293,7 @@ bdev_get_iostat(void *ctx, struct spdk_bdev *bdev)
|
||||
struct bdev_get_iostat_ctx *bdev_ctx;
|
||||
int rc;
|
||||
|
||||
bdev_ctx = bdev_iostat_ctx_alloc();
|
||||
bdev_ctx = bdev_iostat_ctx_alloc(true);
|
||||
if (bdev_ctx == NULL) {
|
||||
SPDK_ERRLOG("Failed to allocate bdev_iostat_ctx struct\n");
|
||||
return -ENOMEM;
|
||||
@ -416,7 +416,7 @@ rpc_bdev_get_iostat(struct spdk_jsonrpc_request *request,
|
||||
rpc_ctx->per_channel = req.per_channel;
|
||||
|
||||
if (desc != NULL) {
|
||||
bdev_ctx = bdev_iostat_ctx_alloc();
|
||||
bdev_ctx = bdev_iostat_ctx_alloc(req.per_channel == false);
|
||||
if (bdev_ctx == NULL) {
|
||||
SPDK_ERRLOG("Failed to allocate bdev_iostat_ctx struct\n");
|
||||
rpc_ctx->rc = -ENOMEM;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user