fsstress: add copy_file_range support

Support the copy_file_range syscall in fsstress.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Eryu Guan <guaneryu@gmail.com>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>

diff --git a/configure.ac b/configure.ac
index aede4f59a06038b4a72e91bcd263d10f0c05c3ab..19798824db6a316893faa1ca8b905d13deed49a6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -68,6 +68,8 @@ AC_PACKAGE_WANT_OPEN_BY_HANDLE_AT
 AC_PACKAGE_WANT_LINUX_PRCTL_H
 AC_PACKAGE_WANT_LINUX_FS_H
 
 AC_PACKAGE_WANT_LINUX_PRCTL_H
 AC_PACKAGE_WANT_LINUX_FS_H
 

+AC_HAVE_COPY_FILE_RANGE
+

 AC_CHECK_FUNCS([renameat2])
 
 AC_CONFIG_HEADER(include/config.h)
 AC_CHECK_FUNCS([renameat2])
 
 AC_CONFIG_HEADER(include/config.h)

diff --git a/include/builddefs.in b/include/builddefs.in
index fb8e912b10a27250ee4183cb65732b0ac0a54f7c..2605e42dbbd8f12dd13542dbd1507389fc4f96b7 100644 (file)
--- a/include/builddefs.in
+++ b/include/builddefs.in
@@ -67,6 +67,7 @@ HAVE_DMAPI = @have_dmapi@
 HAVE_ATTR_LIST = @have_attr_list@
 HAVE_FIEMAP = @have_fiemap@
 HAVE_FALLOCATE = @have_fallocate@
 HAVE_ATTR_LIST = @have_attr_list@
 HAVE_FIEMAP = @have_fiemap@
 HAVE_FALLOCATE = @have_fallocate@

+HAVE_COPY_FILE_RANGE = @have_copy_file_range@

 
 GCCFLAGS = -funsigned-char -fno-strict-aliasing -Wall
 
 
 GCCFLAGS = -funsigned-char -fno-strict-aliasing -Wall
 

diff --git a/ltp/Makefile b/ltp/Makefile
index 5f784ecf6da4f68cb3db7832b8927573d74cca53..e4ca45f4881577d1568764b7d2e0b8be1c0cc976 100644 (file)
--- a/ltp/Makefile
+++ b/ltp/Makefile
@@ -28,6 +28,10 @@ ifeq ($(HAVE_FALLOCATE), true)
 LCFLAGS += -DFALLOCATE
 endif
 
 LCFLAGS += -DFALLOCATE
 endif
 

+ifeq ($(HAVE_COPY_FILE_RANGE),yes)
+LCFLAGS += -DHAVE_COPY_FILE_RANGE
+endif
+

 default: depend $(TARGETS)
 
 depend: .dep
 default: depend $(TARGETS)
 
 depend: .dep

diff --git a/ltp/fsstress.c b/ltp/fsstress.c
index af5d125f68621dc647428b21305967eb034687a6..99a1d7339db213a4ad2a53b21d9cc18b03c80d53 100644 (file)
--- a/ltp/fsstress.c
+++ b/ltp/fsstress.c
@@ -26,6 +26,7 @@
 #include <libaio.h>
 io_context_t   io_ctx;
 #endif
 #include <libaio.h>
 io_context_t   io_ctx;
 #endif

+#include <sys/syscall.h>

 
 #ifndef FS_IOC_GETFLAGS
 #define FS_IOC_GETFLAGS                 _IOR('f', 1, long)
 
 #ifndef FS_IOC_GETFLAGS
 #define FS_IOC_GETFLAGS                 _IOR('f', 1, long)


@@ -55,6 +56,7 @@ typedef enum {
        OP_BULKSTAT1,
        OP_CHOWN,
        OP_CLONERANGE,
        OP_BULKSTAT1,
        OP_CHOWN,
        OP_CLONERANGE,

+       OP_COPYRANGE,

        OP_CREAT,
        OP_DEDUPERANGE,
        OP_DREAD,
        OP_CREAT,
        OP_DEDUPERANGE,
        OP_DREAD,


@@ -163,6 +165,7 @@ void        bulkstat_f(int, long);
 void   bulkstat1_f(int, long);
 void   chown_f(int, long);
 void   clonerange_f(int, long);
 void   bulkstat1_f(int, long);
 void   chown_f(int, long);
 void   clonerange_f(int, long);

+void   copyrange_f(int, long);

 void   creat_f(int, long);
 void   deduperange_f(int, long);
 void   dread_f(int, long);
 void   creat_f(int, long);
 void   deduperange_f(int, long);
 void   dread_f(int, long);


@@ -212,6 +215,7 @@ opdesc_t    ops[] = {
        { OP_BULKSTAT1, "bulkstat1", bulkstat1_f, 1, 0 },
        { OP_CHOWN, "chown", chown_f, 3, 1 },
        { OP_CLONERANGE, "clonerange", clonerange_f, 4, 1 },
        { OP_BULKSTAT1, "bulkstat1", bulkstat1_f, 1, 0 },
        { OP_CHOWN, "chown", chown_f, 3, 1 },
        { OP_CLONERANGE, "clonerange", clonerange_f, 4, 1 },

+       { OP_COPYRANGE, "copyrange", copyrange_f, 4, 1 },

        { OP_CREAT, "creat", creat_f, 4, 1 },
        { OP_DEDUPERANGE, "deduperange", deduperange_f, 4, 1},
        { OP_DREAD, "dread", dread_f, 4, 0 },
        { OP_CREAT, "creat", creat_f, 4, 1 },
        { OP_DEDUPERANGE, "deduperange", deduperange_f, 4, 1},
        { OP_DREAD, "dread", dread_f, 4, 0 },


@@ -2333,6 +2337,149 @@ out_fpath1:
 #endif
 }
 
 #endif
 }
 

+/* copy some arbitrary range of f1 to f2. */
+void
+copyrange_f(
+       int                     opno,
+       long                    r)
+{
+#ifdef HAVE_COPY_FILE_RANGE
+       struct pathname         fpath1;
+       struct pathname         fpath2;
+       struct stat64           stat1;
+       struct stat64           stat2;
+       char                    inoinfo1[1024];
+       char                    inoinfo2[1024];
+       loff_t                  lr;
+       loff_t                  off1;
+       loff_t                  off2;
+       loff_t                  max_off2;
+       size_t                  len;
+       int                     tries = 0;
+       int                     v1;
+       int                     v2;
+       int                     fd1;
+       int                     fd2;
+       size_t                  ret;
+       int                     e;
+
+       /* Load paths */
+       init_pathname(&fpath1);
+       if (!get_fname(FT_REGm, r, &fpath1, NULL, NULL, &v1)) {
+               if (v1)
+                       printf("%d/%d: copyrange read - no filename\n",
+                               procid, opno);
+               goto out_fpath1;
+       }
+
+       init_pathname(&fpath2);
+       if (!get_fname(FT_REGm, random(), &fpath2, NULL, NULL, &v2)) {
+               if (v2)
+                       printf("%d/%d: copyrange write - no filename\n",
+                               procid, opno);
+               goto out_fpath2;
+       }
+
+       /* Open files */
+       fd1 = open_path(&fpath1, O_RDONLY);
+       e = fd1 < 0 ? errno : 0;
+       check_cwd();
+       if (fd1 < 0) {
+               if (v1)
+                       printf("%d/%d: copyrange read - open %s failed %d\n",
+                               procid, opno, fpath1.path, e);
+               goto out_fpath2;
+       }
+
+       fd2 = open_path(&fpath2, O_WRONLY);
+       e = fd2 < 0 ? errno : 0;
+       check_cwd();
+       if (fd2 < 0) {
+               if (v2)
+                       printf("%d/%d: copyrange write - open %s failed %d\n",
+                               procid, opno, fpath2.path, e);
+               goto out_fd1;
+       }
+
+       /* Get file stats */
+       if (fstat64(fd1, &stat1) < 0) {
+               if (v1)
+                       printf("%d/%d: copyrange read - fstat64 %s failed %d\n",
+                               procid, opno, fpath1.path, errno);
+               goto out_fd2;
+       }
+       inode_info(inoinfo1, sizeof(inoinfo1), &stat1, v1);
+
+       if (fstat64(fd2, &stat2) < 0) {
+               if (v2)
+                       printf("%d/%d: copyrange write - fstat64 %s failed %d\n",
+                               procid, opno, fpath2.path, errno);
+               goto out_fd2;
+       }
+       inode_info(inoinfo2, sizeof(inoinfo2), &stat2, v2);
+
+       /* Calculate offsets */
+       len = (random() % FILELEN_MAX) + 1;
+       if (len == 0)
+               len = stat1.st_blksize;
+       if (len > stat1.st_size)
+               len = stat1.st_size;
+
+       lr = ((int64_t)random() << 32) + random();
+       if (stat1.st_size == len)
+               off1 = 0;
+       else
+               off1 = (off64_t)(lr % MIN(stat1.st_size - len, MAXFSIZE));
+       off1 %= maxfsize;
+
+       /*
+        * If srcfile == destfile, randomly generate destination ranges
+        * until we find one that doesn't overlap the source range.
+        */
+       max_off2 = MIN(stat2.st_size + (1024ULL * stat2.st_blksize), MAXFSIZE);
+       do {
+               lr = ((int64_t)random() << 32) + random();
+               off2 = (off64_t)(lr % max_off2);
+               off2 %= maxfsize;
+       } while (stat1.st_ino == stat2.st_ino && llabs(off2 - off1) < len);
+
+       while (len > 0) {
+               ret = syscall(__NR_copy_file_range, fd1, &off1, fd2, &off2,
+                             len, 0);
+               if (ret < 0) {
+                       if (errno != EAGAIN || tries++ >= 300)
+                               break;
+               } else if (ret > len)
+                       break;
+               else if (ret > 0)
+                       len -= ret;
+       }
+       e = ret < 0 ? errno : 0;
+       if (v1 || v2) {
+               printf("%d/%d: copyrange %s%s [%lld,%lld] -> %s%s [%lld,%lld]",
+                       procid, opno,
+                       fpath1.path, inoinfo1, (long long)off1, (long long)len,
+                       fpath2.path, inoinfo2, (long long)off2, (long long)len);
+
+               if (ret < 0)
+                       printf(" error %d", e);
+               else if (len && ret > len)
+                       printf(" asked for %lld, copied %lld??\n",
+                               (long long)len, (long long)ret);
+               printf("\n");
+       }
+
+out_fd2:
+       close(fd2);
+out_fd1:
+       close(fd1);
+out_fpath2:
+       free_pathname(&fpath2);
+out_fpath1:
+       free_pathname(&fpath1);
+#endif
+}
+

 /* dedupe some arbitrary range of f1 to f2...fn. */
 void
 deduperange_f(
 /* dedupe some arbitrary range of f1 to f2...fn. */
 void
 deduperange_f(

diff --git a/m4/package_libcdev.m4 b/m4/package_libcdev.m4
index fb123f3317c5d1113d54486b93f0e72079f0f6d5..14e67e18e7723da8820bb6a8463a0fe3773d01eb 100644 (file)
--- a/m4/package_libcdev.m4
+++ b/m4/package_libcdev.m4
@@ -98,3 +98,22 @@ AC_DEFUN([AC_HAVE_GETMNTINFO],
        AC_MSG_RESULT(no))
     AC_SUBST(have_getmntinfo)
   ])
        AC_MSG_RESULT(no))
     AC_SUBST(have_getmntinfo)
   ])

+
+#
+#
+# Check if we have a copy_file_range system call (Linux)
+#
+AC_DEFUN([AC_HAVE_COPY_FILE_RANGE],
+  [ AC_MSG_CHECKING([for copy_file_range])
+    AC_TRY_LINK([
+#define _GNU_SOURCE
+#include <sys/syscall.h>
+#include <unistd.h>
+    ], [
+         syscall(__NR_copy_file_range, 0, 0, 0, 0, 0, 0);
+    ], have_copy_file_range=yes
+       AC_MSG_RESULT(yes),
+       AC_MSG_RESULT(no))
+    AC_SUBST(have_copy_file_range)
+  ])
+