From patchwork Thu Oct 24 14:20:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kaixu Xia X-Patchwork-Id: 11209869 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5584E112C for ; Thu, 24 Oct 2019 14:21:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 26EE322475 for ; Thu, 24 Oct 2019 14:21:01 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ri7384Iz" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2393909AbfJXOVA (ORCPT ); Thu, 24 Oct 2019 10:21:00 -0400 Received: from mail-pl1-f193.google.com ([209.85.214.193]:46530 "EHLO mail-pl1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391402AbfJXOVA (ORCPT ); Thu, 24 Oct 2019 10:21:00 -0400 Received: by mail-pl1-f193.google.com with SMTP id q21so3873839plr.13; Thu, 24 Oct 2019 07:20:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=5weXVE8D74ZpDgTCsTPBlghdFkubvz9zA+RhXzpBilc=; b=ri7384IzH6n5JX19ESQXXFYqti1SMh64pYe2yDOyu3wHuYqxzLXF40qTz+OqTEfnRa HuDW9CAbVMzzwlQfOGgKlhSKOnRKmizhOnt6FPvQ6qd9g1bA5mNsC9YgdJHC5ruuwxgx LbZ6YommnZzLqB+qCsOP4NDMQpvsMAs+Jc860RxQwnahpj7T8XJ58gc/kirZJiwJGaA3 C5hiUwVDsI5MrlLf8PXt9jK4aoST8gUJUktJY1fv5GJeezra9vDJI1QimqTv/vbI7Nni ehTCY1i1/MBo6XUzuQ7WntaHvTUAeCcaLnJK+0w4OFJ5lrVAjpIN0w3NarK9psq04kh4 Neqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=5weXVE8D74ZpDgTCsTPBlghdFkubvz9zA+RhXzpBilc=; b=FtoGLCiQS/WucFz9aLM60aTtyEHpbKZuy2DtUG7gXGQqUygmSwZA+HTxNxOXlt4laj TYOoODuFFdBdQzcVPU11Rx+I64AUIOMSsvpUrC6CdovZCwnUiF+Pf1kMH5cXttvKz61U /T+eR4wFibz7A7m4eR/cYwZ+ct2+Ku2o/1TuUDNyxuEwKrWhnmZrl/oekvgfNnJhB6k1 UKDuEh4PAVqBrhu8uSNCT2vicdfDzHceGkog6LYN4/ovtmZRn3zr5aCTxHaqQE7bW/Hq 12cRnBjWLjQ7RVuMhvBw1F5Pz5p45Mt008cCMOjwYJrafOi+Mc1iEn1NbY3WO9NQhAAK nA9g== X-Gm-Message-State: APjAAAUVkjL1/yBu/2TmIx0ruvXGY5Bi6RcqxsZkM+mXrDKJ12Spynf7 seNfbGFAl1iJ65UOMJyi9y7zlTgtnJhO X-Google-Smtp-Source: APXvYqxeBmHhMSPHwfYlBta7BB2z4zW4z+153nLpgQNszT2Iz66DTi8YUJigkiwJfdYP/vey/2/mrA== X-Received: by 2002:a17:902:b095:: with SMTP id p21mr4464794plr.159.1571926858919; Thu, 24 Oct 2019 07:20:58 -0700 (PDT) Received: from he-cluster.localdomain (67.216.221.250.16clouds.com. [67.216.221.250]) by smtp.gmail.com with ESMTPSA id i11sm24368284pgd.7.2019.10.24.07.20.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 24 Oct 2019 07:20:58 -0700 (PDT) From: kaixuxia X-Google-Original-From: kaixuxia To: fstests@vger.kernel.org Cc: linux-xfs@vger.kernel.org, guaneryu@gmail.com, bfoster@redhat.com, newtongao@tencent.com, jasperwang@tencent.com Subject: [PATCH 2/4] fsstress: add NOREPLACE and WHITEOUT renameat2 support Date: Thu, 24 Oct 2019 22:20:49 +0800 Message-Id: <1c7113e038b084962acf34f30b93a50ec5ed20aa.1571926790.git.kaixuxia@tencent.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: References: In-Reply-To: References: Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org Support the renameat2(NOREPLACE and WHITEOUT) syscall in fsstress. Signed-off-by: kaixuxia --- ltp/fsstress.c | 104 ++++++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 89 insertions(+), 15 deletions(-) diff --git a/ltp/fsstress.c b/ltp/fsstress.c index 95285f1..5059639 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,21 @@ 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) + 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); } } @@ -4290,6 +4346,24 @@ 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 +rwhiteout_f(int opno, long r) +{ + do_renameat2(opno, r, RENAME_WHITEOUT); +} + +void resvsp_f(int opno, long r) { int e;