diff options
author | Kirill Smelkov <kirr@nexedi.com> | 2019-04-24 03:13:57 -0400 |
---|---|---|
committer | Miklos Szeredi <mszeredi@redhat.com> | 2019-04-24 11:05:07 -0400 |
commit | bbd84f33652f852ce5992d65db4d020aba21f882 (patch) | |
tree | 9c6b132eaa33b3311acf6a69e86dc7bd8e602b09 | |
parent | d4b13963f217dd947da5c0cabd1569e914d21699 (diff) |
fuse: Add FOPEN_STREAM to use stream_open()
Starting from commit 9c225f2655e3 ("vfs: atomic f_pos accesses as per
POSIX") files opened even via nonseekable_open gate read and write via lock
and do not allow them to be run simultaneously. This can create read vs
write deadlock if a filesystem is trying to implement a socket-like file
which is intended to be simultaneously used for both read and write from
filesystem client. See commit 10dce8af3422 ("fs: stream_open - opener for
stream-like files so that read and write can run simultaneously without
deadlock") for details and e.g. commit 581d21a2d02a ("xenbus: fix deadlock
on writes to /proc/xen/xenbus") for a similar deadlock example on
/proc/xen/xenbus.
To avoid such deadlock it was tempting to adjust fuse_finish_open to use
stream_open instead of nonseekable_open on just FOPEN_NONSEEKABLE flags,
but grepping through Debian codesearch shows users of FOPEN_NONSEEKABLE,
and in particular GVFS which actually uses offset in its read and write
handlers
https://codesearch.debian.net/search?q=-%3Enonseekable+%3D
https://gitlab.gnome.org/GNOME/gvfs/blob/1.40.0-6-gcbc54396/client/gvfsfusedaemon.c#L1080
https://gitlab.gnome.org/GNOME/gvfs/blob/1.40.0-6-gcbc54396/client/gvfsfusedaemon.c#L1247-1346
https://gitlab.gnome.org/GNOME/gvfs/blob/1.40.0-6-gcbc54396/client/gvfsfusedaemon.c#L1399-1481
so if we would do such a change it will break a real user.
Add another flag (FOPEN_STREAM) for filesystem servers to indicate that the
opened handler is having stream-like semantics; does not use file position
and thus the kernel is free to issue simultaneous read and write request on
opened file handle.
This patch together with stream_open() should be added to stable kernels
starting from v3.14+. This will allow to patch OSSPD and other FUSE
filesystems that provide stream-like files to return FOPEN_STREAM |
FOPEN_NONSEEKABLE in open handler and this way avoid the deadlock on all
kernel versions. This should work because fuse_finish_open ignores unknown
open flags returned from a filesystem and so passing FOPEN_STREAM to a
kernel that is not aware of this flag cannot hurt. In turn the kernel that
is not aware of FOPEN_STREAM will be < v3.14 where just FOPEN_NONSEEKABLE
is sufficient to implement streams without read vs write deadlock.
Cc: stable@vger.kernel.org # v3.14+
Signed-off-by: Kirill Smelkov <kirr@nexedi.com>
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
-rw-r--r-- | fs/fuse/file.c | 4 | ||||
-rw-r--r-- | include/uapi/linux/fuse.h | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/fs/fuse/file.c b/fs/fuse/file.c index f811af4f6507..92ee15dda4c7 100644 --- a/fs/fuse/file.c +++ b/fs/fuse/file.c | |||
@@ -178,7 +178,9 @@ void fuse_finish_open(struct inode *inode, struct file *file) | |||
178 | 178 | ||
179 | if (!(ff->open_flags & FOPEN_KEEP_CACHE)) | 179 | if (!(ff->open_flags & FOPEN_KEEP_CACHE)) |
180 | invalidate_inode_pages2(inode->i_mapping); | 180 | invalidate_inode_pages2(inode->i_mapping); |
181 | if (ff->open_flags & FOPEN_NONSEEKABLE) | 181 | if (ff->open_flags & FOPEN_STREAM) |
182 | stream_open(inode, file); | ||
183 | else if (ff->open_flags & FOPEN_NONSEEKABLE) | ||
182 | nonseekable_open(inode, file); | 184 | nonseekable_open(inode, file); |
183 | if (fc->atomic_o_trunc && (file->f_flags & O_TRUNC)) { | 185 | if (fc->atomic_o_trunc && (file->f_flags & O_TRUNC)) { |
184 | struct fuse_inode *fi = get_fuse_inode(inode); | 186 | struct fuse_inode *fi = get_fuse_inode(inode); |
diff --git a/include/uapi/linux/fuse.h b/include/uapi/linux/fuse.h index 36899cfcb654..17afe2dd8d1c 100644 --- a/include/uapi/linux/fuse.h +++ b/include/uapi/linux/fuse.h | |||
@@ -232,11 +232,13 @@ struct fuse_file_lock { | |||
232 | * FOPEN_KEEP_CACHE: don't invalidate the data cache on open | 232 | * FOPEN_KEEP_CACHE: don't invalidate the data cache on open |
233 | * FOPEN_NONSEEKABLE: the file is not seekable | 233 | * FOPEN_NONSEEKABLE: the file is not seekable |
234 | * FOPEN_CACHE_DIR: allow caching this directory | 234 | * FOPEN_CACHE_DIR: allow caching this directory |
235 | * FOPEN_STREAM: the file is stream-like (no file position at all) | ||
235 | */ | 236 | */ |
236 | #define FOPEN_DIRECT_IO (1 << 0) | 237 | #define FOPEN_DIRECT_IO (1 << 0) |
237 | #define FOPEN_KEEP_CACHE (1 << 1) | 238 | #define FOPEN_KEEP_CACHE (1 << 1) |
238 | #define FOPEN_NONSEEKABLE (1 << 2) | 239 | #define FOPEN_NONSEEKABLE (1 << 2) |
239 | #define FOPEN_CACHE_DIR (1 << 3) | 240 | #define FOPEN_CACHE_DIR (1 << 3) |
241 | #define FOPEN_STREAM (1 << 4) | ||
240 | 242 | ||
241 | /** | 243 | /** |
242 | * INIT request/reply flags | 244 | * INIT request/reply flags |