73 lines
2.7 KiB
Diff
73 lines
2.7 KiB
Diff
|
From b8d62021f28114f054571b96ec0cd4dad4476923 Mon Sep 17 00:00:00 2001
|
||
|
|
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
|
||
|
|
Date: Mon, 27 Jan 2020 19:02:14 +0100
|
||
|
|
Subject: [PATCH 103/116] virtiofsd: Reset O_DIRECT flag during file open
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
RH-Author: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
||
|
|
Message-id: <20200127190227.40942-100-dgilbert@redhat.com>
|
||
|
|
Patchwork-id: 93553
|
||
|
|
O-Subject: [RHEL-AV-8.2 qemu-kvm PATCH 099/112] virtiofsd: Reset O_DIRECT flag during file open
|
||
|
|
Bugzilla: 1694164
|
||
|
|
RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
||
|
|
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
||
|
|
RH-Acked-by: Sergio Lopez Pascual <slp@redhat.com>
|
||
|
|
|
||
|
|
From: Vivek Goyal <vgoyal@redhat.com>
|
||
|
|
|
||
|
|
If an application wants to do direct IO and opens a file with O_DIRECT
|
||
|
|
in guest, that does not necessarily mean that we need to bypass page
|
||
|
|
cache on host as well. So reset this flag on host.
|
||
|
|
|
||
|
|
If somebody needs to bypass page cache on host as well (and it is safe to
|
||
|
|
do so), we can add a knob in daemon later to control this behavior.
|
||
|
|
|
||
|
|
I check virtio-9p and they do reset O_DIRECT flag.
|
||
|
|
|
||
|
|
Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
|
||
|
|
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
|
||
|
|
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
||
|
|
(cherry picked from commit 65da4539803373ec4eec97ffc49ee90083e56efd)
|
||
|
|
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
||
|
|
---
|
||
|
|
tools/virtiofsd/passthrough_ll.c | 14 ++++++++++++++
|
||
|
|
1 file changed, 14 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough_ll.c
|
||
|
|
index ccbbec1..948cb19 100644
|
||
|
|
--- a/tools/virtiofsd/passthrough_ll.c
|
||
|
|
+++ b/tools/virtiofsd/passthrough_ll.c
|
||
|
|
@@ -1721,6 +1721,13 @@ static void lo_create(fuse_req_t req, fuse_ino_t parent, const char *name,
|
||
|
|
goto out;
|
||
|
|
}
|
||
|
|
|
||
|
|
+ /*
|
||
|
|
+ * O_DIRECT in guest should not necessarily mean bypassing page
|
||
|
|
+ * cache on host as well. If somebody needs that behavior, it
|
||
|
|
+ * probably should be a configuration knob in daemon.
|
||
|
|
+ */
|
||
|
|
+ fi->flags &= ~O_DIRECT;
|
||
|
|
+
|
||
|
|
fd = openat(parent_inode->fd, name, (fi->flags | O_CREAT) & ~O_NOFOLLOW,
|
||
|
|
mode);
|
||
|
|
err = fd == -1 ? errno : 0;
|
||
|
|
@@ -1950,6 +1957,13 @@ static void lo_open(fuse_req_t req, fuse_ino_t ino, struct fuse_file_info *fi)
|
||
|
|
fi->flags &= ~O_APPEND;
|
||
|
|
}
|
||
|
|
|
||
|
|
+ /*
|
||
|
|
+ * O_DIRECT in guest should not necessarily mean bypassing page
|
||
|
|
+ * cache on host as well. If somebody needs that behavior, it
|
||
|
|
+ * probably should be a configuration knob in daemon.
|
||
|
|
+ */
|
||
|
|
+ fi->flags &= ~O_DIRECT;
|
||
|
|
+
|
||
|
|
sprintf(buf, "%i", lo_fd(req, ino));
|
||
|
|
fd = openat(lo->proc_self_fd, buf, fi->flags & ~O_NOFOLLOW);
|
||
|
|
if (fd == -1) {
|
||
|
|
--
|
||
|
|
1.8.3.1
|
||
|
|
|