From: Eric Sandeen <sandeen@sandeen.net>
To: xfs-oss <xfs@oss.sgi.com>
Subject: [PATCH V2] xfstests: get fsstress DIO working on non-xfs filesystems
Date: Wed, 09 Oct 2013 21:56:28 -0500 [thread overview]
Message-ID: <5256175C.6020000@sandeen.net> (raw)
In-Reply-To: <4B54C8AB.6080607@sandeen.net>
Pretty sure all DIO IO fails in fsstress today since XFS_IOC_DIOINFO
fails. If so, rather than just bailing out on the op, assign
some sane default DIO parameters, getting min IO size from
sector size if possible.
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
---
V2: factor out get_alignment, use BLKSSZGET for min DIO size
rather than guessing at 512.
diff --git a/ltp/fsstress.c b/ltp/fsstress.c
index 5d5611f..af06059 100644
--- a/ltp/fsstress.c
+++ b/ltp/fsstress.c
@@ -550,6 +550,27 @@ int main(int argc, char **argv)
return 0;
}
+/*
+ * Get alignment via XFS_IOC_DIOINFO, else fall back to
+ * best guess from BLKSSZGET, else return -1.
+ */
+static int
+get_alignment(pathname_t *f, int fd, struct dioattr *dio)
+{
+ if (xfsctl(f->path, fd, XFS_IOC_DIOINFO, dio) < 0) {
+ int sectorsize;
+
+ if (ioctl(fd, BLKSSZGET, §orsize) < 0)
+ return -1;
+
+ dio->d_maxiosz = -1U;
+ dio->d_miniosz = sectorsize;
+ dio->d_mem = sectorsize;
+ }
+
+ return 0;
+}
+
void
add_to_flist(int ft, int id, int parent)
{
@@ -1965,10 +1986,10 @@ dread_f(int opno, long r)
close(fd);
return;
}
- if (xfsctl(f.path, fd, XFS_IOC_DIOINFO, &diob) < 0) {
+ if (get_alignment(&f, fd, &diob) < 0) {
if (v)
printf(
- "%d/%d: dread - xfsctl(XFS_IOC_DIOINFO) %s%s failed %d\n",
+ "%d/%d: dread - get_alignment %s%s failed %d\n",
procid, opno, f.path, st, errno);
free_pathname(&f);
close(fd);
@@ -2037,9 +2058,9 @@ dwrite_f(int opno, long r)
return;
}
inode_info(st, sizeof(st), &stb, v);
- if (xfsctl(f.path, fd, XFS_IOC_DIOINFO, &diob) < 0) {
+ if (get_alignment(&f, fd, &diob) < 0) {
if (v)
- printf("%d/%d: dwrite - xfsctl(XFS_IOC_DIOINFO)"
+ printf("%d/%d: dwrite - get_alignment"
" %s%s failed %d\n",
procid, opno, f.path, st, errno);
free_pathname(&f);
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
next prev parent reply other threads:[~2013-10-10 2:56 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-18 20:46 [PATCH] xfsteststs: get fsstress DIO working on non-xfs filesystems Eric Sandeen
2010-01-19 1:08 ` Dave Chinner
2010-01-19 9:13 ` Christoph Hellwig
2013-10-10 2:56 ` Eric Sandeen [this message]
2013-10-10 3:20 ` [PATCH V2] xfstests: " Dave Chinner
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=5256175C.6020000@sandeen.net \
--to=sandeen@sandeen.net \
--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