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

spdk_dd: If both input and output are block devices, use

Browse Source 
IORING_SETUP_IOPOLL

Change-Id: Ie1ab8ab896ce0d2e41290645bf3ee275e1a5c578
Signed-off-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/12022
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Shuhei Matsumoto <smatsumoto@nvidia.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
This commit is contained in:
Ben Walker 2022-03-22 15:24:29 -07:00 committed by Jim Harris
parent a342847df7
commit 128083ec42
1 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
app/spdk_dd/spdk_dd.c
View File

@ -724,6 +724,20 @@ parse_flags(char *file_flags)
return flags; return flags;
} }
#ifdef SPDK_CONFIG_URING
static bool
dd_is_blk(int fd)
{
struct stat st;
if (fstat(fd, &st) != 0) {
return false;
}
return S_ISBLK(st.st_mode);
}
#endif
static void static void
dd_run(void *arg1) dd_run(void *arg1)
{ {
@ -840,8 +854,17 @@ dd_run(void *arg1)
if (g_opts.input_file || g_opts.output_file) { if (g_opts.input_file || g_opts.output_file) {
#ifdef SPDK_CONFIG_URING #ifdef SPDK_CONFIG_URING
if (g_opts.aio == false) { if (g_opts.aio == false) {
unsigned int io_uring_flags = IORING_SETUP_SQPOLL;
int flags = parse_flags(g_opts.input_file_flags) & parse_flags(g_opts.output_file_flags);
if ((flags & O_DIRECT) != 0 &&
dd_is_blk(g_job.input.u.uring.fd) &&
dd_is_blk(g_job.output.u.uring.fd)) {
io_uring_flags = IORING_SETUP_IOPOLL;
}
g_job.u.uring.poller = spdk_poller_register(dd_uring_poll, NULL, 0); g_job.u.uring.poller = spdk_poller_register(dd_uring_poll, NULL, 0);
rc = io_uring_queue_init(g_opts.queue_depth * 2, &g_job.u.uring.ring, IORING_SETUP_SQPOLL); rc = io_uring_queue_init(g_opts.queue_depth * 2, &g_job.u.uring.ring, io_uring_flags);
if (rc) { if (rc) {
SPDK_ERRLOG("Failed to create io_uring: %d (%s)\n", rc, spdk_strerror(-rc)); SPDK_ERRLOG("Failed to create io_uring: %d (%s)\n", rc, spdk_strerror(-rc));
dd_exit(rc); dd_exit(rc);