Skip to contentSkip to conversation

ltp/fsx: hornor keep_size_calls when replaying operations

PATCH In review Eryu Guan 2 participants 2 messages Oct 22, 2019 – Oct 23, 2019

lore
Share & tools
lore

Eryu Guan

author
#0 lore raw

PATCH 1/1 ltp/fsx: hornor keep_size_calls when replaying operations

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.

---
 ltp/fsx.c | 6 ++++++
 1 file changed, 6 insertions(+)
ltp/fsx.c +6 -0
index 06d08e4e93f3..ae89bf665db4 100644
@@ -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:
Signature · 1 line
2.14.4.44.g2045bb6
#1 lore raw
Quoted 24 lines · Eryu Guan

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")

Quoted 3 lines

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

Wouldn't you want fsx to fail if you fed it an ops file to replay that the current system/fs cannot accommodate? I suppose that's not a big deal if it requires an explicit parameter (-K) to change behavior, but it doesn't look like generic/469 uses that anyways.. hm?

Brian

Quoted 33 lines
---
 ltp/fsx.c | 6 ++++++
 1 file changed, 6 insertions(+)
ltp/fsx.c +6 -0
index 06d08e4e93f3..ae89bf665db4 100644
@@ -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:
Signature · 1 line
2.14.4.44.g2045bb6