fsstress: translate flags in fiemap_f

[xfstests-dev.git] / ltp / doio.c

diff --git a/ltp/doio.c b/ltp/doio.c
index e4f61d82fae4432ea1081489a314998b2d787ff4..966cff1d75dc85fda695ca2f7c78ccc1fb293dab 100644 (file)
--- a/ltp/doio.c
+++ b/ltp/doio.c
@@ -37,10 +37,8 @@
 #include <sys/time.h>  /* for delays */
 #include <ctype.h>
 
 #include <sys/time.h>  /* for delays */
 #include <ctype.h>
 

-#ifndef NO_XFS

 struct io_req;
 int do_xfsctl(struct io_req *);
 struct io_req;
 int do_xfsctl(struct io_req *);

-#endif

 
 #include "doio.h"
 #include "pattern.h"
 
 #include "doio.h"
 #include "pattern.h"


@@ -172,11 +170,9 @@ struct fd_cache {
        int     c_oflags;
        int     c_fd;
        long    c_rtc;
        int     c_oflags;
        int     c_fd;
        long    c_rtc;

-#ifndef NO_XFS

        int     c_memalign;     /* from xfsctl(XFS_IOC_DIOINFO) */
        int     c_miniosz;
        int     c_maxiosz;
        int     c_memalign;     /* from xfsctl(XFS_IOC_DIOINFO) */
        int     c_miniosz;
        int     c_maxiosz;

-#endif

        void    *c_memaddr;     /* mmapped address */
        int     c_memlen;       /* length of above region */
 };
        void    *c_memaddr;     /* mmapped address */
        int     c_memlen;       /* length of above region */
 };


@@ -214,15 +210,16 @@ void      sigbus_handler();       /* Handle sigbus--check active_mmap_rw to
 
 void   cb_handler();           /* Posix aio callback handler. */
 void   noop_handler();         /* Delayop alarm, does nothing. */
 
 void   cb_handler();           /* Posix aio callback handler. */
 void   noop_handler();         /* Delayop alarm, does nothing. */

-char   *hms();
+char   *hms(time_t  t);

 char   *format_rw();
 char   *format_sds();
 char   *format_listio();
 char   *format_rw();
 char   *format_sds();
 char   *format_listio();

-char   *check_file();
+char   *check_file(char *file, int offset, int length, char *pattern,
+                   int pattern_length, int patshift, int fsa);

 int    doio_fprintf(FILE *stream, char *format, ...);
 int    doio_fprintf(FILE *stream, char *format, ...);

-void   doio_upanic();
+void   doio_upanic(int mask);

 void   doio();
 void   doio();

-void   help();
+void   help(FILE *stream);

 void   doio_delay();
 int     alloc_fd( char *, int );
 int     alloc_mem( int );
 void   doio_delay();
 int     alloc_fd( char *, int );
 int     alloc_mem( int );


@@ -777,12 +774,10 @@ doio()
                case LEWRITEA:
                        rval = do_rw(&ioreq);
                        break;
                case LEWRITEA:
                        rval = do_rw(&ioreq);
                        break;

-#ifndef NO_XFS

                case RESVSP:
                case UNRESVSP:
                        rval = do_xfsctl(&ioreq);
                        break;
                case RESVSP:
                case UNRESVSP:
                        rval = do_xfsctl(&ioreq);
                        break;

-#endif

                case FSYNC2:
                case FDATASYNC:
                        rval = do_sync(&ioreq);
                case FSYNC2:
                case FDATASYNC:
                        rval = do_sync(&ioreq);


@@ -1056,9 +1051,7 @@ struct io_req     *req;
 {
        int                     fd, offset, nbytes, oflags, rval;
        char                    *addr, *file;
 {
        int                     fd, offset, nbytes, oflags, rval;
        char                    *addr, *file;

-#ifndef NO_XFS

        struct fd_cache         *fdc;
        struct fd_cache         *fdc;

-#endif

 
        /*
         * Initialize common fields - assumes r_oflags, r_file, r_offset, and
 
        /*
         * Initialize common fields - assumes r_oflags, r_file, r_offset, and


@@ -1090,7 +1083,6 @@ struct io_req     *req;
 #define wtob(x)        (x * sizeof(UINT64_T))
 #endif
 
 #define wtob(x)        (x * sizeof(UINT64_T))
 #endif
 

-#ifndef NO_XFS

        /* get memory alignment for using DIRECT I/O */
        fdc = alloc_fdcache(file, oflags);
 
        /* get memory alignment for using DIRECT I/O */
        fdc = alloc_fdcache(file, oflags);
 


@@ -1111,14 +1103,6 @@ struct io_req    *req;
        } else {
                addr += random_range(0, wtob(1) - 1, 1, NULL);
        }
        } else {
                addr += random_range(0, wtob(1) - 1, 1, NULL);
        }

-#else
-       if ((rval = alloc_mem(nbytes + wtob(1) * 2)) < 0) {
-               return rval;
-       }
-
-       addr = Memptr;
-#endif /* !NO_XFS */
-

 
        switch (req->r_type) {
        case READ:
 
        switch (req->r_type) {
        case READ:


@@ -1162,20 +1146,16 @@ struct io_req   *req;
        static int              pid = -1;
        int                     fd, nbytes, oflags;
        /* REFERENCED */
        static int              pid = -1;
        int                     fd, nbytes, oflags;
        /* REFERENCED */

-       int                     signo;

        int                     logged_write, rval, got_lock;
        long                    offset, woffset = 0;
        char                    *addr, pattern, *file, *msg;
        struct wlog_rec         wrec;
        int                     logged_write, rval, got_lock;
        long                    offset, woffset = 0;
        char                    *addr, pattern, *file, *msg;
        struct wlog_rec         wrec;

-#ifndef NO_XFS

        struct fd_cache         *fdc;
        struct fd_cache         *fdc;

-#endif

 
        /*
         * Misc variable setup
         */
 
 
        /*
         * Misc variable setup
         */
 

-       signo   = 0;

        nbytes  = req->r_data.write.r_nbytes;
        offset  = req->r_data.write.r_offset;
        pattern = req->r_data.write.r_pattern;
        nbytes  = req->r_data.write.r_nbytes;
        offset  = req->r_data.write.r_offset;
        pattern = req->r_data.write.r_pattern;


@@ -1206,7 +1186,6 @@ struct io_req     *req;
         * Allocate SDS space for backdoor write if desired
         */
 
         * Allocate SDS space for backdoor write if desired
         */
 

-#ifndef NO_XFS

        /* get memory alignment for using DIRECT I/O */
        fdc = alloc_fdcache(file, oflags);
 
        /* get memory alignment for using DIRECT I/O */
        fdc = alloc_fdcache(file, oflags);
 


@@ -1231,18 +1210,6 @@ struct io_req    *req;
        if( addr != Memptr )
                memmove( addr, Memptr, nbytes);
 
        if( addr != Memptr )
                memmove( addr, Memptr, nbytes);
 

-#else /* sgi */
-       if ((rval = alloc_mem(nbytes + wtob(1) * 2)) < 0) {
-               return rval;
-       }
-
-       addr = Memptr;
-
-       (*Data_Fill)(Memptr, nbytes, Pattern, Pattern_Length, 0);
-       if( addr != Memptr )
-               memmove( addr, Memptr, nbytes);
-#endif /* sgi */
-

        rval = -1;
        got_lock = 0;
        logged_write = 0;
        rval = -1;
        got_lock = 0;
        logged_write = 0;


@@ -1312,7 +1279,6 @@ struct io_req     *req;
                                     "write() failed:  %s (%d)\n%s\n",
                                     SYSERR, errno,
                                     format_rw(req, fd, addr, -1, Pattern, NULL));
                                     "write() failed:  %s (%d)\n%s\n",
                                     SYSERR, errno,
                                     format_rw(req, fd, addr, -1, Pattern, NULL));

-#ifndef NO_XFS

                        doio_fprintf(stderr,
                                     "write() failed:  %s\n\twrite(%d, %#o, %d)\n\toffset %d, nbytes%%miniou(%d)=%d, oflags=%#o memalign=%d, addr%%memalign=%d\n",
                                     strerror(errno),
                        doio_fprintf(stderr,
                                     "write() failed:  %s\n\twrite(%d, %#o, %d)\n\toffset %d, nbytes%%miniou(%d)=%d, oflags=%#o memalign=%d, addr%%memalign=%d\n",
                                     strerror(errno),


@@ -1320,13 +1286,6 @@ struct io_req    *req;
                                     offset,
                                     fdc->c_miniosz, nbytes%fdc->c_miniosz,
                                     oflags, fdc->c_memalign, (long)addr%fdc->c_memalign);
                                     offset,
                                     fdc->c_miniosz, nbytes%fdc->c_miniosz,
                                     oflags, fdc->c_memalign, (long)addr%fdc->c_memalign);

-#else
-                       doio_fprintf(stderr,
-                                    "write() failed:  %s\n\twrite(%d, %#o, %d)\n\toffset %d, nbytes%%1B=%d, oflags=%#o\n",
-                                    strerror(errno),
-                                    fd, addr, nbytes,
-                                    offset, nbytes%4096, oflags);
-#endif

                        doio_upanic(U_RVAL);
                } else if (rval != nbytes) {
                        doio_fprintf(stderr,
                        doio_upanic(U_RVAL);
                } else if (rval != nbytes) {
                        doio_fprintf(stderr,


@@ -1511,8 +1470,8 @@ fmt_ioreq(struct io_req *ioreq, struct syscall_info *sy, int fd)
        cp += sprintf(cp, "          memory alignment is %s\n",
                      (io->r_uflags & F_WORD_ALIGNED) ? "aligned" : "unaligned");
 
        cp += sprintf(cp, "          memory alignment is %s\n",
                      (io->r_uflags & F_WORD_ALIGNED) ? "aligned" : "unaligned");
 

-#ifndef NO_XFS

        if(io->r_oflags & O_DIRECT) {
        if(io->r_oflags & O_DIRECT) {

+               char            *dio_env;

                struct dioattr  finfo;
                
                if(xfsctl(io->r_file, fd, XFS_IOC_DIOINFO, &finfo) == -1) {
                struct dioattr  finfo;
                
                if(xfsctl(io->r_file, fd, XFS_IOC_DIOINFO, &finfo) == -1) {


@@ -1523,6 +1482,10 @@ fmt_ioreq(struct io_req *ioreq, struct syscall_info *sy, int fd)
                        finfo.d_maxiosz = 1;
                }
 
                        finfo.d_maxiosz = 1;
                }
 

+               dio_env = getenv("XFS_DIO_MIN");
+               if (dio_env)
+                       finfo.d_mem = finfo.d_miniosz = atoi(dio_env);
+

                cp += sprintf(cp, "          DIRECT I/O: offset %% %d = %d length %% %d = %d\n",
                              finfo.d_miniosz,
                              io->r_offset % finfo.d_miniosz,
                cp += sprintf(cp, "          DIRECT I/O: offset %% %d = %d length %% %d = %d\n",
                              finfo.d_miniosz,
                              io->r_offset % finfo.d_miniosz,


@@ -1531,8 +1494,6 @@ fmt_ioreq(struct io_req *ioreq, struct syscall_info *sy, int fd)
                cp += sprintf(cp, "          mem alignment 0x%x xfer size: small: %d large: %d\n",
                              finfo.d_mem, finfo.d_miniosz, finfo.d_maxiosz);
        }
                cp += sprintf(cp, "          mem alignment 0x%x xfer size: small: %d large: %d\n",
                              finfo.d_mem, finfo.d_miniosz, finfo.d_maxiosz);
        }

-#endif
-

        return(errbuf);
 }
 
        return(errbuf);
 }
 


@@ -1609,28 +1570,6 @@ fmt_pread(struct io_req *req, struct syscall_info *sy, int fd, char *addr)
        return(errbuf);
 }
 
        return(errbuf);
 }
 

-struct status *
-sy_readv(req, sysc, fd, addr)
-struct io_req  *req;
-struct syscall_info *sysc;
-int fd;
-char *addr;
-{
-       struct status *sy_rwv();
-       return sy_rwv(req, sysc, fd, addr, 0);
-}
-
-struct status *
-sy_writev(req, sysc, fd, addr)
-struct io_req  *req;
-struct syscall_info *sysc;
-int fd;
-char *addr;
-{
-       struct status *sy_rwv();
-       return sy_rwv(req, sysc, fd, addr, 1);
-}
-

 struct status *
 sy_rwv(req, sysc, fd, addr, rw)
 struct io_req  *req;
 struct status *
 sy_rwv(req, sysc, fd, addr, rw)
 struct io_req  *req;


@@ -1671,38 +1610,36 @@ int rw;
        return(status);
 }
 
        return(status);
 }
 

-char *
-fmt_readv(struct io_req *req, struct syscall_info *sy, int fd, char *addr)
-{
-       static char     errbuf[32768];
-       char            *cp;
-
-       cp = errbuf;
-       cp += sprintf(cp, "syscall:  %s(%d, (iov on stack), 1)\n",
-                     sy->sy_name, fd);
-       return(errbuf);
-}
-

 struct status *
 struct status *

-sy_mmread(req, sysc, fd, addr)
-struct io_req *req;
+sy_readv(req, sysc, fd, addr)
+struct io_req  *req;

 struct syscall_info *sysc;
 int fd;
 char *addr;
 {
 struct syscall_info *sysc;
 int fd;
 char *addr;
 {

-       struct status *sy_mmrw();
-       return sy_mmrw(req, sysc, fd, addr, 0);
+       return sy_rwv(req, sysc, fd, addr, 0);

 }
 
 struct status *
 }
 
 struct status *

-sy_mmwrite(req, sysc, fd, addr)
-struct io_req *req;
+sy_writev(req, sysc, fd, addr)
+struct io_req  *req;

 struct syscall_info *sysc;
 int fd;
 char *addr;
 {
 struct syscall_info *sysc;
 int fd;
 char *addr;
 {

-       struct status *sy_mmrw();
-       return sy_mmrw(req, sysc, fd, addr, 1);
+       return sy_rwv(req, sysc, fd, addr, 1);
+}
+
+char *
+fmt_readv(struct io_req *req, struct syscall_info *sy, int fd, char *addr)
+{
+       static char     errbuf[32768];
+       char            *cp;
+
+       cp = errbuf;
+       cp += sprintf(cp, "syscall:  %s(%d, (iov on stack), 1)\n",
+                     sy->sy_name, fd);
+       return(errbuf);

 }
 
 struct status *
 }
 
 struct status *


@@ -1771,6 +1708,26 @@ int rw;
        return(status);
 }
 
        return(status);
 }
 

+struct status *
+sy_mmread(req, sysc, fd, addr)
+struct io_req *req;
+struct syscall_info *sysc;
+int fd;
+char *addr;
+{
+       return sy_mmrw(req, sysc, fd, addr, 0);
+}
+
+struct status *
+sy_mmwrite(req, sysc, fd, addr)
+struct io_req *req;
+struct syscall_info *sysc;
+int fd;
+char *addr;
+{
+       return sy_mmrw(req, sysc, fd, addr, 1);
+}
+

 char *
 fmt_mmrw(struct io_req *req, struct syscall_info *sy, int fd, char *addr)
 {
 char *
 fmt_mmrw(struct io_req *req, struct syscall_info *sy, int fd, char *addr)
 {


@@ -1846,9 +1803,7 @@ do_rw(req)
        struct status           *s;
        struct wlog_rec         wrec;
        struct syscall_info     *sy;
        struct status           *s;
        struct wlog_rec         wrec;
        struct syscall_info     *sy;

-#ifndef NO_XFS

        struct fd_cache         *fdc;
        struct fd_cache         *fdc;

-#endif

 
        /*
         * Initialize common fields - assumes r_oflags, r_file, r_offset, and
 
        /*
         * Initialize common fields - assumes r_oflags, r_file, r_offset, and


@@ -1907,18 +1862,12 @@ do_rw(req)
                mem_needed = nbytes;
        }
 
                mem_needed = nbytes;
        }
 

-#ifndef NO_XFS

        /* get memory alignment for using DIRECT I/O */
        fdc = alloc_fdcache(file, oflags);
 
        if ((rval = alloc_mem(mem_needed + wtob(1) * 2 + fdc->c_memalign)) < 0) {
                return rval;
        }
        /* get memory alignment for using DIRECT I/O */
        fdc = alloc_fdcache(file, oflags);
 
        if ((rval = alloc_mem(mem_needed + wtob(1) * 2 + fdc->c_memalign)) < 0) {
                return rval;
        }

-#else
-       if ((rval = alloc_mem(mem_needed + wtob(1) * 2)) < 0) {
-               return rval;
-       }
-#endif

 
        Pattern[0] = pattern;
 
 
        Pattern[0] = pattern;
 


@@ -1945,14 +1894,12 @@ do_rw(req)
                        addr += random_range(0, wtob(1) - 1, 1, NULL);
                }
 
                        addr += random_range(0, wtob(1) - 1, 1, NULL);
                }
 

-#ifndef NO_XFS

                /*
                 * Force memory alignment for Direct I/O
                 */
                if( (oflags & O_DIRECT) && ((long)addr % fdc->c_memalign != 0) ) {
                        addr += fdc->c_memalign - ((long)addr % fdc->c_memalign);
                }
                /*
                 * Force memory alignment for Direct I/O
                 */
                if( (oflags & O_DIRECT) && ((long)addr % fdc->c_memalign != 0) ) {
                        addr += fdc->c_memalign - ((long)addr % fdc->c_memalign);
                }

-#endif

 
                /*
                 * FILL must be done on a word-aligned buffer.
 
                /*
                 * FILL must be done on a word-aligned buffer.


@@ -2141,7 +2088,6 @@ do_rw(req)
  *   - XFS_IOC_RESVSP
  *   - XFS_IOC_UNRESVSP
  */
  *   - XFS_IOC_RESVSP
  *   - XFS_IOC_UNRESVSP
  */

-#ifndef NO_XFS

 int
 do_xfsctl(req)
        struct io_req   *req;
 int
 do_xfsctl(req)
        struct io_req   *req;


@@ -2232,7 +2178,6 @@ do_xfsctl(req)
 
        return (rval == -1) ? -1 : 0;
 }
 
        return (rval == -1) ? -1 : 0;
 }

-#endif

 
 /*
  *  fsync(2) and fdatasync(2)
 
 /*
  *  fsync(2) and fdatasync(2)


@@ -2379,9 +2324,7 @@ int       fsa;
        static char     errbuf[4096];
        int             fd, nb, flags;
        char            *buf, *em, *ep;
        static char     errbuf[4096];
        int             fd, nb, flags;
        char            *buf, *em, *ep;

-#ifndef NO_XFS

        struct fd_cache *fdc;
        struct fd_cache *fdc;

-#endif

 
        buf = Memptr;
 
 
        buf = Memptr;
 


@@ -2406,27 +2349,18 @@ int     fsa;
                return errbuf;
        }
 
                return errbuf;
        }
 

-#ifndef NO_XFS

        /* Guarantee a properly aligned address on Direct I/O */
        fdc = alloc_fdcache(file, flags);
        if( (flags & O_DIRECT) && ((long)buf % fdc->c_memalign != 0) ) {
                buf += fdc->c_memalign - ((long)buf % fdc->c_memalign);
        }
        /* Guarantee a properly aligned address on Direct I/O */
        fdc = alloc_fdcache(file, flags);
        if( (flags & O_DIRECT) && ((long)buf % fdc->c_memalign != 0) ) {
                buf += fdc->c_memalign - ((long)buf % fdc->c_memalign);
        }

-#endif

 
        if ((nb = read(fd, buf, length)) == -1) {
 
        if ((nb = read(fd, buf, length)) == -1) {

-#ifndef NO_XFS

                sprintf(errbuf,
                        "Could not read %d bytes from %s for verification:  %s (%d)\n\tread(%d, 0x%p, %d)\n\tbuf %% alignment(%d) = %ld\n",
                        length, file, SYSERR, errno,
                        fd, buf, length,
                        fdc->c_memalign, (long)buf % fdc->c_memalign);
                sprintf(errbuf,
                        "Could not read %d bytes from %s for verification:  %s (%d)\n\tread(%d, 0x%p, %d)\n\tbuf %% alignment(%d) = %ld\n",
                        length, file, SYSERR, errno,
                        fd, buf, length,
                        fdc->c_memalign, (long)buf % fdc->c_memalign);

-#else
-               sprintf(errbuf,
-                       "Could not read %d bytes from %s for verification:  %s (%d)\n",
-                       length, file, SYSERR, errno);
-
-#endif

                return errbuf;
        }
 
                return errbuf;
        }
 


@@ -2722,9 +2656,7 @@ int       oflags;
        struct fd_cache         *free_slot, *oldest_slot, *cp;
        static int              cache_size = 0;
        static struct fd_cache  *cache = NULL;
        struct fd_cache         *free_slot, *oldest_slot, *cp;
        static int              cache_size = 0;
        static struct fd_cache  *cache = NULL;

-#ifndef NO_XFS

        struct dioattr  finfo;
        struct dioattr  finfo;

-#endif

 
        /*
         * If file is NULL, it means to free up the fd cache.
 
        /*
         * If file is NULL, it means to free up the fd cache.


@@ -2846,13 +2778,19 @@ int     oflags;
        strcpy(free_slot->c_file, file);
        free_slot->c_rtc = Reqno;
 
        strcpy(free_slot->c_file, file);
        free_slot->c_rtc = Reqno;
 

-#ifndef NO_XFS

        if (oflags & O_DIRECT) {
        if (oflags & O_DIRECT) {

+               char *dio_env;
+

                if (xfsctl(file, fd, XFS_IOC_DIOINFO, &finfo) == -1) {
                        finfo.d_mem = 1;
                        finfo.d_miniosz = 1;
                        finfo.d_maxiosz = 1;
                }
                if (xfsctl(file, fd, XFS_IOC_DIOINFO, &finfo) == -1) {
                        finfo.d_mem = 1;
                        finfo.d_miniosz = 1;
                        finfo.d_maxiosz = 1;
                }

+
+               dio_env = getenv("XFS_DIO_MIN");
+               if (dio_env)
+                       finfo.d_mem = finfo.d_miniosz = atoi(dio_env);
+

        } else {
                finfo.d_mem = 1;
                finfo.d_miniosz = 1;
        } else {
                finfo.d_mem = 1;
                finfo.d_miniosz = 1;


@@ -2862,7 +2800,6 @@ int       oflags;
        free_slot->c_memalign = finfo.d_mem;
        free_slot->c_miniosz = finfo.d_miniosz;
        free_slot->c_maxiosz = finfo.d_maxiosz;
        free_slot->c_memalign = finfo.d_mem;
        free_slot->c_miniosz = finfo.d_miniosz;
        free_slot->c_maxiosz = finfo.d_maxiosz;

-#endif

        free_slot->c_memaddr = NULL;
        free_slot->c_memlen = 0;
 
        free_slot->c_memaddr = NULL;
        free_slot->c_memlen = 0;