From patchwork Thu Oct 24 14:20:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kaixu Xia X-Patchwork-Id: 11209865 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 C5BD61920 for ; Thu, 24 Oct 2019 14:20:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A117122468 for ; Thu, 24 Oct 2019 14:20:59 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="gglRlUzg" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2393904AbfJXOU7 (ORCPT ); Thu, 24 Oct 2019 10:20:59 -0400 Received: from mail-pf1-f195.google.com ([209.85.210.195]:37609 "EHLO mail-pf1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391402AbfJXOU7 (ORCPT ); Thu, 24 Oct 2019 10:20:59 -0400 Received: by mail-pf1-f195.google.com with SMTP id y5so15253289pfo.4; Thu, 24 Oct 2019 07:20:58 -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=LIyf2nUXNiC3edMCFCsEIIUrI7e0z/yUb6FaKRHRTYQ=; b=gglRlUzg6r7yWeniH37+Cu3ogRhGyF1J8MQh5ax+G1T6ntdbnbEhEOP3ar5wmxt6JU Zv/DYHSTMdGpbzR2ymbpEPYSbqKmbE02bfZ/Q6ouBu/TtWfC9pYaAjfyuwgzsIbL8SxZ D0OyuNvbS93+d+x0xK5DrlpIAGx9hJT2uHOo/+JBzsKk9roia8WlDIFdF76bLG3Hg2aS sn1U4EUF2FSvV34VPRmgNogt3dzWdnHexWvdpUsICDKrfhEJsEWO9wmx8bD6w9ye5RfG v4G6Ks5cO1v8Xl1+1SNdX9EgQvO1YeVvLG5Xho+Ks8tghTYyH5V7p5hCXWHavS9si9t1 ov0Q== 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=LIyf2nUXNiC3edMCFCsEIIUrI7e0z/yUb6FaKRHRTYQ=; b=T+JO+eiTVrGTyhTTbIuoW+ysqwogba/lwuyEtE0Knr2J9Ca/s0xI19xWHdnqo4GmB/ gKu8Id303iUdChy9EdPB+zVhRy5vR0kFSm97tpekDN0D+jyBlWDKCnGXjd7kG3BointG aOpstsd4uw84yjd5kpdtpSVmfaFVQOoWsxXq/fAW+fy/df6U83D6qf/MYO+zbyED3qVX lQD6nw7U3jvY9v9iBPmn4E9uKNVGyxNQkWG7IN2hUo4p54rcuFmXpJrqCxI57/sHZ6XB VrElQKG396sxRnO6Xtr8Kd45fQfoRGyPXpq2TzcKG5lS0rgPckYZgE4IGsWMdQ2boDyN hkyg== X-Gm-Message-State: APjAAAUzqTktow8+umioBJu+w6XsSRbb9ytupBzQSlX+7aiNFp0kOAfH rRFbw6D5ySEehUE2pqTKyo73Z2raxV6I X-Google-Smtp-Source: APXvYqybfz3Y9ourzS5Bn6HxGRpXB5jA0wHRVFdu3XosX+vDn4FFtKmc3SZcvySMCJ3XfKb92ihF9Q== X-Received: by 2002:a63:e156:: with SMTP id h22mr16594484pgk.266.1571926858016; 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.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 24 Oct 2019 07:20:57 -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 1/4] fsstress: show the real file id and parid in rename_f() Date: Thu, 24 Oct 2019 22:20:48 +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 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 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; From patchwork Thu Oct 24 14:20:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kaixu Xia X-Patchwork-Id: 11209873 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 B81451920 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 8924722475 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="ACwS+YRO" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2393911AbfJXOVB (ORCPT ); Thu, 24 Oct 2019 10:21:01 -0400 Received: from mail-pg1-f196.google.com ([209.85.215.196]:41294 "EHLO mail-pg1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2393910AbfJXOVA (ORCPT ); Thu, 24 Oct 2019 10:21:00 -0400 Received: by mail-pg1-f196.google.com with SMTP id l3so888666pgr.8; Thu, 24 Oct 2019 07:21:00 -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=xVuudhrUPQOKU6TpXvgcEqgxHYwWQz+YQhLeG2kax1Q=; b=ACwS+YROyTlrF9WJJ1ndhb2gtcxRoYIcyrk70pqSLgYb13hNWeXOIEtzbUnDeK2oup t4qsLA/cSgQdA/U/pcwkXNfrOfK5dFX1XKliIOAo1rTRtRZK8tk0EAS1wPx08zkYyCHE 81h0XE71pJmwaKjPVkVGCYcz7P0j20Rk4uFPa8EQk4AgD9w20q7xDalPHK1tNXVwbobl RGSK7pr6xYpHPdd4ueliSIgWLVjtGbkAInskivlZW9qvuZ3kXt97P5LPsAFibFoiKAhc nJ0D8qtcu/E9wTVHpX21NsK2kCP1wjwEzuaoxKcP2YImvCtB9J1JTK+u62dRh+J1MbBJ r2wg== 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=xVuudhrUPQOKU6TpXvgcEqgxHYwWQz+YQhLeG2kax1Q=; b=qRmZhGa+uRX8/s20MlT9qbzeTExHH2bV2qiR4JSLmkTLae0bQhx0WzAEIv3cv3gIHu ZJrmBF+7OMH2WLVLLaxVa47y1wU3/hyOEKUs0kMWjOrLE3hBI0fKOeyI/xYvDxZHnBRc a99ybmBKTumDxkXrI0FK0JwmBAs15yz9tzH/k8slCroEkX9VyvDKRitOnWr2DzF1MRTc FREFX4g50d/tAmHSv6ZXNmXYqJxHSwPjZg6WjKFDLeNRgmPQNJym+i0dqhtsIaCpvgA/ GLK57nwYX4ocCO2BsOW/8KdOhnWKN/LOpzTua6/yiHCqnS8sH6/k8QrD+vJCim9mWpvm 76Wg== X-Gm-Message-State: APjAAAXKlOMtRWjCgfHmSAMBRX5zZICmlDXoftEB8mGhpq97iKa7L5SF bm1qu/WJfvFPtClpwNn2JFys8iQd+HQa X-Google-Smtp-Source: APXvYqz4DOQiTaSouNXUp48eMY2SNTBxOSh4F4W0rRs/CSoPh7MCgHU1FeXEwTsHcQDQ5zpPAh6d4A== X-Received: by 2002:a63:1606:: with SMTP id w6mr2032811pgl.245.1571926859795; Thu, 24 Oct 2019 07:20:59 -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:59 -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 3/4] fsstress: add EXCHANGE renameat2 support Date: Thu, 24 Oct 2019 22:20:50 +0800 Message-Id: <71744e89979dfd25f1bffc44c70f6df214a5477b.1571926791.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. Signed-off-by: kaixuxia --- ltp/fsstress.c | 86 +++++++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 64 insertions(+), 22 deletions(-) diff --git a/ltp/fsstress.c b/ltp/fsstress.c index 5059639..958adf9 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, int); 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, int 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; + 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,68 @@ 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 */ + 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; + int swap = (mode == RENAME_EXCHANGE) ? 1 : 0; oldid = fep->id; oldparid = fep->parent; if (flp - flist == FT_DIR) - fix_parent(oldid, id); + fix_parent(oldid, id, swap); if (mode == RENAME_WHITEOUT) add_to_flist(flp - flist, id, parid, xattr_counter); - else { + 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); } @@ -4358,6 +4394,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 Thu Oct 24 14:20:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kaixu Xia X-Patchwork-Id: 11209877 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 9372D1515 for ; Thu, 24 Oct 2019 14:21:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 704C22246F for ; Thu, 24 Oct 2019 14:21:02 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="IXicb9Fq" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2393912AbfJXOVC (ORCPT ); Thu, 24 Oct 2019 10:21:02 -0400 Received: from mail-pf1-f196.google.com ([209.85.210.196]:33708 "EHLO mail-pf1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2393910AbfJXOVB (ORCPT ); Thu, 24 Oct 2019 10:21:01 -0400 Received: by mail-pf1-f196.google.com with SMTP id c184so5739857pfb.0; Thu, 24 Oct 2019 07:21:01 -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=e9HQKKJbsIVy6b/ristOMpsKHhr0/kDMpwhPfPMNbOA=; b=IXicb9FqvjQaRxTjb/gSj1/vV64zIo8ppsBol95iqhFJ7R7vxZGgyXCp/ApkCn7ToJ uElOV7h+D621LhsqUTwa9Hi668wJ5YAoe94Wb53GQh/huykQTDNlSrl6tpxFggkrf+YW iJyH/3iSSgfNFaXw1eiS5OYv3g/wSeWnOLPDGwqCUsnKRIUxQymlxpEhxN+58N/lD49u ZtZhXRjL5ot/e2YwLHpby4fCkGQh9FP0X9hsiCWmfhu/BDCw77KscYb/LzjaGs9u4WG1 ux5wC18s1uSkI0Ec8r63f42z7pzUZMvhoA9QnS8ahYLS8tuYEukleSvycZNAxrutfMLl ptjw== 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=e9HQKKJbsIVy6b/ristOMpsKHhr0/kDMpwhPfPMNbOA=; b=jGaU+WZttXZij03xYiO9zOxQ31Ld9iNI//VXNsphXiIQLreWoROyuNuvQotNIlhr2x lT9osjt6npiZsrdnCcBtscePgljvD7eNtFaBqi4wZ7s07Kq+84iHsVFLwtAPzFM/uR1b V7S3Hw2Xqj8o6GFmjPeuXCliYuI/5yCREKXeMyGeDbu3MWkHY8iEGdVjDl/wbjlp+Oz+ 3wjo+IMprvHYCR9q2CJUAMOcWF2zBTYystnyLE8Yve69WBrfxBlffIcR+QiVfZBpSlL1 pm0mpRUH7g1a+4LowL7x7RAVisSPJVsm5wtQS3ZPe9Rd/00AEFfATNfgWUp63s9TDKbK 1bdw== X-Gm-Message-State: APjAAAWBhBBrzm0ZUklBP45+CniVXd+7odA352T9peWflbF5bw/rU7ET qwrbctjAoYWQ9RSbMqbKjLVmka0Fh9Pu X-Google-Smtp-Source: APXvYqwAIOQT/LoYkAIscmzlAQCDuQ8CgjYFSegIKuToAX0QYtjEtg1nZBgIcUslBNiaCH6xNpkm6w== X-Received: by 2002:a63:7e11:: with SMTP id z17mr3824115pgc.33.1571926860872; Thu, 24 Oct 2019 07:21:00 -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.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 24 Oct 2019 07:21:00 -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 4/4] xfs: test the deadlock between the AGI and AGF with RENAME_WHITEOUT Date: Thu, 24 Oct 2019 22:20:51 +0800 Message-Id: <7d7257620da4bacbeda3d7c9bf84e2be3fbc597a.1571926791.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 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