From: Kevin Wolf <kwolf@redhat.com>
To: qemu-block@nongnu.org
Cc: kwolf@redhat.com, peter.maydell@linaro.org, qemu-devel@nongnu.org
Subject: [PULL 09/12] file-posix: Allow byte-aligned O_DIRECT with NFS
Date: Fri, 17 Jul 2020 14:55:07 +0200 [thread overview]
Message-ID: <20200717125510.238374-10-kwolf@redhat.com> (raw)
In-Reply-To: <20200717125510.238374-1-kwolf@redhat.com>
Since commit a6b257a08e3 ('file-posix: Handle undetectable alignment'),
we assume that if we open a file with O_DIRECT and alignment probing
returns 1, we just couldn't find out the real alignment requirement
because some filesystems make the requirement only for allocated blocks.
In this case, a safe default of 4k is used.
This is too strict for NFS, which does actually allow byte-aligned
requests even with O_DIRECT. Because we can't distinguish both cases
with generic code, let's just look at the file system magic and disable
s->needs_alignment for NFS. This way, O_DIRECT can still be used on NFS
for images that are not aligned to 4k.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20200716142601.111237-3-kwolf@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
block/file-posix.c | 26 +++++++++++++++++++++++++-
1 file changed, 25 insertions(+), 1 deletion(-)
diff --git a/block/file-posix.c b/block/file-posix.c
index 8067e238cb..ae8190edab 100644
--- a/block/file-posix.c
+++ b/block/file-posix.c
@@ -62,10 +62,12 @@
#include <sys/ioctl.h>
#include <sys/param.h>
#include <sys/syscall.h>
+#include <sys/vfs.h>
#include <linux/cdrom.h>
#include <linux/fd.h>
#include <linux/fs.h>
#include <linux/hdreg.h>
+#include <linux/magic.h>
#include <scsi/sg.h>
#ifdef __s390__
#include <asm/dasd.h>
@@ -300,6 +302,28 @@ static int probe_physical_blocksize(int fd, unsigned int *blk_size)
#endif
}
+/*
+ * Returns true if no alignment restrictions are necessary even for files
+ * opened with O_DIRECT.
+ *
+ * raw_probe_alignment() probes the required alignment and assume that 1 means
+ * the probing failed, so it falls back to a safe default of 4k. This can be
+ * avoided if we know that byte alignment is okay for the file.
+ */
+static bool dio_byte_aligned(int fd)
+{
+#ifdef __linux__
+ struct statfs buf;
+ int ret;
+
+ ret = fstatfs(fd, &buf);
+ if (ret == 0 && buf.f_type == NFS_SUPER_MAGIC) {
+ return true;
+ }
+#endif
+ return false;
+}
+
/* Check if read is allowed with given memory buffer and length.
*
* This function is used to check O_DIRECT memory buffer and request alignment.
@@ -629,7 +653,7 @@ static int raw_open_common(BlockDriverState *bs, QDict *options,
s->has_discard = true;
s->has_write_zeroes = true;
- if ((bs->open_flags & BDRV_O_NOCACHE) != 0) {
+ if ((bs->open_flags & BDRV_O_NOCACHE) != 0 && !dio_byte_aligned(s->fd)) {
s->needs_alignment = true;
}
--
2.25.4
next prev parent reply other threads:[~2020-07-17 13:04 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-17 12:54 [PULL 00/12] Block layer patches for 5.1.0-rc1 Kevin Wolf
2020-07-17 12:54 ` [PULL 01/12] vvfat: set status to odd fixes Kevin Wolf
2020-07-17 12:55 ` [PULL 02/12] Remove VXHS block device Kevin Wolf
2020-07-17 12:55 ` [PULL 03/12] qemu-img resize: Require --shrink for shrinking all image formats Kevin Wolf
2020-07-17 12:55 ` [PULL 04/12] crypto: use a stronger private key for tests Kevin Wolf
2020-07-17 12:55 ` [PULL 05/12] iotests/030: Reduce job speed to make race less likely Kevin Wolf
2020-08-03 12:40 ` Peter Maydell
2020-07-17 12:55 ` [PULL 06/12] nbd: make nbd_export_close_all() synchronous Kevin Wolf
2020-07-17 12:55 ` [PULL 07/12] iotests: test shutdown when bitmap is exported through NBD Kevin Wolf
2020-07-17 12:55 ` [PULL 08/12] block: Require aligned image size to avoid assertion failure Kevin Wolf
2020-07-17 12:55 ` Kevin Wolf [this message]
2020-07-17 12:55 ` [PULL 10/12] file-posix: Move check_hdev_writable() up Kevin Wolf
2020-07-17 12:55 ` [PULL 11/12] file-posix: Fix check_hdev_writable() with auto-read-only Kevin Wolf
2020-07-17 12:55 ` [PULL 12/12] file-posix: Fix leaked fd in raw_open_common() error path Kevin Wolf
2020-07-18 16:26 ` [PULL 00/12] Block layer patches for 5.1.0-rc1 Peter Maydell
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=20200717125510.238374-10-kwolf@redhat.com \
--to=kwolf@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
/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).