From patchwork Sat Oct 26 11:18:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kaixu Xia X-Patchwork-Id: 11213493 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 92B921864 for ; Sat, 26 Oct 2019 11:18:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7128A21871 for ; Sat, 26 Oct 2019 11:18:49 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="CUHSrLmj" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726198AbfJZLSt (ORCPT ); Sat, 26 Oct 2019 07:18:49 -0400 Received: from mail-pf1-f196.google.com ([209.85.210.196]:36838 "EHLO mail-pf1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726124AbfJZLSs (ORCPT ); Sat, 26 Oct 2019 07:18:48 -0400 Received: by mail-pf1-f196.google.com with SMTP id v19so3466939pfm.3; Sat, 26 Oct 2019 04:18:48 -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=ZpVYoZ/JyrHVvhweeOK3ctog2JQiFN7vWiPCLmx8Ock=; b=CUHSrLmjI1Avz9z5tMvuTJQwCBL1hnrcv/DkizIaytcXui7T297303QF+XfURkxJWj n8b8EZIzzuC6wJmyIaHRGN2glgz51FRy76RzTUoo6SXQgYUFbzZJXYASYROV9Jn20VSv 1Ju1+dq7AehAyotOj1LxGCmORlBUAw+NfMcEhZ3VILyow/EP43wrEll4RgO+tPKaRW9w vGgGF3jVtltFzsJZwSItcJFZ1yIm30iEA3mCeTeDKZ+qT82cdxccBQh5dUdi+Srnn8Xz JDo7f4YgUaFmyc6iR/Z3L9fgMedm74uANM7EDgq6Snu6pXyIkbvq/RFXE9SA/rdKAtGE Egbw== 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=ZpVYoZ/JyrHVvhweeOK3ctog2JQiFN7vWiPCLmx8Ock=; b=XOEUnlPeVuzW6qkg496yZ6WJXLLdRSD7XF2JdLg/Nz0WjDfwAHDukaX2On4egPaGvt 8YnSui3hFVkc/NUCQf7uiXcSpfMa03L6mgWOLnCUrQ9P4j8/pGX4iokcfKpw/j7snzpY Dp2uD9Vdo1YfZH+CodZdNvO6Yl8VeoJOqkSXeOMe4XWVprIep8bZvkhMrTioN2YyB0E0 yslNM63YQfkPAEkqRlAYfO0Xgf+ZE/ORoNBACUj5yR65CDGH5nowSthFB+g82LKIw0Mi qAqSBZkT+FMuDGgpbkmO7xjsbUiSPd4lq36GLelox3h1z8sDDEY9pmz/nkbNkTnJsBRY sAhw== X-Gm-Message-State: APjAAAXoG/J9Da3hdkUbfkjTfMb2AsFOugQCh6qmfP2E1PH7xOE6A8RQ 64bcFEHKqsFEwi2FMMSzuMvncvQ= X-Google-Smtp-Source: APXvYqwUqxj3GKleIGnDWXO8qIoJKtD4TD28GTlVd6zxCEWEpKr1I0PxFk5EvHQhq7b4BWDzJ66Kfg== X-Received: by 2002:a17:90a:a005:: with SMTP id q5mr10241046pjp.104.1572088727906; Sat, 26 Oct 2019 04:18:47 -0700 (PDT) Received: from he-cluster.localdomain ([67.216.221.250]) by smtp.gmail.com with ESMTPSA id y2sm6104534pfe.126.2019.10.26.04.18.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 26 Oct 2019 04:18:47 -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 v2 1/4] fsstress: show the real file id and parid in rename_f() Date: Sat, 26 Oct 2019 19:18:35 +0800 Message-Id: <02ad456bedf5a9c8e2c4c969953a1e19fed5670e.1572057903.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 The source file id and parentid are overwritten by del_from_flist() call, and should show the actually values. Signed-off-by: kaixuxia Reviewed-by: Brian Foster --- ltp/fsstress.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/ltp/fsstress.c b/ltp/fsstress.c index 51976f5..95285f1 100644 --- a/ltp/fsstress.c +++ b/ltp/fsstress.c @@ -4227,6 +4227,7 @@ rename_f(int opno, long r) pathname_t newf; int oldid; int parid; + int oldparid; int v; int v1; @@ -4265,10 +4266,12 @@ rename_f(int opno, long r) if (e == 0) { int xattr_counter = fep->xattr_counter; - if (flp - flist == FT_DIR) { - oldid = fep->id; + oldid = fep->id; + oldparid = fep->parent; + + 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); } @@ -4277,7 +4280,7 @@ rename_f(int opno, long r) newf.path, e); if (e == 0) { printf("%d/%d: rename del entry: id=%d,parent=%d\n", - procid, opno, fep->id, fep->parent); + procid, opno, oldid, oldparid); printf("%d/%d: rename add entry: id=%d,parent=%d\n", procid, opno, id, parid); } From patchwork Sat Oct 26 11:18:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kaixu Xia X-Patchwork-Id: 11213497 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 2E0D313BD for ; Sat, 26 Oct 2019 11:18:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0149821897 for ; Sat, 26 Oct 2019 11:18:50 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="jGqenShq" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726214AbfJZLSu (ORCPT ); Sat, 26 Oct 2019 07:18:50 -0400 Received: from mail-pg1-f196.google.com ([209.85.215.196]:38757 "EHLO mail-pg1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726124AbfJZLSu (ORCPT ); Sat, 26 Oct 2019 07:18:50 -0400 Received: by mail-pg1-f196.google.com with SMTP id w3so3364063pgt.5; Sat, 26 Oct 2019 04:18:49 -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=HsvcNjNluqtfPfMVqS46MCGIHAgDYavZFQOkbT5TXhU=; b=jGqenShqc4sBV6AClDtuAKImPAvglAXH4pkjYXBShn47DamcM8dlIKlnnPW1P73mIF VWCxsSNvDwi1MlTiduuVfUcFd82ANUxVfgcD9hX5qxcQu/bjZgmmn3PY0FbzYkxliWsg k/HJwVt+uxGPQWOQwVtgMbbIB3XjjPIoHw/drYVUNMOkvA70wkhOxEkVqXTw0A2E6uGy YCQQuARzp2UQSvbSSFsi5mBCBe2QtPu/OjrgpNQaRrrWFRPwi8yhrmrlTPNp9bfdt4IP uB1+OMT+4DaYZdxoR1ZHKDvqeaIf58WbW7vBbcgsP0K46ctF8q63dNKM0JVWY07ZDs03 Hcjw== 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=HsvcNjNluqtfPfMVqS46MCGIHAgDYavZFQOkbT5TXhU=; b=XBGeeYuNcQyKVypBfWILiLQVQU6hL+J3rVgq9EIiQz3eWwe5nF1v8s/DRZ0Nfvr16E ZNgMYsbNTdPg6jyjJLPsde9UTCjLcBYTKTZ0xVp6D4d9bQ3+DtwZog4N5ZGzlxMGny9C 93kTnAijYYNCdYIavfHnMaYp3daOuEhSNMotzChcltSoWMXEAf1zrz3GRRDeCM+blc+T vv+ZuIbLasqKlsTVYpI+RPdWHQA89xi9BJ6Le6B+3TSdEFvjuaa7MtihJF6ul88cqBL/ oBzSPbWfYipr/nQUWYPkgSJHVZoSj8+gyVWfN+AJpxPmaUJGVxlKqHDfAPJkp8uVOzAD aNOg== X-Gm-Message-State: APjAAAWNz+TUcC4ownYoKYLNdGpkZ3NDZLnwN57OJm1RO8IWYkm7q4MN vPNY4VGhZZSYuWR+bzPwPF0bNrw= X-Google-Smtp-Source: APXvYqyAFB0Uu6/koQuMmmFVz0O4/xiK2JYAHxGo3RabouVCJMWSxHkGnLRHOiJj3e43WBmVR/pOqg== X-Received: by 2002:a63:1e1f:: with SMTP id e31mr240351pge.303.1572088728882; Sat, 26 Oct 2019 04:18:48 -0700 (PDT) Received: from he-cluster.localdomain ([67.216.221.250]) by smtp.gmail.com with ESMTPSA id y2sm6104534pfe.126.2019.10.26.04.18.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 26 Oct 2019 04:18:48 -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 v2 2/4] fsstress: add NOREPLACE and WHITEOUT renameat2 support Date: Sat, 26 Oct 2019 19:18:36 +0800 Message-Id: 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. 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 --- ltp/fsstress.c | 105 ++++++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 90 insertions(+), 15 deletions(-) diff --git a/ltp/fsstress.c b/ltp/fsstress.c index 95285f1..ecc1adc 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); } } @@ -4290,6 +4347,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; From patchwork Sat Oct 26 11:18:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kaixu Xia X-Patchwork-Id: 11213501 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 8F2501864 for ; Sat, 26 Oct 2019 11:18:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6373E20867 for ; Sat, 26 Oct 2019 11:18:51 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="VrJshMrs" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726217AbfJZLSv (ORCPT ); Sat, 26 Oct 2019 07:18:51 -0400 Received: from mail-pf1-f196.google.com ([209.85.210.196]:37739 "EHLO mail-pf1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726203AbfJZLSu (ORCPT ); Sat, 26 Oct 2019 07:18:50 -0400 Received: by mail-pf1-f196.google.com with SMTP id y5so3466551pfo.4; Sat, 26 Oct 2019 04:18:50 -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=lLv8EgteSH3j3fSA5Kfy8q7uu4MJGHgaBzCq1ot8+80=; b=VrJshMrswVNsknjHcE/7DINLBePyiy/OxT+RbVXLk+C4faVZDpyufCcmMDNuQZKf5/ tT5dv74yLqeyPhctU9vZID7LYZQkBO3HQ1EZSUsEJ7hIivXMszpRbRqzO/e/InwGekew y8ATNlMNY2OCYhz2Fq0YEN4WcRHri04kAsDeDPFj8yTBC3XzEni/IMV0cRQgxZdm2J67 Vr3wmx20MgGzpr3EVxXKFjZbfHIIApHIJzVkNCU0io3AuC8M31hqC5bzGZhwJ7ArLZM7 MkW2IwCf9SPb2hFYBOQ7Nky3bFkhwVh8i2c71OC6dLwicblLvwTEmvgwnfgbBWjNmPF3 7bpA== 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=lLv8EgteSH3j3fSA5Kfy8q7uu4MJGHgaBzCq1ot8+80=; b=rF3PKuBR+pWlRmcv1WN0hoPUrGsdf2TXIaPr/y0RYjklDdpeL1j4VHWHsAh3gSDeIy kHgNI3E8UyZx8DAtMrFrPzVdkg26r8XBaNigRmOg2/PYIIVbnV2bW+tyYOqWKx1a0oX2 +wEejldr0H1+QL6uvExkgllHOl17GN0BDxdBNXaf4IwzOt/otKNdwljfT7IWV08JMHGQ C6RPJqTocLXgy+5q6zcy2Ag79hiV6rHy0DXpZpb2cR6DKJFBA40sSB0jHPF7nZ4xOv+9 3IRlZ7Hge/IgCBuP/ceTG5rpn1ZuGqv7+/7OkSwNu7inZBlNHG6uLkqLG9wzuw79M6CR HxUA== X-Gm-Message-State: APjAAAXwwFGtD70v4h0KcWUmAAvMBf57BTMayI6CQQDFOpb8EacNKz86 Y1wkv7AOkGTUDF9nYfGoXZmt2Jg= X-Google-Smtp-Source: APXvYqyncMVZBIBkUpXsYVb1l4QfRf9ECTAEvzPNaL+5tFCB19OFbJVfOPaQ0iW9OzSSU2FbwSw48A== X-Received: by 2002:a17:90a:86c7:: with SMTP id y7mr9877327pjv.82.1572088729681; Sat, 26 Oct 2019 04:18:49 -0700 (PDT) Received: from he-cluster.localdomain ([67.216.221.250]) by smtp.gmail.com with ESMTPSA id y2sm6104534pfe.126.2019.10.26.04.18.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 26 Oct 2019 04:18:49 -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 v2 3/4] fsstress: add EXCHANGE renameat2 support Date: Sat, 26 Oct 2019 19:18:37 +0800 Message-Id: <8e8cf5e50bc3c26c90d2677d3194d36346ef0c24.1572057903.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 EXCHANGE renameat2 syscall in fsstress. In order to maintain filelist/filename integrity, we restrict rexchange to files of the same type. Signed-off-by: kaixuxia --- ltp/fsstress.c | 92 ++++++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 71 insertions(+), 21 deletions(-) diff --git a/ltp/fsstress.c b/ltp/fsstress.c index ecc1adc..83d6337 100644 --- a/ltp/fsstress.c +++ b/ltp/fsstress.c @@ -69,6 +69,9 @@ static int renameat2(int dfd1, const char *path1, #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 @@ -115,6 +118,7 @@ typedef enum { OP_REMOVEFATTR, OP_RENAME, OP_RNOREPLACE, + OP_REXCHANGE, OP_RWHITEOUT, OP_RESVSP, OP_RMDIR, @@ -235,6 +239,7 @@ 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); @@ -296,6 +301,7 @@ opdesc_t ops[] = { { 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 }, @@ -371,7 +377,7 @@ void del_from_flist(int, int); int dirid_to_name(char *, int); void doproc(void); int fent_to_name(pathname_t *, flist_t *, fent_t *); -void fix_parent(int, int); +void fix_parent(int, int, bool); void free_pathname(pathname_t *); int generate_fname(fent_t *, int, pathname_t *, int *, int *); int generate_xattr_name(int, char *, int); @@ -1118,7 +1124,7 @@ fent_to_name(pathname_t *name, flist_t *flp, fent_t *fep) } void -fix_parent(int oldid, int newid) +fix_parent(int oldid, int newid, bool swap) { fent_t *fep; flist_t *flp; @@ -1129,6 +1135,8 @@ fix_parent(int oldid, int newid) for (j = 0, fep = flp->fents; j < flp->nfiles; j++, fep++) { if (fep->parent == oldid) fep->parent = newid; + else if (swap && fep->parent == newid) + fep->parent = oldid; } } } @@ -4256,6 +4264,7 @@ out: struct print_flags renameat2_flags [] = { { RENAME_NOREPLACE, "NOREPLACE"}, + { RENAME_EXCHANGE, "EXCHANGE"}, { RENAME_WHITEOUT, "WHITEOUT"}, { -1, NULL} }; @@ -4291,41 +4300,76 @@ do_renameat2(int opno, long r, int mode) 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; + /* + * Both pathnames must exist for the RENAME_EXCHANGE, and in + * order to maintain filelist/filename integrity, we should + * restrict exchange operation to files of the same type. + */ + if (mode == RENAME_EXCHANGE) { + which = 1 << (flp - flist); + init_pathname(&newf); + if (!get_fname(which, random(), &newf, NULL, &dfep, &v)) { + if (v) + printf("%d/%d: rename - no target filename\n", + procid, opno); + free_pathname(&newf); + free_pathname(&f); + return; + } + v |= v1; + 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); + /* + * 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, mode) < 0 ? errno : 0; check_cwd(); if (e == 0) { int xattr_counter = fep->xattr_counter; + bool swap = (mode == RENAME_EXCHANGE) ? true : false; oldid = fep->id; oldparid = fep->parent; + /* + * Swap the parent ids for RENAME_EXCHANGE, and replace the + * old parent id for the others. + */ if (flp - flist == FT_DIR) - fix_parent(oldid, id); + fix_parent(oldid, id, swap); if (mode == RENAME_WHITEOUT) { fep->xattr_counter = 0; add_to_flist(flp - flist, id, parid, xattr_counter); + } else if (mode == RENAME_EXCHANGE) { + fep->xattr_counter = dfep->xattr_counter; + dfep->xattr_counter = xattr_counter; } else { del_from_flist(flp - flist, fep - flp->fents); add_to_flist(flp - flist, id, parid, xattr_counter); @@ -4359,6 +4403,12 @@ rnoreplace_f(int opno, long r) } 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); From patchwork Sat Oct 26 11:18:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kaixu Xia X-Patchwork-Id: 11213505 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 A7E2D13BD for ; Sat, 26 Oct 2019 11:18:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 860B321655 for ; Sat, 26 Oct 2019 11:18:52 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="g+8/2ytU" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726239AbfJZLSw (ORCPT ); Sat, 26 Oct 2019 07:18:52 -0400 Received: from mail-pf1-f196.google.com ([209.85.210.196]:36843 "EHLO mail-pf1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726237AbfJZLSv (ORCPT ); Sat, 26 Oct 2019 07:18:51 -0400 Received: by mail-pf1-f196.google.com with SMTP id v19so3466999pfm.3; Sat, 26 Oct 2019 04:18:51 -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=hLyveOME/rptVjuJxX72WMT3z0xLnQ4b9DdXK8vjCCs=; b=g+8/2ytUsW5f7CwYhKr4bL2iMC1xP4x+Hk9SmBnzuLU8sDuENUnd32KLA/Oo1aH2iW hw/lBmMRRAG70yC4Cv6NJ91Ddy3eGCf1mupiyMhNLvWp3Mht9QjxFUBXaV9JsyGX+ghj hF51upaRHvikParHQFoN4ALyfsLyIMTghrsFZ4oF2q/NOUtvsI7zNuWjayMhJwYA//k3 zj4kkZd2y1CvoKDBxtU9LEyawDKXbCUHv9hgXzx11zMoxJ8RFOB1yN9XZexGRJlkxv2g QVculJUcuYyaKDeBnYs6mbUVbwCo53rV0Yt3I6nxzMO4rbkTo429rwlf4kXv87OzFC9U ZC5w== 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=hLyveOME/rptVjuJxX72WMT3z0xLnQ4b9DdXK8vjCCs=; b=UJUlH3EQyQGRa2DZzP/P4zeDr1Eh5LbFZBr6eINOL3gtFMq5lBWlwA8DZs5nxeorjM bjd4dDGUaJlmTFGvwF4iiDOQmaNTvBLbwrVmkscSBvhGGw68lgLPeSEYa/9u0rlN0iN0 /a4x43c0xm/DTB9hqVDAq2LAB5xFM8fJcEvj7/6eIwywNtiqXLn2+N/7O2QSEviptsCa TKCb8l8S08IAImQQV3fP1nr8r2SF+/iq99yuwspCVlXs4K+frTITxgeASw6l9bi4BtRA Jk7EPKRczVhcKZRpCUfRF0CV3OZibPjlo250ZIv3DZ89YdhBlfUYYkULazYB4L+URQFf iaqg== X-Gm-Message-State: APjAAAXfUbZPwoRFvL5OOPmObCRrp4Ahqq4qP7l/S5jULcD+uiGgFsP9 X4eXlPJ3TzHqRhOkms4JWw2Mz5Q= X-Google-Smtp-Source: APXvYqyi07a9v4IgvQR1bTJqx9cOKxGdqt1RU1OqaeMxdGXES8DfAgjuauKRGU18qhFOAX9VHZU3TA== X-Received: by 2002:a63:1242:: with SMTP id 2mr1380241pgs.288.1572088730610; Sat, 26 Oct 2019 04:18:50 -0700 (PDT) Received: from he-cluster.localdomain ([67.216.221.250]) by smtp.gmail.com with ESMTPSA id y2sm6104534pfe.126.2019.10.26.04.18.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 26 Oct 2019 04:18:50 -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 v2 4/4] xfs: test the deadlock between the AGI and AGF with RENAME_WHITEOUT Date: Sat, 26 Oct 2019 19:18:38 +0800 Message-Id: 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 There is ABBA deadlock bug between the AGI and AGF when performing rename() with RENAME_WHITEOUT flag, and add this testcase to make sure the rename() call works well. Signed-off-by: kaixuxia Reviewed-by: Brian Foster --- tests/generic/579 | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++ tests/generic/579.out | 2 ++ tests/generic/group | 1 + 3 files changed, 59 insertions(+) create mode 100755 tests/generic/579 create mode 100644 tests/generic/579.out diff --git a/tests/generic/579 b/tests/generic/579 new file mode 100755 index 0000000..95727f3 --- /dev/null +++ b/tests/generic/579 @@ -0,0 +1,56 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0 +# Copyright (c) 2019 Tencent. All Rights Reserved. +# +# FS QA Test No. 579 +# +# Regression test for: +# bc56ad8c74b8: ("xfs: Fix deadlock between AGI and AGF with RENAME_WHITEOUT") +# +seq=`basename $0` +seqres=$RESULT_DIR/$seq +echo "QA output created by $seq" + +here=`pwd` +tmp=/tmp/$$ +status=1 # failure is the default! +trap "_cleanup; exit \$status" 0 1 2 3 15 + +_cleanup() +{ + cd / + rm -f $tmp.* +} + +# get standard environment, filters and checks +. ./common/rc +. ./common/filter +. ./common/renameat2 + +# remove previous $seqres.full before test +rm -f $seqres.full + +# real QA test starts here +_supported_os Linux +_supported_fs generic +_require_scratch +_require_renameat2 whiteout + +_scratch_mkfs > $seqres.full 2>&1 || _fail "mkfs failed" +_scratch_mount >> $seqres.full 2>&1 + +# start a create and rename(rename_whiteout) workload. These processes +# occur simultaneously may cause the deadlock between AGI and AGF with +# RENAME_WHITEOUT. +$FSSTRESS_PROG -z -n 150 -p 100 \ + -f mknod=5 \ + -f rwhiteout=5 \ + -d $SCRATCH_MNT/fsstress >> $seqres.full 2>&1 + +echo Silence is golden + +# Failure comes in the form of a deadlock. + +# success, all done +status=0 +exit diff --git a/tests/generic/579.out b/tests/generic/579.out new file mode 100644 index 0000000..06f4633 --- /dev/null +++ b/tests/generic/579.out @@ -0,0 +1,2 @@ +QA output created by 579 +Silence is golden diff --git a/tests/generic/group b/tests/generic/group index 6f9c4e1..21870d2 100644 --- a/tests/generic/group +++ b/tests/generic/group @@ -581,3 +581,4 @@ 576 auto quick verity encrypt 577 auto quick verity 578 auto quick rw clone +579 auto rename