From: Amir Goldstein This is a more strict variant of FUSE_PASSTHROUGH mode, in which the backing file inode number must match the fuse inode number. This mode will allow the kernel to instantiate fuse inodes by passthrough lookup and passthrough readdirplus and notify about those inodes to the server, using the backing file inode number as a unique identifier for fuse inodes across kernel and server. This mode limits the possibility to map multiple fuse inodes to the same backing file, unless they are all hardlinks. This mode is only supported on 64bit arch, where ino_t is u64. Reviewed-by: Joanne Koong Signed-off-by: Amir Goldstein --- fs/fuse/file.c | 3 +-- fs/fuse/fuse_i.h | 6 ++++-- fs/fuse/inode.c | 8 +++++++- fs/fuse/iomode.c | 13 ++++++++++--- include/uapi/linux/fuse.h | 6 +++++- 5 files changed, 27 insertions(+), 9 deletions(-) diff --git a/fs/fuse/file.c b/fs/fuse/file.c index 7a35ac3e0023..06dc8cfe3c7b 100644 --- a/fs/fuse/file.c +++ b/fs/fuse/file.c @@ -1429,7 +1429,6 @@ static void fuse_dio_lock(struct kiocb *iocb, struct iov_iter *from, bool *exclusive) { struct inode *inode = file_inode(iocb->ki_filp); - struct fuse_inode *fi = get_fuse_inode(inode); *exclusive = fuse_dio_wr_exclusive_lock(iocb, from); if (*exclusive) { @@ -1444,7 +1443,7 @@ static void fuse_dio_lock(struct kiocb *iocb, struct iov_iter *from, * have raced, so check it again. */ if (fuse_io_past_eof(iocb, from) || - fuse_inode_uncached_io_start(fi, NULL) != 0) { + fuse_inode_uncached_io_start(inode, NULL) != 0) { inode_unlock_shared(inode); inode_lock(inode); *exclusive = true; diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h index 3a7ac74a23ed..0b925ac3e195 100644 --- a/fs/fuse/fuse_i.h +++ b/fs/fuse/fuse_i.h @@ -698,6 +698,9 @@ struct fuse_conn { /** @passthrough: Passthrough support for read/write IO */ unsigned int passthrough:1; + /** @passthrough_ino: One-to-one mapping between fuse ino to backing ino */ + unsigned int passthrough_ino:1; + /** @use_pages_for_kvec_io: Use pages instead of pointer for kernel I/O */ unsigned int use_pages_for_kvec_io:1; @@ -1237,8 +1240,7 @@ int fuse_fileattr_set(struct mnt_idmap *idmap, /* iomode.c */ int fuse_file_cached_io_open(struct inode *inode, struct fuse_file *ff); -int fuse_inode_uncached_io_start(struct fuse_inode *fi, - struct fuse_backing *fb); +int fuse_inode_uncached_io_start(struct inode *inode, struct fuse_backing *fb); void fuse_inode_uncached_io_end(struct fuse_inode *fi); int fuse_file_io_open(struct file *file, struct inode *inode); diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c index 33009227e91d..b2a5892a4dc3 100644 --- a/fs/fuse/inode.c +++ b/fs/fuse/inode.c @@ -1397,6 +1397,8 @@ static void process_init_reply(struct fuse_args *args, int error) fc->passthrough = 1; fc->max_stack_depth = arg->max_stack_depth; fm->sb->s_stack_depth = arg->max_stack_depth; + if (flags & FUSE_PASSTHROUGH_INO) + fc->passthrough_ino = 1; } if (flags & FUSE_NO_EXPORT_SUPPORT) fm->sb->s_export_op = &fuse_export_fid_operations; @@ -1476,8 +1478,12 @@ static struct fuse_init_args *fuse_new_init(struct fuse_mount *fm) #endif if (fm->fc->auto_submounts) flags |= FUSE_SUBMOUNTS; - if (IS_ENABLED(CONFIG_FUSE_PASSTHROUGH)) + if (IS_ENABLED(CONFIG_FUSE_PASSTHROUGH)) { flags |= FUSE_PASSTHROUGH; + /* one-to-one ino mapping requires 64bit ino */ + if (sizeof(ino_t) == sizeof(u64)) + flags |= FUSE_PASSTHROUGH_INO; + } /* * This is just an information flag for fuse server. No need to check diff --git a/fs/fuse/iomode.c b/fs/fuse/iomode.c index 3728933188f3..ca3b28597722 100644 --- a/fs/fuse/iomode.c +++ b/fs/fuse/iomode.c @@ -82,8 +82,10 @@ static void fuse_file_cached_io_release(struct fuse_file *ff, } /* Start strictly uncached io mode where cache access is not allowed */ -int fuse_inode_uncached_io_start(struct fuse_inode *fi, struct fuse_backing *fb) +int fuse_inode_uncached_io_start(struct inode *inode, struct fuse_backing *fb) { + struct fuse_inode *fi = get_fuse_inode(inode); + struct fuse_conn *fc = get_fuse_conn(inode); struct fuse_backing *oldfb; int err = 0; @@ -94,6 +96,12 @@ int fuse_inode_uncached_io_start(struct fuse_inode *fi, struct fuse_backing *fb) err = -EBUSY; goto unlock; } + /* With FUSE_PASSTHROUGH_INO, fuse and backing ino must match */ + if (fb && fc->passthrough_ino && + fb->file->f_inode->i_ino != inode->i_ino) { + err = -EIO; + goto unlock; + } if (fi->iocachectr > 0) { err = -ETXTBSY; goto unlock; @@ -117,10 +125,9 @@ static int fuse_file_uncached_io_open(struct inode *inode, struct fuse_file *ff, struct fuse_backing *fb) { - struct fuse_inode *fi = get_fuse_inode(inode); int err; - err = fuse_inode_uncached_io_start(fi, fb); + err = fuse_inode_uncached_io_start(inode, fb); if (err) return err; diff --git a/include/uapi/linux/fuse.h b/include/uapi/linux/fuse.h index c13e1f9a2f12..4be9ccc5b3ff 100644 --- a/include/uapi/linux/fuse.h +++ b/include/uapi/linux/fuse.h @@ -240,6 +240,9 @@ * - add FUSE_COPY_FILE_RANGE_64 * - add struct fuse_copy_file_range_out * - add FUSE_NOTIFY_PRUNE + * + * 7.46 + * - add FUSE_PASSTHROUGH_INO */ #ifndef _LINUX_FUSE_H @@ -275,7 +278,7 @@ #define FUSE_KERNEL_VERSION 7 /** Minor version number of this interface */ -#define FUSE_KERNEL_MINOR_VERSION 45 +#define FUSE_KERNEL_MINOR_VERSION 46 /** The node ID of the root inode */ #define FUSE_ROOT_ID 1 @@ -495,6 +498,7 @@ struct fuse_file_lock { #define FUSE_ALLOW_IDMAP (1ULL << 40) #define FUSE_OVER_IO_URING (1ULL << 41) #define FUSE_REQUEST_TIMEOUT (1ULL << 42) +#define FUSE_PASSTHROUGH_INO (1ULL << 43) /** * CUSE INIT request/reply flags -- 2.52.0