public inbox for fstests@vger.kernel.org
 help / color / mirror / Atom feed
From: Eryu Guan <eguan@linux.alibaba.com>
To: fstests@vger.kernel.org
Cc: Misono Tomohiro <misono.tomohiro@jp.fujitsu.com>,
	Eryu Guan <eguan@linux.alibaba.com>
Subject: [PATCH] ltp/fsx: hornor keep_size_calls when replaying operations
Date: Tue, 22 Oct 2019 20:31:15 +0800	[thread overview]
Message-ID: <20191022123115.12250-1-eguan@linux.alibaba.com> (raw)

When replaying fsx operations with "--replay-ops opsfile" option, the
ops described by opsfile may contain 'keep_size' directive for fallocate
and/or zero_range operations, but it's possible that the underlying
filesystem doesn't support KEEP_SIZE flag and causes fsx reports false
failure, despite the 'keep_size_calls' switch is set to false.

For example, running generic/469 on NFSv4, which supports fallocate(2)
but not the KEEP_SIZE flag, we see:

main: filesystem does not support fallocate mode FALLOC_FL_KEEP_SIZE, disabling!
main: filesystem does not support fallocate mode FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE, disabling!
main: filesystem does not support fallocate mode FALLOC_FL_ZERO_RANGE, disabling!
main: filesystem does not support fallocate mode FALLOC_FL_COLLAPSE_RANGE, disabling!
main: filesystem does not support fallocate mode FALLOC_FL_INSERT_RANGE, disabling!
main: filesystem does not support clone range, disabling!
main: filesystem does not support dedupe range, disabling!
fallocate: 0x0 to 0x1000
do_preallocate: fallocate: Operation not supported
LOG DUMP (1 total operations):
1(  1 mod 256): FALLOC   0x0 thru 0x1000        (0x1000 bytes) PAST_EOF
Log of operations saved to "/test1/469.fsx.fsxops"; replay with --replay-ops
Correct content saved for comparison
(maybe hexdump "/test1/469.fsx" vs "/test1/469.fsx.fsxgood")

Fix it by making sure 'keep_size_calls' is true when 'keep_size' is
set, otherwise just skip the operation.

Reviewed-by: Misono Tomohiro <misono.tomohiro@jp.fujitsu.com>
Signed-off-by: Eryu Guan <eguan@linux.alibaba.com>
---
 ltp/fsx.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ltp/fsx.c b/ltp/fsx.c
index 06d08e4e93f3..ae89bf665db4 100644
--- a/ltp/fsx.c
+++ b/ltp/fsx.c
@@ -2044,6 +2044,9 @@ have_op:
 		if (!fallocate_calls) {
 			log4(OP_FALLOCATE, offset, size, FL_SKIPPED);
 			goto out;
+		} else if (keep_size && !keep_size_calls) {
+			log4(OP_FALLOCATE, offset, size, FL_SKIPPED | FL_KEEP_SIZE);
+			goto out;
 		}
 		break;
 	case OP_PUNCH_HOLE:
@@ -2056,6 +2059,9 @@ have_op:
 		if (!zero_range_calls) {
 			log4(OP_ZERO_RANGE, offset, size, FL_SKIPPED);
 			goto out;
+		} else if (keep_size && !keep_size_calls) {
+			log4(OP_ZERO_RANGE, offset, size, FL_SKIPPED | FL_KEEP_SIZE);
+			goto out;
 		}
 		break;
 	case OP_COLLAPSE_RANGE:
-- 
2.14.4.44.g2045bb6


             reply	other threads:[~2019-10-22 12:31 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-22 12:31 Eryu Guan [this message]
2019-10-23 13:09 ` [PATCH] ltp/fsx: hornor keep_size_calls when replaying operations Brian Foster

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191022123115.12250-1-eguan@linux.alibaba.com \
    --to=eguan@linux.alibaba.com \
    --cc=fstests@vger.kernel.org \
    --cc=misono.tomohiro@jp.fujitsu.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox