From patchwork Wed Jan 23 07:34:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zorro Lang X-Patchwork-Id: 10776689 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A7F71139A for ; Wed, 23 Jan 2019 07:35:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8ECDF2766D for ; Wed, 23 Jan 2019 07:35:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7F2082B3F1; Wed, 23 Jan 2019 07:35:06 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 082D72766D for ; Wed, 23 Jan 2019 07:35:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726289AbfAWHfF (ORCPT ); Wed, 23 Jan 2019 02:35:05 -0500 Received: from mx1.redhat.com ([209.132.183.28]:47704 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726228AbfAWHfF (ORCPT ); Wed, 23 Jan 2019 02:35:05 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1B5032D2BD3 for ; Wed, 23 Jan 2019 07:35:05 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.66.13.9]) by smtp.corp.redhat.com (Postfix) with ESMTP id 42564662EB for ; Wed, 23 Jan 2019 07:35:04 +0000 (UTC) From: Zorro Lang To: fstests@vger.kernel.org Subject: [PATCH v4 1/2] fsstress: add splice support Date: Wed, 23 Jan 2019 15:34:54 +0800 Message-Id: <20190123073455.24539-1-zlang@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Wed, 23 Jan 2019 07:35:05 +0000 (UTC) Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Support the splice syscall in fsstress. Signed-off-by: Zorro Lang --- ltp/fsstress.c | 173 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 173 insertions(+) diff --git a/ltp/fsstress.c b/ltp/fsstress.c index 99a1d733..c04feb78 100644 --- a/ltp/fsstress.c +++ b/ltp/fsstress.c @@ -85,6 +85,7 @@ typedef enum { OP_RMDIR, OP_SETATTR, OP_SETXATTR, + OP_SPLICE, OP_STAT, OP_SYMLINK, OP_SYNC, @@ -194,6 +195,7 @@ void resvsp_f(int, long); void rmdir_f(int, long); void setattr_f(int, long); void setxattr_f(int, long); +void splice_f(int, long); void stat_f(int, long); void symlink_f(int, long); void sync_f(int, long); @@ -244,6 +246,7 @@ opdesc_t ops[] = { { OP_RMDIR, "rmdir", rmdir_f, 1, 1 }, { OP_SETATTR, "setattr", setattr_f, 0, 1 }, { OP_SETXATTR, "setxattr", setxattr_f, 1, 1 }, + { OP_SPLICE, "splice", splice_f, 1, 1 }, { OP_STAT, "stat", stat_f, 1, 0 }, { OP_SYMLINK, "symlink", symlink_f, 2, 1 }, { OP_SYNC, "sync", sync_f, 1, 1 }, @@ -2764,6 +2767,176 @@ setxattr_f(int opno, long r) #endif } +void +splice_f(int opno, long r) +{ + struct pathname fpath1; + struct pathname fpath2; + struct stat64 stat1; + struct stat64 stat2; + char inoinfo1[1024]; + char inoinfo2[1024]; + loff_t lr; + loff_t off1, off2; + size_t len; + loff_t offset1, offset2; + size_t length; + size_t total; + int v1; + int v2; + int fd1; + int fd2; + ssize_t ret1 = 0, ret2 = 0; + size_t bytes; + int e; + int filedes[2]; + + /* Load paths */ + init_pathname(&fpath1); + if (!get_fname(FT_REGm, r, &fpath1, NULL, NULL, &v1)) { + if (v1) + printf("%d/%d: splice read - no filename\n", + procid, opno); + goto out_fpath1; + } + + init_pathname(&fpath2); + if (!get_fname(FT_REGm, random(), &fpath2, NULL, NULL, &v2)) { + if (v2) + printf("%d/%d: splice write - no filename\n", + procid, opno); + goto out_fpath2; + } + + /* Open files */ + fd1 = open_path(&fpath1, O_RDONLY); + e = fd1 < 0 ? errno : 0; + check_cwd(); + if (fd1 < 0) { + if (v1) + printf("%d/%d: splice read - open %s failed %d\n", + procid, opno, fpath1.path, e); + goto out_fpath2; + } + + fd2 = open_path(&fpath2, O_WRONLY); + e = fd2 < 0 ? errno : 0; + check_cwd(); + if (fd2 < 0) { + if (v2) + printf("%d/%d: splice write - open %s failed %d\n", + procid, opno, fpath2.path, e); + goto out_fd1; + } + + /* Get file stats */ + if (fstat64(fd1, &stat1) < 0) { + if (v1) + printf("%d/%d: splice read - fstat64 %s failed %d\n", + procid, opno, fpath1.path, errno); + goto out_fd2; + } + inode_info(inoinfo1, sizeof(inoinfo1), &stat1, v1); + + if (fstat64(fd2, &stat2) < 0) { + if (v2) + printf("%d/%d: splice write - fstat64 %s failed %d\n", + procid, opno, fpath2.path, errno); + goto out_fd2; + } + inode_info(inoinfo2, sizeof(inoinfo2), &stat2, v2); + + /* Calculate offsets */ + len = (random() % FILELEN_MAX) + 1; + if (len == 0) + len = stat1.st_blksize; + if (len > stat1.st_size) + len = stat1.st_size; + + lr = ((int64_t)random() << 32) + random(); + if (stat1.st_size == len) + off1 = 0; + else + off1 = (off64_t)(lr % MIN(stat1.st_size - len, MAXFSIZE)); + off1 %= maxfsize; + + /* + * splice can overlap write, so the offset of the target file can be + * any number (< maxfsize) + */ + lr = ((int64_t)random() << 32) + random(); + off2 = (off64_t)(lr % maxfsize); + + /* + * Due to len, off1 and off2 will be changed later, so record the + * original number at here + */ + length = len; + offset1 = off1; + offset2 = off2; + + /* Pipe initialize */ + if (pipe(filedes) < 0) { + if (v1 || v2) { + printf("%d/%d: splice - pipe failed %d\n", + procid, opno, errno); + goto out_fd2; + } + } + + bytes = 0; + total = 0; + while (len > 0) { + /* move to pipe buffer */ + ret1 = splice(fd1, &off1, filedes[1], NULL, len, 0); + if (ret1 < 0) { + break; + } + bytes = ret1; + + /* move from pipe buffer to dst file */ + while (bytes > 0) { + ret2 = splice(filedes[0], NULL, fd2, &off2, bytes, 0); + if (ret2 < 0) { + break; + } + bytes -= ret2; + } + if (ret2 < 0) + break; + + len -= ret1; + total += ret1; + } + + if (ret1 < 0 || ret2 < 0) + e = errno; + else + e = 0; + if (v1 || v2) { + printf("%d/%d: splice %s%s [%lld,%lld] -> %s%s [%lld,%lld] %d", + procid, opno, + fpath1.path, inoinfo1, (long long)offset1, (long long)length, + fpath2.path, inoinfo2, (long long)offset2, (long long)length, e); + + if (length && length > total) + printf(" asked for %lld, spliced %lld??\n", + (long long)length, (long long)total); + printf("\n"); + } + + close(filedes[0]); + close(filedes[1]); +out_fd2: + close(fd2); +out_fd1: + close(fd1); +out_fpath2: + free_pathname(&fpath2); +out_fpath1: + free_pathname(&fpath1); +} + void creat_f(int opno, long r) { From patchwork Wed Jan 23 07:34:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zorro Lang X-Patchwork-Id: 10776691 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B8E7714E5 for ; Wed, 23 Jan 2019 07:35:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A58F52766D for ; Wed, 23 Jan 2019 07:35:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 99E802B3F1; Wed, 23 Jan 2019 07:35:08 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 49AE82766D for ; Wed, 23 Jan 2019 07:35:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726317AbfAWHfI (ORCPT ); Wed, 23 Jan 2019 02:35:08 -0500 Received: from mx1.redhat.com ([209.132.183.28]:55728 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726228AbfAWHfH (ORCPT ); Wed, 23 Jan 2019 02:35:07 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D1DB983F3D for ; Wed, 23 Jan 2019 07:35:07 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.66.13.9]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0767B662EC for ; Wed, 23 Jan 2019 07:35:06 +0000 (UTC) From: Zorro Lang To: fstests@vger.kernel.org Subject: [PATCH v4 2/2] common/dump: disable splice from FSSTRESS_AVOID Date: Wed, 23 Jan 2019 15:34:55 +0800 Message-Id: <20190123073455.24539-2-zlang@redhat.com> In-Reply-To: <20190123073455.24539-1-zlang@redhat.com> References: <20190123073455.24539-1-zlang@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Wed, 23 Jan 2019 07:35:07 +0000 (UTC) Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP New fsstress operation breaks fs dump/restore testing which use fsstress, e.g xfs/068. In _create_dumpdir_stress_num, disable splice in fsstress so that we dump exactly the same set of files and directories no matter how the xfs is configured. Signed-off-by: Zorro Lang --- Hi, V4 only changed this patch. Ealier patch tried to change xfs/086.out, this patche add splice into FSSTRESS_AVOID for dump/restore testing. Thanks, Zorro common/dump | 3 +++ 1 file changed, 3 insertions(+) diff --git a/common/dump b/common/dump index 4d1a1607..b17771b9 100644 --- a/common/dump +++ b/common/dump @@ -310,6 +310,9 @@ _create_dumpdir_stress_num() if $FSSTRESS_PROG | grep -q copyrange; then FSSTRESS_AVOID="-f copyrange=0 $FSSTRESS_AVOID" fi + if $FSSTRESS_PROG | grep -q splice; then + FSSTRESS_AVOID="-f splice=0 $FSSTRESS_AVOID" + fi echo "" echo "-----------------------------------------------"