Recent changes (master)
The following changes since commit aa7d2ef092d5a8e417fcddaf8808fb0d48f1064b:
Added millisecond-accurate timestamp to JSON output (2016-05-27 14:26:16 -0400)
are available in the git repository at:
git://git.kernel.dk/fio.git master
for you to fetch changes up to 385e1da6468bc951a0bf7ae60d890bb4d4a55ded:
Documentation update (2016-06-02 16:57:20 -0600)
----------------------------------------------------------------
Jens Axboe (3):
Enable preadv2/pwritev2 engines by default on Linux
arch: wire up preadv2/pwritev2 for more architectures Documentation update
Omar Sandoval (1):
Fix iodepth_batch=0
HOWTO | 11 +++++------ arch/arch-arm.h | 7 +++++++ arch/arch-ia64.h | 7 +++++++ arch/arch-s390.h | 7 +++++++ arch/arch-sparc.h | 7 +++++++ arch/arch-sparc64.h | 7 +++++++ arch/arch-x86.h | 7 +++++++ arch/arch-x86_64.h | 8 ++++++++ engines/sync.c | 10 +++++----- fio.1 | 3 --- options.c | 3 +-- os/os-linux.h | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 12 files changed, 113 insertions(+), 16 deletions(-)
---
Diff of recent changes:
HOWTO +5 -6
@@ -53,8 +53,8 @@ bottom, it contains the following basic parameters: IO engine How do we issue io? We could be memory mapping the file, we could be using regular read/write, we - could be using splice, async io, syslet, or even - SG (SCSI generic sg). + could be using splice, async io, or even SG + (SCSI generic sg). IO depth If the io engine is async, how large a queuing depth do we want to maintain?
@@ -706,7 +706,9 @@ ioengine=str Defines how the job issues io to the file. The following vsync Basic readv(2) or writev(2) IO. - psyncv Basic preadv(2) or pwritev(2) IO. + pvsync Basic preadv(2) or pwritev(2) IO. + + psync2 Basic preadv2(2) or pwritev2(2) IO. libaio Linux native asynchronous io. Note that Linux may only support queued behaviour with
@@ -726,9 +728,6 @@ ioengine=str Defines how the job issues io to the file. The following vmsplice(2) to transfer data from user space to the kernel. - syslet-rw Use the syslet system calls to make - regular read/write async. - sg SCSI generic sg v3 io. May either be synchronous using the SG_IO ioctl, or if the target is an sg character device
arch/arch-arm.h +7 -0
@@ -18,6 +18,13 @@#define __NR_sys_vmsplice 343#endif +#ifndef __NR_preadv2 +#define __NR_preadv2 392 +#endif +#ifndef __NR_pwritev2 +#define __NR_pwritev2 393 +#endif +#if defined (__ARM_ARCH_4__) || defined (__ARM_ARCH_4T__) \ || defined (__ARM_ARCH_5__) || defined (__ARM_ARCH_5T__) || defined (__ARM_ARCH_5E__)\ || defined (__ARM_ARCH_5TE__) || defined (__ARM_ARCH_5TEJ__) \
arch/arch-ia64.h +7 -0
@@ -18,6 +18,13 @@#define __NR_sys_vmsplice 1302#endif +#ifndef __NR_preadv2 +#define __NR_preadv2 1348 +#endif +#ifndef __NR_pwritev2 +#define __NR_pwritev2 1349 +#endif +#define nop asm volatile ("hint @pause" ::: "memory");#define read_barrier () asm volatile ("mf" ::: "memory")#define write_barrier () asm volatile ("mf" ::: "memory")
arch/arch-s390.h +7 -0
@@ -18,6 +18,13 @@#define __NR_sys_vmsplice 309#endif +#ifndef __NR_preadv2 +#define __NR_preadv2 376 +#endif +#ifndef __NR_pwritev2 +#define __NR_pwritev2 377 +#endif +#define nop asm volatile("nop" : : : "memory")#define read_barrier () asm volatile("bcr 15,0" : : : "memory")#define write_barrier () asm volatile("bcr 15,0" : : : "memory")
arch/arch-sparc.h +7 -0
@@ -18,6 +18,13 @@#define __NR_sys_vmsplice 25#endif +#ifndef __NR_preadv2 +#define __NR_preadv2 358 +#endif +#ifndef __NR_pwritev2 +#define __NR_pwritev2 359 +#endif +#define nop do { } while (0)#define read_barrier () __asm__ __volatile__ ("" : : : "memory")
arch/arch-sparc64.h +7 -0
@@ -18,6 +18,13 @@#define __NR_sys_vmsplice 25#endif +#ifndef __NR_preadv2 +#define __NR_preadv2 358 +#endif +#ifndef __NR_pwritev2 +#define __NR_pwritev2 359 +#endif +#define nop do { } while (0)#define membar_safe (type) \
arch/arch-x86.h +7 -0
@@ -29,6 +29,13 @@ static inline void do_cpuid(unsigned int *eax, unsigned int *ebx,#define __NR_sys_vmsplice 316#endif +#ifndef __NR_preadv2 +#define __NR_preadv2 378 +#endif +#ifndef __NR_pwritev2 +#define __NR_pwritev2 379 +#endif +#define FIO_HUGE_PAGE 4194304#define nop __asm__ __volatile__("rep;nop": : :"memory")
arch/arch-x86_64.h +8 -0
@@ -36,6 +36,14 @@ static inline void do_cpuid(unsigned int *eax, unsigned int *ebx,#define __NR_shmdt 67#endif +#ifndef __NR_preadv2 +#define __NR_preadv2 327 +#endif +#ifndef __NR_pwritev2 +#define __NR_pwritev2 328 +#endif + +#define FIO_HUGE_PAGE 2097152#define nop __asm__ __volatile__("rep;nop": : :"memory")
engines/sync.c +5 -5
@@ -32,7 +32,7 @@ struct syncio_data {enum fio_ddir last_ddir; }; -#ifdef CONFIG_PWRITEV2 +#ifdef FIO_HAVE_PWRITEV2 struct psyncv2_options { void *pad; unsigned int hipri;
@@ -121,7 +121,7 @@ static int fio_pvsyncio_queue(struct thread_data *td, struct io_u *io_u) }#endif -#ifdef CONFIG_PWRITEV2 +#ifdef FIO_HAVE_PWRITEV2 static int fio_pvsyncio2_queue (struct thread_data *td,struct io_u *io_u) {struct syncio_data *sd = td->io_ops->data;
@@ -429,7 +429,7 @@ static struct ioengine_ops ioengine_pvrw = { };#endif -#ifdef CONFIG_PWRITEV2 +#ifdef FIO_HAVE_PWRITEV2 static struct ioengine_ops ioengine_pvrw2 = { .name ="pvsync2" , .version = FIO_IOOPS_VERSION,
@@ -453,7 +453,7 @@ static void fio_init fio_syncio_register(void)#ifdef CONFIG_PWRITEV register_ioengine (&ioengine_pvrw);#endif -#ifdef CONFIG_PWRITEV2 +#ifdef FIO_HAVE_PWRITEV2 register_ioengine (&ioengine_pvrw2);#endif }
@@ -466,7 +466,7 @@ static void fio_exit fio_syncio_unregister(void)#ifdef CONFIG_PWRITEV unregister_ioengine (&ioengine_pvrw);#endif -#ifdef CONFIG_PWRITEV2 +#ifdef FIO_HAVE_PWRITEV2 unregister_ioengine (&ioengine_pvrw2);#endif }
fio.1 +0 -3
@@ -633,9 +633,6 @@ File is memory mapped with \fBmmap\fR\|(2) and data copied using \fBsplice\fR\|(2) is used to transfer the data and \fBvmsplice\fR\|(2) to transfer data from user-space to the kernel. .TP -.B syslet-rw -Use the syslet system calls to make regular read/write asynchronous. -.TP .B sg SCSI generic sg v3 I/O. May be either synchronous using the SG_IO ioctl, or if the target is an sg character device, we use \fBread\fR\|(2) and
options.c +1 -2
@@ -1548,7 +1548,7 @@ struct fio_option fio_options[FIO_MAX_OPTS] = { .help = "Use preadv/pwritev", },#endif -#ifdef CONFIG_PWRITEV2 +#ifdef FIO_HAVE_PWRITEV2 { .ival = "pvsync2", .help = "Use preadv2/pwritev2", },
@@ -1678,7 +1678,6 @@ struct fio_option fio_options[FIO_MAX_OPTS] = { .help = "Number of IO buffers to submit in one go", .parent = "iodepth", .hide = 1, - .minval = 1, .interval = 1, .def = "1", .category = FIO_OPT_C_IO,
os/os-linux.h +52 -0
62 lines not on this page · raw message