Recent changes (master)
The following changes since commit 0b2c736174402afc742a7ed97c37f872fa93ee25:
Merge branch 'fiopr_windows_log_compression_storage_fixes' of https://github.com/PCPartPicker/fio (2022-09-02 17:29:45 -0600)
are available in the Git repository at:
git://git.kernel.dk/fio.git master
for you to fetch changes up to 021ce718f5ae4bfd5f4e42290993578adb7c7bd5:
t/io_uring: enable support for registered buffers for passthrough (2022-09-03 11:04:06 -0600)
----------------------------------------------------------------
Jens Axboe (5):
Merge branch 'fix/help-terse-version-5' of https://github.com/scop/fio
Merge branch 'doc/showcmd-usage' of https://github.com/scop/fio
Merge branch 'fix/howto-spelling' of https://github.com/scop/fio
t/io_uring: properly detect numa nodes for passthrough mode t/io_uring: enable support for registered buffers for passthrough
Ville Skyttä (3):
init: include 5 in --terse-version help
HOWTO: spelling fixes
doc: fix --showcmd usageHOWTO.rst | 8 ++++---- fio.1 | 4 ++-- init.c | 2 +- os/linux/io_uring.h | 8 ++++++++ t/io_uring.c | 9 ++++++++- 5 files changed, 23 insertions(+), 8 deletions(-)
---
Diff of recent changes:
HOWTO.rst +4 -4
@@ -167,9 +167,9 @@ Command line options defined by `ioengine`. If no `ioengine` is given, list all available ioengines. -.. option:: --showcmd=jobfile +.. option:: --showcmd - Convert `jobfile` to a set of command-line options. + Convert given job files to a set of command-line options. .. option:: --readonly
@@ -2550,7 +2550,7 @@ with the caveat that when used on the command line, they must come after the [dfs] - Specificy a different chunk size (in bytes) for the dfs file. + Specify a different chunk size (in bytes) for the dfs file. Use DAOS container's chunk size by default. [libhdfs]
@@ -2559,7 +2559,7 @@ with the caveat that when used on the command line, they must come after the .. option:: object_class=str : [dfs] - Specificy a different object class for the dfs file. + Specify a different object class for the dfs file. Use DAOS container's object class by default. .. option:: skip_bad=bool : [mtd]
fio.1 +2 -2
@@ -67,8 +67,8 @@ List all commands defined by \fIioengine\fR, or print help for \fIcommand\fR defined by \fIioengine\fR. If no \fIioengine\fR is given, list all available ioengines. .TP -.BI \-\-showcmd \fR=\fPjobfile -Convert \fIjobfile\fR to a set of command\-line options. +.BI \-\-showcmd +Convert given \fIjobfile\fRs to a set of command\-line options. .TP .BI \-\-readonly Turn on safety read\-only checks, preventing writes and trims. The \fB\-\-readonly\fR
init.c +1 -1
@@ -2269,7 +2269,7 @@ static void usage(const char *name)printf (" --minimal\t\tMinimal (terse) output\n" );printf (" --output-format=type\tOutput format (terse,json,json+,normal)\n" );printf (" --terse-version=type\tSet terse version output format" -" (default 3, or 2 or 4)\n" ); +" (default 3, or 2 or 4 or 5)\n" );printf (" --version\t\tPrint version info and exit\n" );printf (" --help\t\tPrint this page\n" );printf (" --cpuclock-test\tPerform test/validation of CPU clock\n" );
os/linux/io_uring.h +8 -0
@@ -46,6 +46,7 @@ struct io_uring_sqe {__u32 rename_flags;__u32 unlink_flags;__u32 hardlink_flags; +__u32 uring_cmd_flags; };__u64 user_data;/* data to be passed back at completion time */ /* pack this to avoid bogus arm OABI complaints */
@@ -197,6 +198,13 @@ enum { IORING_OP_LAST, }; +/* +* sqe->uring_cmd_flags +* IORING_URING_CMD_FIXED use registered buffer; pass thig flag +* along with setting sqe->buf_index. +*/ +#define IORING_URING_CMD_FIXED (1U << 0) +/* * sqe->fsync_flags */
t/io_uring.c +8 -1
@@ -650,6 +650,10 @@ static void init_io_pt(struct submitter *s, unsigned index) cmd->cdw12 = nlb; cmd->addr = (unsigned long ) s->iovecs[index].iov_base; cmd->data_len = bs; +if (fixedbufs) { + sqe->uring_cmd_flags =IORING_URING_CMD_FIXED ; + sqe->buf_index = index; + } cmd->nsid = f->nsid; cmd->opcode =2 ; }
@@ -856,7 +860,10 @@ static int detect_node(struct submitter *s, const char *name)char str[128 ];int ret, fd, node; -sprintf (str,"/sys/block/%s/device/numa_node" , base); +if (pt) +sprintf (str,"/sys/class/nvme-generic/%s/device/numa_node" , base); +else +sprintf (str,"/sys/block/%s/device/numa_node" , base); fd =open (str,O_RDONLY );if (fd <0 )return -1 ;