Support the renameat2 syscall in fsstress.
Signed-off-by: kaixuxia <kaixuxia@xxxxxxxxxxx>
---
Changes in v3:
- Fix the rename(..., 0) case, avoide to cripple fsstress.
ltp/fsstress.c | 158 +++++++++++++++++++++++++++++++++++++++++++++------------
1 file changed, 125 insertions(+), 33 deletions(-)
diff --git a/ltp/fsstress.c b/ltp/fsstress.c
index 51976f5..1a20358 100644
--- a/ltp/fsstress.c
+++ b/ltp/fsstress.c
@@ -44,6 +44,38 @@ io_context_t io_ctx;
#define IOV_MAX 1024
#endif
+#ifndef HAVE_RENAMEAT2
+#if !defined(SYS_renameat2) && defined(__x86_64__)
+#define SYS_renameat2 316
+#endif
+
+#if !defined(SYS_renameat2) && defined(__i386__)
+#define SYS_renameat2 353
+#endif
+
+static int renameat2(int dfd1, const char *path1,
+ int dfd2, const char *path2,
+ unsigned int flags)
+{
+#ifdef SYS_renameat2
+ return syscall(SYS_renameat2, dfd1, path1, dfd2, path2, flags);
+#else
+ errno = ENOSYS;
+ return -1;
+#endif
+}
+#endif
+
+#ifndef RENAME_NOREPLACE
+#define RENAME_NOREPLACE (1 << 0) /* Don't overwrite target */
+#endif
+#ifndef RENAME_EXCHANGE
+#define RENAME_EXCHANGE (1 << 1) /* Exchange source and dest */
+#endif
+#ifndef RENAME_WHITEOUT
+#define RENAME_WHITEOUT (1 << 2) /* Whiteout source */
+#endif
+
#define FILELEN_MAX (32*4096)
typedef enum {
@@ -85,6 +117,9 @@ typedef enum {
OP_READV,
OP_REMOVEFATTR,
OP_RENAME,
+ OP_RNOREPLACE,
+ OP_REXCHANGE,
+ OP_RWHITEOUT,
OP_RESVSP,
OP_RMDIR,
OP_SETATTR,
@@ -203,6 +238,9 @@ void readlink_f(int, long);
void readv_f(int, long);
void removefattr_f(int, long);
void rename_f(int, long);
+void rnoreplace_f(int, long);
+void rexchange_f(int, long);
+void rwhiteout_f(int, long);
void resvsp_f(int, long);
void rmdir_f(int, long);
void setattr_f(int, long);
@@ -262,6 +300,9 @@ opdesc_t ops[] = {
/* remove (delete) extended attribute */
{ OP_REMOVEFATTR, "removefattr", removefattr_f, 1, 1 },
{ OP_RENAME, "rename", rename_f, 2, 1 },
+ { OP_RNOREPLACE, "rnoreplace", rnoreplace_f, 2, 1 },
+ { OP_REXCHANGE, "rexchange", rexchange_f, 2, 1 },
+ { OP_RWHITEOUT, "rwhiteout", rwhiteout_f, 2, 1 },
{ OP_RESVSP, "resvsp", resvsp_f, 1, 1 },
{ OP_RMDIR, "rmdir", rmdir_f, 1, 1 },
/* set attribute flag (FS_IOC_SETFLAGS ioctl) */
@@ -354,7 +395,7 @@ int open_path(pathname_t *, int);
DIR *opendir_path(pathname_t *);
void process_freq(char *);
int readlink_path(pathname_t *, char *, size_t);
-int rename_path(pathname_t *, pathname_t *);
+int rename_path(pathname_t *, pathname_t *, int);
int rmdir_path(pathname_t *);
void separate_pathname(pathname_t *, char *, pathname_t *);
void show_ops(int, char *);
@@ -1519,7 +1560,7 @@ readlink_path(pathname_t *name, char *lbuf, size_t lbufsiz)
}
int
-rename_path(pathname_t *name1, pathname_t *name2)
+rename_path(pathname_t *name1, pathname_t *name2, int mode)
{
char buf1[NAME_MAX + 1];
char buf2[NAME_MAX + 1];
@@ -1528,14 +1569,17 @@ rename_path(pathname_t *name1, pathname_t *name2)
pathname_t newname2;
int rval;
- rval = rename(name1->path, name2->path);
+ if (mode == 0)
+ rval = rename(name1->path, name2->path);
+ else
+ rval = renameat2(AT_FDCWD, name1->path, AT_FDCWD, name2->path, mode);
if (rval >= 0 || errno != ENAMETOOLONG)
return rval;
separate_pathname(name1, buf1, &newname1);
separate_pathname(name2, buf2, &newname2);
if (strcmp(buf1, buf2) == 0) {
if (chdir(buf1) == 0) {
- rval = rename_path(&newname1, &newname2);
+ rval = rename_path(&newname1, &newname2, mode);
assert(chdir("..") == 0);
}
} else {
@@ -1555,7 +1599,7 @@ rename_path(pathname_t *name1, pathname_t *name2)
append_pathname(&newname2, "../");
append_pathname(&newname2, name2->path);
if (chdir(buf1) == 0) {
- rval = rename_path(&newname1, &newname2);
+ rval = rename_path(&newname1, &newname2, mode);
assert(chdir("..") == 0);
}
} else {
@@ -1563,7 +1607,7 @@ rename_path(pathname_t *name1, pathname_t *name2)
append_pathname(&newname1, "../");
append_pathname(&newname1, name1->path);
if (chdir(buf2) == 0) {
- rval = rename_path(&newname1, &newname2);
+ rval = rename_path(&newname1, &newname2, mode);
assert(chdir("..") == 0);
}
}
@@ -4215,8 +4259,18 @@ out:
free_pathname(&f);
}
+struct print_flags renameat2_flags [] = {
+ { RENAME_NOREPLACE, "NOREPLACE"},
+ { RENAME_EXCHANGE, "EXCHANGE"},
+ { RENAME_WHITEOUT, "WHITEOUT"},
+ { -1, NULL}
+};
+
+#define translate_renameat2_flags(mode) \
+ ({translate_flags(mode, "|", renameat2_flags);})
+
void
-rename_f(int opno, long r)
+do_renameat2(int opno, long r, int mode)
{
fent_t *dfep;
int e;
@@ -4234,35 +4288,49 @@ rename_f(int opno, long r)
init_pathname(&f);
if (!get_fname(FT_ANYm, r, &f, &flp, &fep, &v1)) {
if (v1)
- printf("%d/%d: rename - no filename\n", procid, opno);
+ printf("%d/%d: rename - no source filename\n", procid, opno);
free_pathname(&f);
return;
}
-
- /* get an existing directory for the destination parent directory name */
- if (!get_fname(FT_DIRm, random(), NULL, NULL, &dfep, &v))
- parid = -1;
- else
- parid = dfep->id;
- v |= v1;
-
- /* generate a new path using an existing parent directory in name */
- init_pathname(&newf);
- e = generate_fname(dfep, flp - flist, &newf, &id, &v1);
- v |= v1;
- if (!e) {
- if (v) {
- (void)fent_to_name(&f, &flist[FT_DIR], dfep);
- printf("%d/%d: rename - no filename from %s\n",
- procid, opno, f.path);
+ /* Both pathnames must exist for the RENAME_EXCHANGE */
+ if (mode == RENAME_EXCHANGE) {
+ init_pathname(&newf);
+ if (!get_fname(FT_ANYm, random(), &newf, NULL, &dfep, &v1)) {
+ if (v1)
+ printf("%d/%d: rename - no target filename\n", procid, opno);
+ free_pathname(&newf);
+ free_pathname(&f);
+ return;
+ }
+ id = dfep->id;
+ parid = dfep->parent;
+ } else {
+ /* get an existing directory for the destination parent directory name */
+ if (!get_fname(FT_DIRm, random(), NULL, NULL, &dfep, &v))
+ parid = -1;
+ else
+ parid = dfep->id;
+ v |= v1;
+
+ /* generate a new path using an existing parent directory in name */
+ init_pathname(&newf);
+ e = generate_fname(dfep, flp - flist, &newf, &id, &v1);
+ v |= v1;
+ if (!e) {
+ if (v) {
+ (void)fent_to_name(&f, &flist[FT_DIR], dfep);
+ printf("%d/%d: rename - no filename from %s\n",
+ procid, opno, f.path);
+ }
+ free_pathname(&newf);
+ free_pathname(&f);
+ return;
}
- free_pathname(&newf);
- free_pathname(&f);
- return;
}
- e = rename_path(&f, &newf) < 0 ? errno : 0;
+
+ e = rename_path(&f, &newf, mode) < 0 ? errno : 0;
check_cwd();
- if (e == 0) {
+ if (e == 0 && mode != RENAME_EXCHANGE) {
int xattr_counter = fep->xattr_counter;
if (flp - flist == FT_DIR) {
@@ -4273,12 +4341,13 @@ rename_f(int opno, long r)
add_to_flist(flp - flist, id, parid, xattr_counter);
}
if (v) {
- printf("%d/%d: rename %s to %s %d\n", procid, opno, f.path,
+ printf("%d/%d: rename(%s) %s to %s %d\n", procid,
+ opno, translate_renameat2_flags(mode), f.path,
newf.path, e);
if (e == 0) {
- printf("%d/%d: rename del entry: id=%d,parent=%d\n",
+ printf("%d/%d: rename source entry: id=%d,parent=%d\n",
procid, opno, fep->id, fep->parent);
- printf("%d/%d: rename add entry: id=%d,parent=%d\n",
+ printf("%d/%d: rename target entry: id=%d,parent=%d\n",
procid, opno, id, parid);
}
}
@@ -4287,6 +4356,29 @@ rename_f(int opno, long r)
}
void
+rename_f(int opno, long r)
+{
+ do_renameat2(opno, r, 0);
+}
+void
+rnoreplace_f(int opno, long r)
+{
+ do_renameat2(opno, r, RENAME_NOREPLACE);
+}
+
+void
+rexchange_f(int opno, long r)
+{
+ do_renameat2(opno, r, RENAME_EXCHANGE);
+}
+
+void
+rwhiteout_f(int opno, long r)
+{
+ do_renameat2(opno, r, RENAME_WHITEOUT);
+}
+
+void
resvsp_f(int opno, long r)
{
int e;
--
1.8.3.1
--
kaixuxia
