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

spdk_dd: Use FIXED_BUFFERS

Browse Source 
This improves performance for io_uring

Change-Id: Ifff7f87e76f7ce3074c25d409dfd2b171c800e19
Signed-off-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/12514
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Shuhei Matsumoto <smatsumoto@nvidia.com>
Community-CI: Mellanox Build Bot
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
This commit is contained in:
Ben Walker 2022-05-04 11:24:40 -07:00 committed by Jim Harris
parent c284fa9ec4
commit 75aded8439
1 changed files with 34 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
app/spdk_dd/spdk_dd.c
View File

@ -53,7 +53,7 @@ struct dd_io {
struct iocb iocb; struct iocb iocb;
enum dd_submit_type type; enum dd_submit_type type;
#ifdef SPDK_CONFIG_URING #ifdef SPDK_CONFIG_URING
struct iovec iov; int idx;
#endif #endif
void *buf; void *buf;
}; };
@ -284,13 +284,11 @@ dd_uring_submit(struct dd_io *io, struct dd_target *target, uint64_t length, uin
{ {
struct io_uring_sqe *sqe; struct io_uring_sqe *sqe;
io->iov.iov_base = io->buf;
io->iov.iov_len = length;
sqe = io_uring_get_sqe(&g_job.u.uring.ring); sqe = io_uring_get_sqe(&g_job.u.uring.ring);
if (io->type == DD_READ || io->type == DD_POPULATE) { if (io->type == DD_READ || io->type == DD_POPULATE) {
io_uring_prep_readv(sqe, target->u.uring.idx, &io->iov, 1, offset); io_uring_prep_read_fixed(sqe, target->u.uring.idx, io->buf, length, offset, io->idx);
} else { } else {
io_uring_prep_writev(sqe, target->u.uring.idx, &io->iov, 1, offset); io_uring_prep_write_fixed(sqe, target->u.uring.idx, io->buf, length, offset, io->idx);
} }
sqe->flags |= IOSQE_FIXED_FILE; sqe->flags |= IOSQE_FIXED_FILE;
io_uring_sqe_set_data(sqe, io); io_uring_sqe_set_data(sqe, io);
@ -764,6 +762,29 @@ dd_register_files(void)
return io_uring_register_files(&g_job.u.uring.ring, fds, count); return io_uring_register_files(&g_job.u.uring.ring, fds, count);
} }
static int
dd_register_buffers(void)
{
struct iovec *iovs;
int i, rc;
iovs = calloc(g_opts.queue_depth, sizeof(struct iovec));
if (iovs == NULL) {
return -ENOMEM;
}
for (i = 0; i < (int)g_opts.queue_depth; i++) {
iovs[i].iov_base = g_job.ios[i].buf;
iovs[i].iov_len = g_opts.io_unit_size;
g_job.ios[i].idx = i;
}
rc = io_uring_register_buffers(&g_job.u.uring.ring, iovs, g_opts.queue_depth);
free(iovs);
return rc;
}
#endif #endif
static void static void
@ -908,6 +929,14 @@ dd_run(void *arg1)
return; return;
} }
/* Register the buffers */
rc = dd_register_buffers();
if (rc) {
SPDK_ERRLOG("Failed to register buffers with io_uring: %d (%s)\n", rc, spdk_strerror(-rc));
dd_exit(rc);
return;
}
} else } else
#endif #endif
{ {