d/numam-spdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bdev/fio_plugin: add support for --zone_append

Browse Source 
Add support for using zone append commands instead of write command,
for bdevs that support it.

In the SPDK NVMe plugin, the target struct (called spdk_fio_qpair) is
allocated in .setup(), but the qpair is first created in .open_file.

In the SPDK bdev plugin, the target struct (called spdk_fio_target)
is allocated in spdk_fio_bdev_open(). This function also creates the
I/O channel. (spdk_fio_bdev_open() is called by .init().)

Since certain options has to be saved in the struct spdk_fio_target,
which is allocated quite late, we cannot reuse spdk_fio_handle_options(),
which has to be called before threads are created.

Therefore, we unfortunately need another option parsing function in the
SPDK bdev plugin.

If we fail to handle any of the per target options, the target is never
added to the list of targets, and is freed immediately.

Signed-off-by: Niklas Cassel <niklas.cassel@wdc.com>
Change-Id: Iacd1924c8f0d3d324f2a6f1b0a54f86459f39d31
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/7727
Community-CI: Broadcom CI
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
This commit is contained in:
Niklas Cassel 2021-05-03 15:27:21 +00:00 committed by Tomasz Zawadzki
parent 3067ecaa0c
commit e415c253a3
1 changed files with 72 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
examples/bdev/fio_plugin/fio_plugin.c
View File

@ -68,6 +68,7 @@ struct spdk_fio_options {
unsigned mem_mb;
int mem_single_seg;
int initial_zone_reset;
int zone_append;
};
struct spdk_fio_request {
@ -79,6 +80,7 @@ struct spdk_fio_target {
struct spdk_bdev *bdev;
struct spdk_bdev_desc *desc;
struct spdk_io_channel *ch;
bool zone_append_enabled;
TAILQ_ENTRY(spdk_fio_target) link;
};
@ -114,6 +116,7 @@ static void spdk_fio_cleanup(struct thread_data *td);
static size_t spdk_fio_poll_thread(struct spdk_fio_thread *fio_thread);
static int spdk_fio_handle_options(struct thread_data *td, struct fio_file *f,
struct spdk_bdev *bdev);
static int spdk_fio_handle_options_per_target(struct thread_data *td, struct fio_file *f);
static pthread_t g_init_thread_id = 0;
static pthread_mutex_t g_init_mtx = PTHREAD_MUTEX_INITIALIZER;
@ -552,6 +555,17 @@ spdk_fio_bdev_open(void *arg)
f->engine_data = target;
rc = spdk_fio_handle_options_per_target(td, f);
if (rc) {
SPDK_ERRLOG("Failed to handle options for: %s\n", f->file_name);
f->engine_data = NULL;
spdk_put_io_channel(target->ch);
spdk_bdev_close(target->desc);
free(target);
fio_thread->failed = true;
return;
}
TAILQ_INSERT_TAIL(&fio_thread->targets, target, link);
}
}
@ -684,6 +698,17 @@ typedef enum fio_q_status fio_q_status_t;
typedef int fio_q_status_t;
#endif
static uint64_t
spdk_fio_zone_bytes_to_blocks(struct spdk_bdev *bdev, uint64_t offset_bytes, uint64_t *zone_start,
uint64_t num_bytes, uint64_t *num_blocks)
{
uint32_t block_size = spdk_bdev_get_block_size(bdev);
*zone_start = (offset_bytes / (spdk_bdev_get_zone_size(bdev) * block_size)) *
spdk_bdev_get_zone_size(bdev);
*num_blocks = num_bytes / block_size;
return (offset_bytes % block_size) | (num_bytes % block_size);
}
static fio_q_status_t
spdk_fio_queue(struct thread_data *td, struct io_u *io_u)
{
@ -706,9 +731,21 @@ spdk_fio_queue(struct thread_data *td, struct io_u *io_u)
spdk_fio_completion_cb, fio_req);
break;
case DDIR_WRITE:
rc = spdk_bdev_write(target->desc, target->ch,
io_u->buf, io_u->offset, io_u->xfer_buflen,
spdk_fio_completion_cb, fio_req);
if (!target->zone_append_enabled) {
rc = spdk_bdev_write(target->desc, target->ch,
io_u->buf, io_u->offset, io_u->xfer_buflen,
spdk_fio_completion_cb, fio_req);
} else {
uint64_t zone_start, num_blocks;
if (spdk_fio_zone_bytes_to_blocks(target->bdev, io_u->offset, &zone_start,
io_u->xfer_buflen, &num_blocks) != 0) {
rc = -EINVAL;
break;
}
rc = spdk_bdev_zone_append(target->desc, target->ch, io_u->buf,
zone_start, num_blocks, spdk_fio_completion_cb,
fio_req);
}
break;
case DDIR_TRIM:
rc = spdk_bdev_unmap(target->desc, target->ch,
@ -1054,6 +1091,26 @@ spdk_fio_handle_options(struct thread_data *td, struct fio_file *f, struct spdk_
return 0;
}
static int
spdk_fio_handle_options_per_target(struct thread_data *td, struct fio_file *f)
{
struct spdk_fio_target *target = f->engine_data;
struct spdk_fio_options *fio_options = td->eo;
if (fio_options->zone_append && spdk_bdev_is_zoned(target->bdev)) {
if (spdk_bdev_io_type_supported(target->bdev, SPDK_BDEV_IO_TYPE_ZONE_APPEND)) {
SPDK_DEBUGLOG(fio_bdev, "Using zone appends instead of writes on: '%s'\n",
f->file_name);
target->zone_append_enabled = true;
} else {
SPDK_WARNLOG("Falling back to writes on: '%s' - bdev lacks zone append cmd\n",
f->file_name);
}
}
return 0;
}
static struct fio_option options[] = {
{
.name = "spdk_conf",
@ -1102,6 +1159,16 @@ static struct fio_option options[] = {
.category = FIO_OPT_C_ENGINE,
.group = FIO_OPT_G_INVALID,
},
{
.name = "zone_append",
.lname = "Use zone append instead of write",
.type = FIO_OPT_INT,
.off1 = offsetof(struct spdk_fio_options, zone_append),
.def = "0",
.help = "Use zone append instead of write (1=zone append, 0=write)",
.category = FIO_OPT_C_ENGINE,
.group = FIO_OPT_G_INVALID,
},
{
.name = NULL,
},
@ -1166,3 +1233,5 @@ static void fio_exit spdk_fio_unregister(void)
}
unregister_ioengine(&ioengine);
}
SPDK_LOG_REGISTER_COMPONENT(fio_bdev)