From patchwork Sun May 29 10:55:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zorro Lang X-Patchwork-Id: 12864154 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DC992C433FE for ; Sun, 29 May 2022 10:55:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229584AbiE2KzP (ORCPT ); Sun, 29 May 2022 06:55:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49790 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229896AbiE2KzN (ORCPT ); Sun, 29 May 2022 06:55:13 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9BB2762CD1 for ; Sun, 29 May 2022 03:55:12 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 5CFC2B80139 for ; Sun, 29 May 2022 10:55:11 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7B1CFC34119 for ; Sun, 29 May 2022 10:55:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1653821710; bh=WIjcizgcG493Ekas9px4UBEw1C6MfRFREfhW6Q3phiE=; h=From:To:Subject:Date:In-Reply-To:References:From; b=gciHKYYue6xuzO85Lzsb8BvHxTjdpW30JGMxOa67Jz2082ptMA5/5ytkzWQMCOY+E cv0VpHJBp3AhGah1BFqB4c4tDsJ4FFs7uxo2z4kl8+ly2WVIfycnokXjiI7Wj+IiDf iK0LofjwLoMJke8Ajy+uJLCbfZBO756Om1+WVad2+kldcTPvOHkqlKuxRHKRPrVet+ LE8fQUf1Q1lT8t/scbHfE8LWBceKnWCE9kAoMQw4PdvFyYZJOnXKofjYL2nk2osW4P Nd6A+oMZ1YN6IqXYd7nbR9uNGY4UtmR1ClhmsXinZRRwC2q237FaMw6cSVM170FMSs /PL35q/vT/VKw== From: Zorro Lang To: fstests@vger.kernel.org Subject: [PATCH 1/5] generic/139: require 512 bytes to be the minimum dio size Date: Sun, 29 May 2022 18:55:01 +0800 Message-Id: <20220529105505.667891-2-zlang@kernel.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220529105505.667891-1-zlang@kernel.org> References: <20220529105505.667891-1-zlang@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org Due to generic/139 tests base on 512 bytes aligned, so skip this test if the minimum dio write size >512. This patch also change the common/rc::_require_dio helper, supports a minimum aligned size argument. Signed-off-by: Zorro Lang --- common/rc | 11 ++++++++--- tests/generic/139 | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/common/rc b/common/rc index 2f31ca46..6f7a37fd 100644 --- a/common/rc +++ b/common/rc @@ -2721,7 +2721,8 @@ _require_xfs_io_command() fi } -# check that kernel and filesystem support direct I/O +# check that kernel and filesystem support direct I/O, and check if "$1" size +# aligned (optional) is supported _require_odirect() { if [ $FSTYP = "ext4" ] || [ $FSTYP = "f2fs" ] ; then @@ -2735,9 +2736,13 @@ _require_odirect() fi fi local testfile=$TEST_DIR/$$.direct - $XFS_IO_PROG -F -f -d -c "pwrite 0 20k" $testfile > /dev/null 2>&1 + local opt + if [ -n "$1" ];then + opt="-b $1" + fi + $XFS_IO_PROG -F -f -d -c "pwrite $opt 0 20k" $testfile > /dev/null 2>&1 if [ $? -ne 0 ]; then - _notrun "O_DIRECT is not supported" + _notrun "O_DIRECT $1 is not supported" fi rm -f $testfile 2>&1 > /dev/null } diff --git a/tests/generic/139 b/tests/generic/139 index 0bbc222c..3eb1519d 100755 --- a/tests/generic/139 +++ b/tests/generic/139 @@ -26,7 +26,7 @@ _cleanup() # real QA test starts here _require_test_reflink _require_cp_reflink -_require_odirect +_require_odirect 512 testdir=$TEST_DIR/test-$seq rm -rf $testdir From patchwork Sun May 29 10:55:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zorro Lang X-Patchwork-Id: 12864152 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2C2EDC433F5 for ; Sun, 29 May 2022 10:55:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229920AbiE2KzN (ORCPT ); Sun, 29 May 2022 06:55:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49786 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229891AbiE2KzN (ORCPT ); Sun, 29 May 2022 06:55:13 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 17C4C62CD0 for ; Sun, 29 May 2022 03:55:12 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 9F30360C59 for ; Sun, 29 May 2022 10:55:11 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 80787C385A9 for ; Sun, 29 May 2022 10:55:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1653821711; bh=VAnwX6Rd0WvrnzTauSOl40v+/9yxK3eHMS1ktOE+TcY=; h=From:To:Subject:Date:In-Reply-To:References:From; b=OfrGex+guvfiigVR2sGP6hIeMNDvqEbgsK/+dpcJC/v9XDbqDfDG614ryM4a5HdiW aYAB4crN7icjl2o+utyLerGljJIf4K7A6cl8HTACudfh2qfg7ESQPVUiby1gbXbFcH jb4q9R0QmZaBwjqCESNDiwo4JqVQcCm+ch5svrmAdNP5eqMKraI8WjzAT1CHI05wjV FWa7O9+8GVqBH7+9V7JjprEK46VomSzjqbIhVWlpKDDVsvbDkW4D8/Csq4t5eiRHK9 4jC44qW3nCKH3/7u+BEiitvLkjcVY2bz7Px6vXmZYum/b+os8MuPq9FcBIzpNgqR7F 6GDu1T4CzSRxw== From: Zorro Lang To: fstests@vger.kernel.org Subject: [PATCH 2/5] generic/506: call _require_quota before _qmount Date: Sun, 29 May 2022 18:55:02 +0800 Message-Id: <20220529105505.667891-3-zlang@kernel.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220529105505.667891-1-zlang@kernel.org> References: <20220529105505.667891-1-zlang@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org The g/506 fails on some filesystems (e.g. overlay) which doesn't support prjquota: MOUNT_OPTIONS = -o prjquota qmount failed To avoid this failure, call _require_quota before doing real quota mount. Signed-off-by: Zorro Lang Reviewed-by: Dave Chinner --- tests/generic/506 | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/generic/506 b/tests/generic/506 index 25a5b0f8..ec91af78 100755 --- a/tests/generic/506 +++ b/tests/generic/506 @@ -27,6 +27,7 @@ _begin_fstest shutdown auto quick metadata quota _supported_fs generic _require_scratch +_require_quota _require_scratch_shutdown _scratch_mkfs >/dev/null 2>&1 From patchwork Sun May 29 10:55:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zorro Lang X-Patchwork-Id: 12864155 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0D58AC4332F for ; Sun, 29 May 2022 10:55:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229927AbiE2KzQ (ORCPT ); Sun, 29 May 2022 06:55:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49808 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229896AbiE2KzP (ORCPT ); Sun, 29 May 2022 06:55:15 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CE3CE62CD0 for ; Sun, 29 May 2022 03:55:14 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 73D42B80AEB for ; Sun, 29 May 2022 10:55:13 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 86610C3411C for ; Sun, 29 May 2022 10:55:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1653821712; bh=B/CORKgwBIFAthqSp7grMUWozxkPkZA9k2RTpNrSXDE=; h=From:To:Subject:Date:In-Reply-To:References:From; b=fypGG++Edja+Hxis91Taq63CfHSjHs/pi1tVjaMLD3FMme8HPy4mtq4iQTFiczeA5 NU+CdLPHdRah1RgkiTzrppFYpel3zSl3dnWZ9PbrS0UnIGRq2Hur4cEvGmmUCRq9h0 kw1EA1m5JUJAxA+J0whLQYvwbh7y7wSGX/T9kzi7/OGHKWSnjCwBLIUTOEFWlKryQu 2cDYFNs8zj5N5KfqTlAmZ9qZdpaRUvtdFOYh73EUyWsmPB39h+FyDyQmLXb+wRgy/3 if5ccMdeBaKzEvyHErMoQ5lt6IzlTeWuu8G3irOD+kYgAsizjWg/xj7v7beqavwlA0 CXbBV7crllpyw== From: Zorro Lang To: fstests@vger.kernel.org Subject: [PATCH 3/5] generic/591: remove redundant output from golden image Date: Sun, 29 May 2022 18:55:03 +0800 Message-Id: <20220529105505.667891-4-zlang@kernel.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220529105505.667891-1-zlang@kernel.org> References: <20220529105505.667891-1-zlang@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org In generic/591.out expects below output: concurrent reader with O_DIRECT concurrent reader with O_DIRECT <=== ??? concurrent reader without O_DIRECT concurrent reader without O_DIRECT <=== ??? sequential reader with O_DIRECT sequential reader without O_DIRECT The lines marked "???" are unbelievable, due to the src/splice-test.c only calls printf to output that message once in main function. So Why splice-test prints that message twice sometimes? It seems related with the "-r" option, due to the test lines without "-r" option only print one line each time running. A stanger thing is this "double output" issue only can be triggered by running g/591, can't reproduce it by running splice-test manually. By checking the code of splice-test.c, I found a "fork()" in it, and it'll be called if the '-r' option is specified. So I suspect the redundant output come from the child process. By the help of strace tool, I got: 10554 execve("/root/git/xfstests/src/splice-test", ["/root/git/xfstests/src/splice-te"..., "-r", "/mnt/test/a"], 0x7ffcabc2c0a8 /* 202 vars */) = 0 ... 10554 clone(child_stack=NULL, flags=CLONE_CHILD_CLEARTID|CLONE_CHILD_SETTID|SIGCHLD, child_tidptr=0x7f937f5d5a10) = 10555 ... 10555 read(4, "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"..., 512) = 512 10555 write(1, "concurrent reader with O_DIRECT\n", 32) = 32 10555 exit_group(0) = ? 10555 +++ exited with 0 +++ 10554 <... wait4 resumed>NULL, 0, NULL) = 10555 10554 --- SIGCHLD {si_signo=SIGCHLD, si_code=CLD_EXITED, si_pid=10555, si_uid=0, si_status=0, si_utime=0, si_stime=1} --- 10554 unlink("/mnt/test/a") = 0 10554 write(1, "concurrent reader with O_DIRECT\n", 32) = 32 10554 exit_group(0) = ? 10554 +++ exited with 0 +++ We can see the "concurrent reader with O_DIRECT\n" be printed by parent process 10554 and child process 10555 separately. As the output from child is unexpected and unstable. So I think we shouldn't use it as golden image. So I add a "fflush(stdout)" to clear the output buffer of parent process before forking a child. Then correct the generic/591.out. Signed-off-by: Zorro Lang --- src/splice-test.c | 1 + tests/generic/591.out | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/splice-test.c b/src/splice-test.c index 2f1ba2ba..e6ae6fca 100644 --- a/src/splice-test.c +++ b/src/splice-test.c @@ -143,6 +143,7 @@ int main(int argc, char *argv[]) printf("%s reader %s O_DIRECT\n", do_splice == do_splice1 ? "sequential" : "concurrent", (open_flags & O_DIRECT) ? "with" : "without"); + fflush(stdout); buffer = memalign(SECTOR_SIZE, BUFFER_SIZE); if (buffer == NULL) diff --git a/tests/generic/591.out b/tests/generic/591.out index d61811ee..e9fffd1d 100644 --- a/tests/generic/591.out +++ b/tests/generic/591.out @@ -1,7 +1,5 @@ QA output created by 591 concurrent reader with O_DIRECT -concurrent reader with O_DIRECT -concurrent reader without O_DIRECT concurrent reader without O_DIRECT sequential reader with O_DIRECT sequential reader without O_DIRECT From patchwork Sun May 29 10:55:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zorro Lang X-Patchwork-Id: 12864157 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 55DF5C433EF for ; Sun, 29 May 2022 10:55:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229934AbiE2KzV (ORCPT ); Sun, 29 May 2022 06:55:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49824 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229896AbiE2KzS (ORCPT ); Sun, 29 May 2022 06:55:18 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BEED762BFF for ; Sun, 29 May 2022 03:55:14 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 4C40360C1C for ; Sun, 29 May 2022 10:55:14 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8C065C34119 for ; Sun, 29 May 2022 10:55:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1653821713; bh=zOD6XWNFjRVu38KkNBrtFeOCpFel1z50yCXExS70/3I=; h=From:To:Subject:Date:In-Reply-To:References:From; b=mMQEfarVr0gRyK33+NXNz/TA/7CiR3Az6GijSf0gNRTDyBss1Z03i3fm4rxztsuE7 nVNKVNzlzU+GUh5Oy1EJv7WjyGUOFhBPBJFfjEgfh80PZuP2svdAtinHEHD+ooIiLa fsHIVVuvXG64iB/JRP8SFUCy7v9Hp0Tfw22OjhbVgle4WcHMW8Y01+nurPi7g2IPVg 2wRJR7bBC/KGJRH7ykILCXU/dT2mNeAGfu1ca6LWOKYOv3yafbWlO3QsiQNrxoTzgr D3gHRNYd2ZPCfrWI8jxRoexvhsE+OwNctSIbE8mdpGuZy+f3KXSh7CsccW3IaYCtWc CifoDKDPjlQOw== From: Zorro Lang To: fstests@vger.kernel.org Subject: [PATCH 4/5] generic/591: use proper sector size Date: Sun, 29 May 2022 18:55:04 +0800 Message-Id: <20220529105505.667891-5-zlang@kernel.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220529105505.667891-1-zlang@kernel.org> References: <20220529105505.667891-1-zlang@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org The generic/591 fails if the sector size of TEST_DEV isn't 512: splice-test: write: /mnt/test/a: Invalid argument To fix this issue, this patch help src/splice-test.c to get a specify sector size from the test case. Then let g/591 give it a proper sector size which dio aligned. Signed-off-by: Zorro Lang --- src/dmiperf | Bin 0 -> 31288 bytes src/splice-test.c | 37 +++++++++++++++++++++++++------------ src/t_locks_execve | Bin 0 -> 25904 bytes tests/generic/591 | 6 ++++-- 4 files changed, 29 insertions(+), 14 deletions(-) create mode 100755 src/dmiperf create mode 100755 src/t_locks_execve diff --git a/src/dmiperf b/src/dmiperf new file mode 100755 index 0000000000000000000000000000000000000000..da9aa46bbc7dd5bed88e6bdcadaa5923a34ea1b3 GIT binary patch literal 31288 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 literal 0 HcmV?d00001 diff --git a/src/splice-test.c b/src/splice-test.c index e6ae6fca..3e08f1c0 100644 --- a/src/splice-test.c +++ b/src/splice-test.c @@ -19,19 +19,20 @@ #include #include -#define SECTOR_SIZE 512 -#define BUFFER_SIZE (150 * SECTOR_SIZE) +unsigned int sector_size; +unsigned int buffer_size; void read_from_pipe(int fd, const char *filename, size_t size) { - char buffer[SECTOR_SIZE]; + char *buffer; size_t sz; ssize_t ret; + buffer = malloc(buffer_size); while (size) { sz = size; - if (sz > sizeof buffer) - sz = sizeof buffer; + if (sz > buffer_size) + sz = buffer_size; ret = read(fd, buffer, sz); if (ret < 0) err(1, "read: %s", filename); @@ -41,6 +42,7 @@ void read_from_pipe(int fd, const char *filename, size_t size) } size -= sz; } + free(buffer); } void do_splice1(int fd, const char *filename, size_t size) @@ -108,7 +110,7 @@ void do_splice2(int fd, const char *filename, size_t size) void usage(const char *argv0) { - fprintf(stderr, "USAGE: %s [-rd] {filename}\n", basename(argv0)); + fprintf(stderr, "USAGE: %s [-rd] [-s sectorsize] {filename}\n", basename(argv0)); exit(2); } @@ -120,11 +122,22 @@ int main(int argc, char *argv[]) int opt, open_flags, fd; ssize_t ret; + /* + * init default sector_size and buffer_size, might be changed if the -s + * option is specified + */ + sector_size = 512; + buffer_size = 150 * sector_size; + do_splice = do_splice1; open_flags = O_CREAT | O_TRUNC | O_RDWR | O_DIRECT; - while ((opt = getopt(argc, argv, "rd")) != -1) { + while ((opt = getopt(argc, argv, "rds:")) != -1) { switch(opt) { + case 's': + sector_size = strtol(optarg, NULL, 0); + buffer_size = 150 * sector_size; + break; case 'r': do_splice = do_splice2; break; @@ -145,7 +158,7 @@ int main(int argc, char *argv[]) (open_flags & O_DIRECT) ? "with" : "without"); fflush(stdout); - buffer = memalign(SECTOR_SIZE, BUFFER_SIZE); + buffer = memalign(sector_size, buffer_size); if (buffer == NULL) err(1, "memalign"); @@ -153,11 +166,11 @@ int main(int argc, char *argv[]) if (fd == -1) err(1, "open: %s", filename); - memset(buffer, 'x', BUFFER_SIZE); - ret = write(fd, buffer, BUFFER_SIZE); + memset(buffer, 'x', buffer_size); + ret = write(fd, buffer, buffer_size); if (ret < 0) err(1, "write: %s", filename); - if (ret != BUFFER_SIZE) { + if (ret != buffer_size) { fprintf(stderr, "%s: short write\n", filename); exit(1); } @@ -166,7 +179,7 @@ int main(int argc, char *argv[]) if (ret != 0) err(1, "lseek: %s", filename); - do_splice(fd, filename, BUFFER_SIZE); + do_splice(fd, filename, buffer_size); if (unlink(filename) == -1) err(1, "unlink: %s", filename); diff --git a/src/t_locks_execve b/src/t_locks_execve new file mode 100755 index 0000000000000000000000000000000000000000..5f0d77f903da5e85ddcab7fb095f6be2ea34b499 GIT binary patch literal 25904 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 Ba=-up literal 0 HcmV?d00001 diff --git a/tests/generic/591 b/tests/generic/591 index 5efc5136..4de50e2a 100755 --- a/tests/generic/591 +++ b/tests/generic/591 @@ -24,9 +24,11 @@ _require_test _require_odirect _require_test_program "splice-test" -$here/src/splice-test -r $TEST_DIR/a +diosize=`_min_dio_alignment $TEST_DEV` + +$here/src/splice-test -s $diosize -r $TEST_DIR/a $here/src/splice-test -rd $TEST_DIR/a -$here/src/splice-test $TEST_DIR/a +$here/src/splice-test -s $diosize $TEST_DIR/a $here/src/splice-test -d $TEST_DIR/a # success, all done From patchwork Sun May 29 10:55:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zorro Lang X-Patchwork-Id: 12864156 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C99C9C433F5 for ; Sun, 29 May 2022 10:55:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229896AbiE2KzW (ORCPT ); Sun, 29 May 2022 06:55:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49826 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229928AbiE2KzS (ORCPT ); Sun, 29 May 2022 06:55:18 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 59F5262CD0 for ; Sun, 29 May 2022 03:55:17 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 1627DB808BC for ; Sun, 29 May 2022 10:55:16 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 33D20C3411C for ; Sun, 29 May 2022 10:55:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1653821714; bh=Mx0P0qH3WA3hMpnVdncZtbzIDGfcYLD3Kvd2uajX5Fg=; h=From:To:Subject:Date:In-Reply-To:References:From; b=ZBwx4+UJwgEjEtCKf0ceWLtaPAuKbYLybQkCL0aQfBDgdFbrFGV6Go7Me2vLkF8xr liWsS+x9B+bcxjQESZsQqws6Fu00X21dYcmuxRlFtsQs712YOHHo261SIaY1ep8618 66NhA14fuCYXCw9gHl0fl9f0iIjy1MPAVGTfUbddIZqtCTB866IIhrsNHi82fPgBXs Lh5uLikT03XFN1IodMCSobiKTto1XazfujdN6r6ILSn5jhacAP48U0HUzNZHimbH8g /jxiqKdcX0I+4qlAbZhs0b00BWJ8J81nBgQPA+LeZPPNHgM9lVhsqrM46i1JcpNv71 fm84Z8VEbi6Sw== From: Zorro Lang To: fstests@vger.kernel.org Subject: [PATCH 5/5] generic/623: add overlay into the blacklist Date: Sun, 29 May 2022 18:55:05 +0800 Message-Id: <20220529105505.667891-6-zlang@kernel.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220529105505.667891-1-zlang@kernel.org> References: <20220529105505.667891-1-zlang@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org The _require_scratch_shutdown can't help this test case, except use _scratch_shutdown or _scratch_shutdown_handle with it. But this test case does 'shutdown' on $SCRATCH_MNT/file directly. It's not suitable for overlay. Signed-off-by: Zorro Lang --- tests/generic/623 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/generic/623 b/tests/generic/623 index ea016d91..1083e796 100755 --- a/tests/generic/623 +++ b/tests/generic/623 @@ -11,7 +11,7 @@ _begin_fstest auto quick shutdown . ./common/filter -_supported_fs generic +_supported_fs ^overlay _fixed_by_kernel_commit e4826691cc7e \ "xfs: restore shutdown check in mapped write fault path"