fuse: add a new fuse init flag to relax restrictions in no cache mode
Subsystems (2)
PATCH v2 1/1 fuse: add a new fuse init flag to relax restrictions in no cache mode
From: Hao Xu <[email protected]>
FOPEN_DIRECT_IO is usually set by fuse daemon to indicate need of strong coherency, e.g. network filesystems. Thus shared mmap is disabled since it leverages page cache and may write to it, which may cause inconsistence. But FOPEN_DIRECT_IO can be used not for coherency but to reduce memory footprint as well, e.g. reduce guest memory usage with virtiofs. Therefore, add a new fuse init flag FUSE_DIRECT_IO_RELAX to relax restrictions in that mode, currently, it allows shared mmap. One thing to note is to make sure it doesn't break coherency in your use case.
---
v1 -> v2:
make the new flag a fuse init one rather than a open flag since it's not common that different files in a filesystem has different strategy of shared mmap.
fs/fuse/file.c | 8 ++++++-- fs/fuse/fuse_i.h | 3 +++ fs/fuse/inode.c | 5 ++++- include/uapi/linux/fuse.h | 1 + 4 files changed, 14 insertions(+), 3 deletions(-)
fs/fuse/file.c +6 -2
@@ -2478,14 +2478,18 @@ static const struct vm_operations_struct fuse_file_vm_ops = {static int fuse_file_mmap (struct file *file,struct vm_area_struct *vma) {struct fuse_file *ff = file->private_data; +struct fuse_conn *fc = ff->fm->fc;/* DAX mmap is superior to direct_io mmap */ if (FUSE_IS_DAX (file_inode (file)))return fuse_dax_mmap (file, vma);if (ff->open_flags &FOPEN_DIRECT_IO ) { -/* Can't provide the coherency needed for MAP_SHARED */ -if (vma->vm_flags &VM_MAYSHARE ) +/* Can't provide the coherency needed for MAP_SHARED +* if FUSE_DIRECT_IO_RELAX isn't set. +*/ +if (!(ff->open_flags & fc->direct_io_relax) && + vma->vm_flags &VM_MAYSHARE )return -ENODEV ;invalidate_inode_pages2 (file->f_mapping);
fs/fuse/fuse_i.h +3 -0
@@ -792,6 +792,9 @@ struct fuse_conn {/* Is tmpfile not implemented by fs? */ unsigned int no_tmpfile:1; +/* relax restrictions in FOPEN_DIRECT_IO mode */ + unsigned int direct_io_relax:1; +/** The number of requests waiting for completion */ atomic_t num_waiting;
fs/fuse/inode.c +4 -1
@@ -1209,6 +1209,9 @@ static void process_init_reply(struct fuse_mount *fm, struct fuse_args *args, fc->init_security =1 ;if (flags &FUSE_CREATE_SUPP_GROUP ) fc->create_supp_group =1 ; + +if (flags &FUSE_DIRECT_IO_RELAX ) + fc->direct_io_relax =1 ; }else { ra_pages = fc->max_read /PAGE_SIZE ; fc->no_lock =1 ;
@@ -1254,7 +1257,7 @@ void fuse_send_init(struct fuse_mount *fm)FUSE_ABORT_ERROR |FUSE_MAX_PAGES |FUSE_CACHE_SYMLINKS |FUSE_NO_OPENDIR_SUPPORT |FUSE_EXPLICIT_INVAL_DATA |FUSE_HANDLE_KILLPRIV_V2 |FUSE_SETXATTR_EXT |FUSE_INIT_EXT | -FUSE_SECURITY_CTX |FUSE_CREATE_SUPP_GROUP ; +FUSE_SECURITY_CTX |FUSE_CREATE_SUPP_GROUP |FUSE_DIRECT_IO_RELAX ;#ifdef CONFIG_FUSE_DAX if (fm->fc->dax) flags |=FUSE_MAP_ALIGNMENT ;
include/uapi/linux/fuse.h +1 -0
@@ -406,6 +406,7 @@ struct fuse_file_lock {#define FUSE_SECURITY_CTX (1ULL << 32)#define FUSE_HAS_INODE_DAX (1ULL << 33)#define FUSE_CREATE_SUPP_GROUP (1ULL << 34) +#define FUSE_DIRECT_IO_RELAX (1ULL << 35)/** * CUSE INIT request/reply flags
Signature · 1 line
2.25.1
Quoted 39 lines · Hao Xu
From: Hao Xu <[email protected]>
FOPEN_DIRECT_IOis usually set by fuse daemon to indicate need of strong coherency, e.g. network filesystems. Thus shared mmap is disabled since it leverages page cache and may write to it, which may cause inconsistence. ButFOPEN_DIRECT_IOcan be used not for coherency but to reduce memory footprint as well, e.g. reduce guest memory usage with virtiofs. Therefore, add a new fuse init flagFUSE_DIRECT_IO_RELAXto relax restrictions in that mode, currently, it allows shared mmap. One thing to note is to make sure it doesn't break coherency in your use case.Signed-off-by Hao Xu <[email protected]>---
v1 -> v2:
make the new flag a fuse init one rather than a open flag since it's not common that different files in a filesystem has different strategy of shared mmap.fs/fuse/file.c | 8 ++++++-- fs/fuse/fuse_i.h | 3 +++ fs/fuse/inode.c | 5 ++++- include/uapi/linux/fuse.h | 1 + 4 files changed, 14 insertions(+), 3 deletions(-)fs/fuse/file.c +1
-0@@ -2478,14 +2478,18 @@ static const struct vm_operations_struct fuse_file_vm_ops = {static int fuse_file_mmap (struct file *file,struct vm_area_struct *vma) {struct fuse_file *ff = file->private_data; +struct fuse_conn *fc = ff->fm->fc;/* DAX mmap is superior to direct_io mmap */ if (FUSE_IS_DAX (file_inode (file)))return fuse_dax_mmap (file, vma);
fs/fuse/file.c static const struct vm_operations_struct fuse_file_vm_ops = { · line 2493
Quoted 10 lines
fs/fuse/file.c +5
-2if (ff->open_flags &FOPEN_DIRECT_IO ) { -/* Can't provide the coherency needed for MAP_SHARED */ -if (vma->vm_flags &VM_MAYSHARE ) +/* Can't provide the coherency needed for MAP_SHARED +* if FUSE_DIRECT_IO_RELAX isn't set. +*/ +if (!(ff->open_flags & fc->direct_io_relax) && + vma->vm_flags &VM_MAYSHARE )return -ENODEV ;
I'm confused here, the idea was that open_flags do not need additional flags? Why is this not just
if (ff->open_flags & FOPEN_DIRECT_IO) {
/* Can't provide the coherency needed for MAP_SHARED */
if (vma->vm_flags & VM_MAYSHARE && !fc->direct_io_relax)
return -ENODEV;Quoted 44 lines
fs/fuse/file.c +0
-0invalidate_inode_pages2 (file->f_mapping);fs/fuse/fuse_i.h +3
-0@@ -792,6 +792,9 @@ struct fuse_conn {/* Is tmpfile not implemented by fs? */ unsigned int no_tmpfile:1; +/* relax restrictions in FOPEN_DIRECT_IO mode */ + unsigned int direct_io_relax:1; +/** The number of requests waiting for completion */ atomic_t num_waiting;fs/fuse/inode.c +4
-1@@ -1209,6 +1209,9 @@ static void process_init_reply(struct fuse_mount *fm, struct fuse_args *args, fc->init_security =1 ;if (flags &FUSE_CREATE_SUPP_GROUP ) fc->create_supp_group =1 ; + +if (flags &FUSE_DIRECT_IO_RELAX ) + fc->direct_io_relax =1 ; }else { ra_pages = fc->max_read /PAGE_SIZE ; fc->no_lock =1 ;@@ -1254,7 +1257,7 @@ void fuse_send_init(struct fuse_mount *fm)FUSE_ABORT_ERROR |FUSE_MAX_PAGES |FUSE_CACHE_SYMLINKS |FUSE_NO_OPENDIR_SUPPORT |FUSE_EXPLICIT_INVAL_DATA |FUSE_HANDLE_KILLPRIV_V2 |FUSE_SETXATTR_EXT |FUSE_INIT_EXT | -FUSE_SECURITY_CTX |FUSE_CREATE_SUPP_GROUP ; +FUSE_SECURITY_CTX |FUSE_CREATE_SUPP_GROUP |FUSE_DIRECT_IO_RELAX ;#ifdef CONFIG_FUSE_DAX if (fm->fc->dax) flags |=FUSE_MAP_ALIGNMENT ;include/uapi/linux/fuse.h +0
-0
include/uapi/linux/fuse.h struct fuse_file_lock { · line 412
Quoted 7 lines
include/uapi/linux/fuse.h +1
-0@@ -406,6 +406,7 @@ struct fuse_file_lock {#define FUSE_SECURITY_CTX (1ULL << 32)#define FUSE_HAS_INODE_DAX (1ULL << 33)#define FUSE_CREATE_SUPP_GROUP (1ULL << 34) +#define FUSE_DIRECT_IO_RELAX (1ULL << 35)/** * CUSE INIT request/reply flags
Thanks,
Bernd
Hi Bernd,
Quoted 45 lines · Bernd Schubert
Quoted 42 lines · Hao Xu
From: Hao Xu <[email protected]>
FOPEN_DIRECT_IOis usually set by fuse daemon to indicate need of strong coherency, e.g. network filesystems. Thus shared mmap is disabled since it leverages page cache and may write to it, which may cause inconsistence. ButFOPEN_DIRECT_IOcan be used not for coherency but to reduce memory footprint as well, e.g. reduce guest memory usage with virtiofs. Therefore, add a new fuse init flagFUSE_DIRECT_IO_RELAXto relax restrictions in that mode, currently, it allows shared mmap. One thing to note is to make sure it doesn't break coherency in your use case.Signed-off-by Hao Xu <[email protected]>---
v1 -> v2:
make the new flag a fuse init one rather than a open flag since it's not common that different files in a filesystem has different strategy of shared mmap.fs/fuse/file.c | 8 ++++++--
fs/fuse/fuse_i.h | 3 +++
fs/fuse/inode.c | 5 ++++-
include/uapi/linux/fuse.h| 1 +4 files changed, 14 insertions(+), 3 deletions(-)fs/fuse/file.c +1
-2@@ -2478,14 +2478,18 @@ static const struct vm_operations_struct fuse_file_vm_ops = { static int fuse_file_mmap(struct file *file, struct vm_area_struct *vma) { struct fuse_file *ff = file->private_data; + struct fuse_conn *fc = ff->fm->fc; /* DAX mmap is superior to direct_io mmap */ if (FUSE_IS_DAX(file_inode(file))) return fuse_dax_mmap(file, vma); if (ff->open_flags & FOPEN_DIRECT_IO) { - /* Can't provide the coherency needed for MAP_SHARED */ - if (vma->vm_flags & VM_MAYSHARE)
Quoted 9 lines
fs/fuse/file.c static const struct vm_operations_struct fuse_file_vm_ops = { · line 2493
Quoted 6 lines
fs/fuse/file.c +5
-0+ /* Can't provide the coherency needed for MAP_SHARED + * if FUSE_DIRECT_IO_RELAX isn't set. + */ + if (!(ff->open_flags & fc->direct_io_relax) && + vma->vm_flags & VM_MAYSHARE) return -ENODEV;I'm confused here, the idea was that
open_flagsdo not need additional flags? Why is this not just
sorry for this, seems I sent a WIP version by accident.., I'll fix it soon.
Thanks,
Hao