From: Namjae Jeon <linkinjeon@gmail.com>
To: david@fromorbit.com, tytso@mit.edu
Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-ext4@vger.kernel.org, xfs@oss.sgi.com,
a.sangwan@samsung.com, bfoster@redhat.com,
mtk.manpages@gmail.com, linux-man@vger.kernel.org,
linux-api@vger.kernel.org, Namjae Jeon <linkinjeon@gmail.com>,
Namjae Jeon <namjae.jeon@samsung.com>
Subject: [PATCH v10 11/12] xfstests: fsx: Add fallocate insert range operation
Date: Sun, 22 Feb 2015 00:45:53 +0900 [thread overview]
Message-ID: <1424533554-28024-12-git-send-email-linkinjeon@gmail.com> (raw)
In-Reply-To: <1424533554-28024-1-git-send-email-linkinjeon@gmail.com>
From: Namjae Jeon <namjae.jeon@samsung.com>
This commit adds fallocate FALLOC_FL_INSERT_RANGE support for fsx.
Signed-off-by: Namjae Jeon <namjae.jeon@samsung.com>
Signed-off-by: Ashish Sangwan <a.sangwan@samsung.com>
Reviewed-by: Brian Foster <bfoster@redhat.com>
---
ltp/fsx.c | 124 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 file changed, 114 insertions(+), 10 deletions(-)
diff --git a/ltp/fsx.c b/ltp/fsx.c
index 0bb8ae8..6da51e9 100644
--- a/ltp/fsx.c
+++ b/ltp/fsx.c
@@ -95,7 +95,8 @@ int logcount = 0; /* total ops */
#define OP_PUNCH_HOLE 6
#define OP_ZERO_RANGE 7
#define OP_COLLAPSE_RANGE 8
-#define OP_MAX_FULL 9
+#define OP_INSERT_RANGE 9
+#define OP_MAX_FULL 10
/* operation modifiers */
#define OP_CLOSEOPEN 100
@@ -146,6 +147,7 @@ int keep_size_calls = 1; /* -K flag disables */
int punch_hole_calls = 1; /* -H flag disables */
int zero_range_calls = 1; /* -z flag disables */
int collapse_range_calls = 1; /* -C flag disables */
+int insert_range_calls = 1; /* -I flag disables */
int mapped_reads = 1; /* -R flag disables it */
int fsxgoodfd = 0;
int o_direct; /* -Z */
@@ -340,6 +342,14 @@ logdump(void)
lp->args[0] + lp->args[1])
prt("\t******CCCC");
break;
+ case OP_INSERT_RANGE:
+ prt("INSERT 0x%x thru 0x%x\t(0x%x bytes)",
+ lp->args[0], lp->args[0] + lp->args[1] - 1,
+ lp->args[1]);
+ if (badoff >= lp->args[0] && badoff <
+ lp->args[0] + lp->args[1])
+ prt("\t******IIII");
+ break;
case OP_SKIPPED:
prt("SKIPPED (no operation)");
break;
@@ -1014,6 +1024,59 @@ do_collapse_range(unsigned offset, unsigned length)
}
#endif
+#ifdef FALLOC_FL_INSERT_RANGE
+void
+do_insert_range(unsigned offset, unsigned length)
+{
+ unsigned end_offset;
+ int mode = FALLOC_FL_INSERT_RANGE;
+
+ if (length == 0) {
+ if (!quiet && testcalls > simulatedopcount)
+ prt("skipping zero length insert range\n");
+ log4(OP_SKIPPED, OP_INSERT_RANGE, offset, length);
+ return;
+ }
+
+ if ((loff_t)offset >= file_size) {
+ if (!quiet && testcalls > simulatedopcount)
+ prt("skipping insert range behind EOF\n");
+ log4(OP_SKIPPED, OP_INSERT_RANGE, offset, length);
+ return;
+ }
+
+ log4(OP_INSERT_RANGE, offset, length, 0);
+
+ if (testcalls <= simulatedopcount)
+ return;
+
+ end_offset = offset + length;
+ if ((progressinterval && testcalls % progressinterval == 0) ||
+ (debug && (monitorstart == -1 || monitorend == -1 ||
+ end_offset <= monitorend))) {
+ prt("%lu insert\tfrom 0x%x to 0x%x, (0x%x bytes)\n", testcalls,
+ offset, offset+length, length);
+ }
+ if (fallocate(fd, mode, (loff_t)offset, (loff_t)length) == -1) {
+ prt("insert range: %x to %x\n", offset, length);
+ prterr("do_insert_range: fallocate");
+ report_failure(161);
+ }
+
+ memmove(good_buf + end_offset, good_buf + offset,
+ file_size - offset);
+ memset(good_buf + offset, '\0', length);
+ file_size += length;
+}
+
+#else
+void
+do_insert_range(unsigned offset, unsigned length)
+{
+ return;
+}
+#endif
+
#ifdef HAVE_LINUX_FALLOC_H
/* fallocate is basically a no-op unless extending, then a lot like a truncate */
void
@@ -1120,14 +1183,25 @@ docloseopen(void)
}
}
-#define TRIM_OFF_LEN(off, len, size) \
-do { \
- if (size) \
- (off) %= (size); \
- else \
- (off) = 0; \
- if ((off) + (len) > (size)) \
- (len) = (size) - (off); \
+
+#define TRIM_OFF(off, size) \
+do { \
+ if (size) \
+ (off) %= (size); \
+ else \
+ (off) = 0; \
+} while (0)
+
+#define TRIM_LEN(off, len, size) \
+do { \
+ if ((off) + (len) > (size)) \
+ (len) = (size) - (off); \
+} while (0)
+
+#define TRIM_OFF_LEN(off, len, size) \
+do { \
+ TRIM_OFF(off, size); \
+ TRIM_LEN(off, len, size); \
} while (0)
void
@@ -1195,6 +1269,12 @@ test(void)
goto out;
}
break;
+ case OP_INSERT_RANGE:
+ if (!insert_range_calls) {
+ log4(OP_SKIPPED, OP_INSERT_RANGE, offset, size);
+ goto out;
+ }
+ break;
}
switch (op) {
@@ -1247,6 +1327,22 @@ test(void)
}
do_collapse_range(offset, size);
break;
+ case OP_INSERT_RANGE:
+ TRIM_OFF(offset, file_size);
+ TRIM_LEN(file_size, size, maxfilelen);
+ offset = offset & ~(block_size - 1);
+ size = size & ~(block_size - 1);
+ if (size == 0) {
+ log4(OP_SKIPPED, OP_INSERT_RANGE, offset, size);
+ goto out;
+ }
+ if (file_size + size > maxfilelen) {
+ log4(OP_SKIPPED, OP_INSERT_RANGE, offset, size);
+ goto out;
+ }
+
+ do_insert_range(offset, size);
+ break;
default:
prterr("test: unknown operation");
report_failure(42);
@@ -1310,6 +1406,9 @@ usage(void)
#ifdef FALLOC_FL_COLLAPSE_RANGE
" -C: Do not use collapse range calls\n"
#endif
+#ifdef FALLOC_FL_INSERT_RANGE
+" -I: Do not use insert range calls\n"
+#endif
" -L: fsxLite - no file creations & no file size changes\n\
-N numops: total # operations to do (default infinity)\n\
-O: use oplen (see -o flag) for every op (default random)\n\
@@ -1496,7 +1595,7 @@ main(int argc, char **argv)
setvbuf(stdout, (char *)0, _IOLBF, 0); /* line buffered stdout */
- while ((ch = getopt(argc, argv, "b:c:dfl:m:no:p:qr:s:t:w:xyAD:FKHzCLN:OP:RS:WZ"))
+ while ((ch = getopt(argc, argv, "b:c:dfl:m:no:p:qr:s:t:w:xyAD:FKHzCILN:OP:RS:WZ"))
!= EOF)
switch (ch) {
case 'b':
@@ -1605,6 +1704,9 @@ main(int argc, char **argv)
case 'C':
collapse_range_calls = 0;
break;
+ case 'I':
+ insert_range_calls = 0;
+ break;
case 'L':
lite = 1;
break;
@@ -1766,6 +1868,8 @@ main(int argc, char **argv)
zero_range_calls = test_fallocate(FALLOC_FL_ZERO_RANGE);
if (collapse_range_calls)
collapse_range_calls = test_fallocate(FALLOC_FL_COLLAPSE_RANGE);
+ if (insert_range_calls)
+ insert_range_calls = test_fallocate(FALLOC_FL_INSERT_RANGE);
while (numops == -1 || numops--)
test();
--
1.7.9.5
next prev parent reply other threads:[~2015-02-21 15:45 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-21 15:45 [PATCH v10 0/12] fs: Introduce FALLOC_FL_INSERT_RANGE for fallocate Namjae Jeon
[not found] ` <1424533554-28024-1-git-send-email-linkinjeon-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2015-02-21 15:45 ` [PATCH v10 1/12] fs: Add support " Namjae Jeon
[not found] ` <1424533554-28024-2-git-send-email-linkinjeon-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2015-03-25 6:05 ` Dave Chinner
2015-02-21 15:45 ` [PATCH v10 2/12] xfs: " Namjae Jeon
2015-02-21 15:45 ` [PATCH v10 6/12] xfstests: generic/060: Delayed allocation insert range Namjae Jeon
2015-02-21 15:45 ` [PATCH v10 3/12] ext4: Add support FALLOC_FL_INSERT_RANGE for fallocate Namjae Jeon
2015-02-21 15:45 ` [PATCH v10 4/12] xfsprog: xfsio: update xfs_io manpage for FALLOC_FL_INSERT_RANGE Namjae Jeon
2015-02-21 15:45 ` [PATCH v10 5/12] xfstests: generic/058: Standard insert range tests Namjae Jeon
2015-02-21 15:45 ` [PATCH v10 7/12] xfstests: generic/061: Multi " Namjae Jeon
2015-02-21 15:45 ` [PATCH v10 8/12] xfstests: generic/063: Delayed allocation multi insert Namjae Jeon
2015-02-21 15:45 ` [PATCH v10 9/12] xfstests: generic/064: Test multiple fallocate insert/collapse range calls Namjae Jeon
2015-02-21 15:45 ` [PATCH v10 10/12] xfstests: fsstress: Add fallocate insert range operation Namjae Jeon
[not found] ` <1424533554-28024-11-git-send-email-linkinjeon-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2015-02-25 3:04 ` Dave Chinner
2015-02-25 4:15 ` Namjae Jeon
2015-02-21 15:45 ` Namjae Jeon [this message]
2015-02-21 15:45 ` [PATCH v10 12/12] manpage: update FALLOC_FL_INSERT_RANGE flag in fallocate Namjae Jeon
[not found] ` <1424533554-28024-13-git-send-email-linkinjeon-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2015-05-06 12:43 ` Michael Kerrisk (man-pages)
2015-05-07 0:12 ` Namjae Jeon
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=1424533554-28024-12-git-send-email-linkinjeon@gmail.com \
--to=linkinjeon@gmail.com \
--cc=a.sangwan@samsung.com \
--cc=bfoster@redhat.com \
--cc=david@fromorbit.com \
--cc=linux-api@vger.kernel.org \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-man@vger.kernel.org \
--cc=mtk.manpages@gmail.com \
--cc=namjae.jeon@samsung.com \
--cc=tytso@mit.edu \
--cc=xfs@oss.sgi.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;
as well as URLs for NNTP newsgroup(s).