From 7f41cf24140cacd09110440cfe1f0b68ae9ba887 Mon Sep 17 00:00:00 2001 From: kaixuxia Date: Thu, 31 Oct 2019 14:41:47 +0800 Subject: [PATCH] fsstress: add NOREPLACE and WHITEOUT renameat2 support Support the renameat2(NOREPLACE and WHITEOUT) syscall in fsstress. The fent id correlates with filename and the filename correlates to type in flist, and the RWHITEOUT operation would leave a dev node around with whatever the name of the source file was, so in order to maintain filelist/filename integrity, we should restrict RWHITEOUT source file to device nodes. Signed-off-by: kaixuxia Reviewed-by: Brian Foster Signed-off-by: Eryu Guan --- ltp/fsstress.c | 105 ++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 90 insertions(+), 15 deletions(-) diff --git a/ltp/fsstress.c b/ltp/fsstress.c index 95285f17..ecc1adc3 100644 --- a/ltp/fsstress.c +++ b/ltp/fsstress.c @@ -44,6 +44,35 @@ 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_WHITEOUT +#define RENAME_WHITEOUT (1 << 2) /* Whiteout source */ +#endif + #define FILELEN_MAX (32*4096) typedef enum { @@ -85,6 +114,8 @@ typedef enum { OP_READV, OP_REMOVEFATTR, OP_RENAME, + OP_RNOREPLACE, + OP_RWHITEOUT, OP_RESVSP, OP_RMDIR, OP_SETATTR, @@ -203,6 +234,8 @@ 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 rwhiteout_f(int, long); void resvsp_f(int, long); void rmdir_f(int, long); void setattr_f(int, long); @@ -262,6 +295,8 @@ 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_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 +389,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 +1554,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 +1563,18 @@ 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 +1594,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 +1602,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 +4254,17 @@ out: free_pathname(&f); } +struct print_flags renameat2_flags [] = { + { RENAME_NOREPLACE, "NOREPLACE"}, + { 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; @@ -4228,14 +4276,17 @@ rename_f(int opno, long r) int oldid; int parid; int oldparid; + int which; int v; int v1; /* get an existing path for the source of the rename */ init_pathname(&f); - if (!get_fname(FT_ANYm, r, &f, &flp, &fep, &v1)) { + which = (mode == RENAME_WHITEOUT) ? FT_DEVm : FT_ANYm; + if (!get_fname(which, 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; } @@ -4261,7 +4312,7 @@ rename_f(int opno, long r) 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) { int xattr_counter = fep->xattr_counter; @@ -4272,16 +4323,22 @@ rename_f(int opno, long r) if (flp - flist == FT_DIR) fix_parent(oldid, id); - del_from_flist(flp - flist, fep - flp->fents); - add_to_flist(flp - flist, id, parid, xattr_counter); + if (mode == RENAME_WHITEOUT) { + fep->xattr_counter = 0; + add_to_flist(flp - flist, id, parid, xattr_counter); + } else { + del_from_flist(flp - flist, fep - flp->fents); + 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, oldid, oldparid); - 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); } } @@ -4289,6 +4346,24 @@ rename_f(int opno, long r) free_pathname(&f); } +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 +rwhiteout_f(int opno, long r) +{ + do_renameat2(opno, r, RENAME_WHITEOUT); +} + void resvsp_f(int opno, long r) { -- 2.30.2