xfsprogs: Add support for preadv2() and RWF_DONTCACHE
v3 cover xfsprogs: Add support for preadv2() and RWF_DONTCACHE
This adds following support to xfs_io:
- Support for preadv2()
- Support for uncached buffered I/O (RWF_DONTCACHE) for preadv2() and pwritev2()
v2 -> v3:
==========
1. Minor update for -U option description.
2. Added reviewed-bys of Darrick.
[v2]: https://lore.kernel.org/linux-xfs/[email protected]
v1 -> v2:
========
1. Based on pwritev2 autoconf support enable HAVE_PREADV2 support.
2. Check if preadv2/pwritev2 flags are passed w/o -V argument
3. Fixed space before tabs issue.
[v1]: https://lore.kernel.org/linux-xfs/[email protected]/#t
Ritesh Harjani (IBM) (3):
xfs_io: Add support for preadv2
xfs_io: Add RWF_DONTCACHE support to pwritev2
xfs_io: Add RWF_DONTCACHE support to preadv2
include/linux.h | 5 ++++ io/Makefile | 2 +- io/pread.c | 62 ++++++++++++++++++++++++++++++++++------------- io/pwrite.c | 14 +++++++++-- man/man8/xfs_io.8 | 16 ++++++++++-- 5 files changed, 77 insertions(+), 22 deletions(-)
--
2.48.1
PATCH v3 1/3 xfs_io: Add support for preadv2
This patch adds support for preadv2() to xfs_io.
--- io/Makefile | 2 +- io/pread.c | 45 ++++++++++++++++++++++++++++++--------------- 2 files changed, 31 insertions(+), 16 deletions(-)
io/Makefile +1 -1
@@ -66,7 +66,7 @@ LLDLIBS += $(LIBEDITLINE) $(LIBTERMCAP) endif ifeq ($(HAVE_PWRITEV2),yes) -LCFLAGS += -DHAVE_PWRITEV2 +LCFLAGS += -DHAVE_PWRITEV2 -DHAVE_PREADV2 endif ifeq ($(HAVE_MAP_SYNC),yes)
io/pread.c +30 -15
134 lines not on this page · raw message
Signature · 1 line
2.48.1
PATCH v3 2/3 xfs_io: Add RWF_DONTCACHE support to pwritev2
In reply to Ritesh Harjani (IBM)Add per-io RWF_DONTCACHE support flag to pwritev2(). This enables xfs_io to perform uncached buffered-io writes.
e.g. xfs_io -fc "pwrite -U -V 1 0 16K" /mnt/f1
--- include/linux.h | 5 +++++ io/pwrite.c | 14 ++++++++++++-- man/man8/xfs_io.8 | 8 +++++++- 3 files changed, 24 insertions(+), 3 deletions(-)
include/linux.h +5 -0
@@ -237,6 +237,11 @@ struct fsxattr {#define RWF_ATOMIC ((__kernel_rwf_t)0x00000040)#endif +/* buffered IO that drops the cache after reading or writing data */ +#ifndef RWF_DONTCACHE +#define RWF_DONTCACHE ((__kernel_rwf_t)0x00000080) +#endif +/* * Reminder: anything added to this file will be compiled into downstream * userspace projects!
io/pwrite.c +12 -2
@@ -45,6 +45,7 @@ pwrite_help(void)" -N -- Perform the pwritev2() with RWF_NOWAIT\n" " -D -- Perform the pwritev2() with RWF_DSYNC\n" " -A -- Perform the pwritev2() with RWF_ATOMIC\n" +" -U -- Perform the pwritev2() with RWF_DONTCACHE\n"#endif "\n")); }
@@ -285,7 +286,7 @@ pwrite_f(init_cvtnum (&fsblocksize, &fssectsize); bsize = fsblocksize; -while ((c =getopt (argc, argv,"Ab:BCdDf:Fi:NqRs:OS:uV:wWZ:" )) !=EOF ) { +while ((c =getopt (argc, argv,"Ab:BCdDf:Fi:NqRs:OS:uUV:wWZ:" )) !=EOF ) {switch (c) {case 'b' : tmp =cvtnum (fsblocksize, fssectsize, optarg);
@@ -328,6 +329,9 @@ pwrite_f(case 'A' : pwritev2_flags |=RWF_ATOMIC ;break ; +case 'U' : + pwritev2_flags |=RWF_DONTCACHE ; +break ;#endif case 's' : skip =cvtnum (fsblocksize, fssectsize, optarg);
@@ -392,6 +396,12 @@ pwrite_f( exitcode =1 ;return command_usage (&pwrite_cmd); } +if (pwritev2_flags !=0 && vectors ==0 ) { +printf (_ ("pwritev2 flags require vectored I/O (-V)\n" )); + exitcode =1 ; +return command_usage (&pwrite_cmd); + } + offset =cvtnum (fsblocksize, fssectsize, argv[optind]);if (offset <0 ) {printf (_ ("non-numeric offset argument -- %s\n" ), argv[optind]);
@@ -480,7 +490,7 @@ pwrite_init(void) pwrite_cmd.argmax =-1 ; pwrite_cmd.flags =CMD_NOMAP_OK |CMD_FOREIGN_OK ; pwrite_cmd.args = -_ ("[-i infile [-qAdDwNOW] [-s skip]] [-b bs] [-S seed] [-FBR [-Z N]] [-V N] off len" ); +_ ("[-i infile [-qAdDwNOUW] [-s skip]] [-b bs] [-S seed] [-FBR [-Z N]] [-V N] off len" ); pwrite_cmd.oneline =_ ("writes a number of bytes at a specified offset" ); pwrite_cmd.help = pwrite_help;
man/man8/xfs_io.8 +7 -1
@@ -244,7 +244,7 @@ See the .B pread command. .TP -.BI "pwrite [ \-i " file " ] [ \-qAdDwNOW ] [ \-s " skip " ] [ \-b " size " ] [ \-S " seed " ] [ \-FBR [ \-Z " zeed " ] ] [ \-V " vectors " ] " "offset length" +.BI "pwrite [ \-i " file " ] [ \-qAdDwNOUW ] [ \-s " skip " ] [ \-b " size " ] [ \-S " seed " ] [ \-FBR [ \-Z " zeed " ] ] [ \-V " vectors " ] " "offset length" Writes a range of bytes in a specified blocksize from the given .IR offset . The bytes written can be either a set pattern or read in from another
@@ -287,6 +287,12 @@ Perform the call with .IR RWF_ATOMIC . .TP +.B \-U +Perform the +.BR pwritev2 (2) +call with +.IR RWF_DONTCACHE . +.TP .B \-O perform pwrite once and return the (maybe partial) bytes written. .TP
Signature · 1 line
2.48.1
PATCH v3 3/3 xfs_io: Add RWF_DONTCACHE support to preadv2
In reply to Ritesh Harjani (IBM)Add per-io RWF_DONTCACHE support flag to preadv2(). This enables xfs_io to perform uncached buffered-io reads.
e.g. xfs_io -c "pread -U -V 1 0 16K" /mnt/f1
--- io/pread.c | 17 +++++++++++++++-- man/man8/xfs_io.8 | 8 +++++++- 2 files changed, 22 insertions(+), 3 deletions(-)
io/pread.c +15 -2
@@ -38,6 +38,9 @@ pread_help(void) " -Z N -- zeed the random number generator (used when reading randomly)\n" " (heh, zorry, the -s/-S arguments were already in use in pwrite)\n" " -V N -- use vectored IO with N iovecs of blocksize each (preadv)\n" +#ifdef HAVE_PREADV2 +" -U -- Perform the preadv2() with RWF_DONTCACHE\n" +#endif"\n" " When in \"random\" mode, the number of read operations will equal the\n" " number required to do a complete forward/backward scan of the range.\n"
@@ -388,7 +391,7 @@ pread_f(init_cvtnum (&fsblocksize, &fssectsize); bsize = fsblocksize; -while ((c =getopt (argc, argv,"b:BCFRquvV:Z:" )) !=EOF ) { +while ((c =getopt (argc, argv,"b:BCFRquUvV:Z:" )) !=EOF ) {switch (c) {case 'b' : tmp =cvtnum (fsblocksize, fssectsize, optarg);
@@ -417,6 +420,11 @@ pread_f(case 'u' : uflag =1 ;break ; +#ifdef HAVE_PREADV2 +case 'U' : + preadv2_flags |=RWF_DONTCACHE ; +break ; +#endif case 'v' : vflag =1 ;break ;
@@ -446,6 +454,11 @@ pread_f( exitcode =1 ;return command_usage (&pread_cmd); } +if (preadv2_flags !=0 && vectors ==0 ) { +printf (_ ("preadv2 flags require vectored I/O (-V)\n" )); + exitcode =1 ; +return command_usage (&pread_cmd); + } offset =cvtnum (fsblocksize, fssectsize, argv[optind]);if (offset <0 && (direction & (IO_RANDOM |IO_BACKWARD ))) {
@@ -514,7 +527,7 @@ pread_init(void) pread_cmd.argmin =2 ; pread_cmd.argmax =-1 ; pread_cmd.flags =CMD_NOMAP_OK |CMD_FOREIGN_OK ; - pread_cmd.args =_ ("[-b bs] [-qv] [-i N] [-FBR [-Z N]] off len" ); + pread_cmd.args =_ ("[-b bs] [-qUv] [-i N] [-FBR [-Z N]] off len" ); pread_cmd.oneline =_ ("reads a number of bytes at a specified offset" ); pread_cmd.help = pread_help;
man/man8/xfs_io.8 +7 -1
@@ -200,7 +200,7 @@ option will set the file permissions to read-write (0644). This allows xfs_io to set up mismatches between the file permissions and the open file descriptor read/write mode to exercise permission checks inside various syscalls. .TP -.BI "pread [ \-b " bsize " ] [ \-qv ] [ \-FBR [ \-Z " seed " ] ] [ \-V " vectors " ] " "offset length" +.BI "pread [ \-b " bsize " ] [ \-qUv ] [ \-FBR [ \-Z " seed " ] ] [ \-V " vectors " ] " "offset length" Reads a range of bytes in a specified blocksize from the given .IR offset . .RS 1.0i
@@ -214,6 +214,12 @@ requests will be split. The default blocksize is 4096 bytes. .B \-q quiet mode, do not write anything to standard output. .TP +.B \-U +Perform the +.BR preadv2 (2) +call with +.IR RWF_DONTCACHE . +.TP .B \-v dump the contents of the buffer after reading, by default only the count of bytes actually read is dumped.
--
2.48.1
Quoted 3 lines · Ritesh Harjani (IBM)
This adds following support to
xfs_io:
- Support forpreadv2()
- Support for uncached buffered I/O (RWF_DONTCACHE) forpreadv2()andpwritev2()
Looks good to me:
Signature · 1 line
Jens Axboe