erofs: accept source file descriptor via fsconfig
Subsystems (3)
PATCH v5 1/1 erofs: accept source file descriptor via fsconfig
Allow userspace to pass an already-opened file descriptor as the mount source instead of a path string. This is useful for tools that already hold an fd to the image, such as composefs reusing an existing erofs backing file.
---
v4: https://lore.kernel.org/linux-fsdevel/[email protected]/
v3: https://lore.kernel.org/linux-fsdevel/[email protected]/
v2: https://lore.kernel.org/linux-fsdevel/[email protected]/
v1: https://lore.kernel.org/linux-fsdevel/ak5GfvVfWLJU1EwK@debian/
Documentation/filesystems/erofs.rst | 15 ++++++ fs/erofs/super.c | 73 ++++++++++++++++++++++++----- 2 files changed, 77 insertions(+), 11 deletions(-)
Documentation/filesystems/erofs.rst +15 -0
@@ -139,6 +139,21 @@ inode_share Enable inode page sharing for this filesystem. Inodes wi page cache. =================== ========================================================= +File-backed mounts +================== + +When CONFIG_EROFS_FS_BACKED_BY_FILE is enabled, EROFS file-backed images +can be mounted directly without a loopback block device. The backing file +can be given either as a path, or as an already-opened file descriptor. + +When a file descriptor is used, the kernel resolves its path and records it +so that /proc/mounts and similar interfaces can still report the mount +source. + +Only regular files are accepted as backing files; to mount an image that +resides on a block device, use the traditional block device mount path +instead. + Sysfs Entries =============
fs/erofs/super.c +62 -11
110 lines not on this page · raw message
Signature · 1 line
2.55.0
Quoted 28 lines · Giuseppe Scrivano
Allow userspace to pass an already-opened file descriptor as the mount source instead of a path string. This is useful for tools that already hold an fd to the image, such as composefs reusing an existing erofs backing file.
Signed-off-by Giuseppe Scrivano <[email protected]>---
v4: https://lore.kernel.org/linux-fsdevel/[email protected]/
v3: https://lore.kernel.org/linux-fsdevel/[email protected]/
v2: https://lore.kernel.org/linux-fsdevel/[email protected]/
v1: https://lore.kernel.org/linux-fsdevel/ak5GfvVfWLJU1EwK@debian/Documentation/filesystems/erofs.rst | 15 ++++++ fs/erofs/super.c | 73 ++++++++++++++++++++++++----- 2 files changed, 77 insertions(+), 11 deletions(-)Documentation/filesystems/erofs.rst +4
-0@@ -139,6 +139,21 @@ inode_share Enable inode page sharing for this filesystem. Inodes wi page cache. =================== ========================================================= +File-backed mounts +================== + +When CONFIG_EROFS_FS_BACKED_BY_FILE is enabled, EROFS file-backed images
Documentation/filesystems/erofs.rst inode_share Enable inode page sharing for this filesystem. Inodes wi · line 155
Quoted 10 lines
Documentation/filesystems/erofs.rst +10
-0+can be mounted directly without a loopback block device. The backing file +can be given either as a path, or as an already-opened file descriptor. + +When a file descriptor is used, the kernel resolves its path and records it +so that /proc/mounts and similar interfaces can still report the mount +source. + +Only regular files are accepted as backing files; to mount an image that +resides on a block device, use the traditional block device mount path +instead.
Hi Christian, Jan, could you ack this (fc->source filling when source_fd is used) if possible? I wish this behavior can be consistent even vfs source_fd is implemented later.
Thanks,
Gao Xiang
Quoted 42 lines · Gao Xiang
Quoted 28 lines · Giuseppe Scrivano
Allow userspace to pass an already-opened file descriptor as the mount source instead of a path string. This is useful for tools that already hold an fd to the image, such as composefs reusing an existing erofs backing file.
Signed-off-by Giuseppe Scrivano <[email protected]>---
v4: https://lore.kernel.org/linux-fsdevel/[email protected]/
v3: https://lore.kernel.org/linux-fsdevel/[email protected]/
v2: https://lore.kernel.org/linux-fsdevel/[email protected]/
v1: https://lore.kernel.org/linux-fsdevel/ak5GfvVfWLJU1EwK@debian/Documentation/filesystems/erofs.rst | 15 ++++++ fs/erofs/super.c | 73 ++++++++++++++++++++++++----- 2 files changed, 77 insertions(+), 11 deletions(-)Documentation/filesystems/erofs.rst +4
-0@@ -139,6 +139,21 @@ inode_share Enable inode page sharing for this filesystem. Inodes wi page cache. =================== ========================================================= +File-backed mounts +================== + +When CONFIG_EROFS_FS_BACKED_BY_FILE is enabled, EROFS file-backed imagesDocumentation/filesystems/erofs.rst inode_share Enable inode page sharing for this filesystem. Inodes wi · line 155
Quoted 10 lines
Documentation/filesystems/erofs.rst +10
-0+can be mounted directly without a loopback block device. The backing file +can be given either as a path, or as an already-opened file descriptor. + +When a file descriptor is used, the kernel resolves its path and records it +so that /proc/mounts and similar interfaces can still report the mount +source. + +Only regular files are accepted as backing files; to mount an image that +resides on a block device, use the traditional block device mount path +instead.Reviewed-by Gao Xiang <[email protected]>
Quoted 2 lines
Hi Christian, Jan, could you ack this (
fc->sourcefilling whensource_fdis used) if possible?
Whenever I see a use of d_path() (or file_path() in this case) I'm a bit watchful because its result is inherently racy and unsafe. But in this case the result is only used for alloc_vfsmnt() which uses it for mnt_devname so in the worst case we'll get an unreliable path in /proc/mounts or similar. I guess that's acceptable. So feel free to add:
Honza
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Gao Xiang
maintainerHi Jan,
Quoted 43 lines · Jan Kara
Quoted 42 lines · Gao Xiang
Quoted 28 lines · Giuseppe Scrivano
Allow userspace to pass an already-opened file descriptor as the mount source instead of a path string. This is useful for tools that already hold an fd to the image, such as composefs reusing an existing erofs backing file.
Signed-off-by Giuseppe Scrivano <[email protected]>---
v4: https://lore.kernel.org/linux-fsdevel/[email protected]/
v3: https://lore.kernel.org/linux-fsdevel/[email protected]/
v2: https://lore.kernel.org/linux-fsdevel/[email protected]/
v1: https://lore.kernel.org/linux-fsdevel/ak5GfvVfWLJU1EwK@debian/Documentation/filesystems/erofs.rst | 15 ++++++ fs/erofs/super.c | 73 ++++++++++++++++++++++++----- 2 files changed, 77 insertions(+), 11 deletions(-)Documentation/filesystems/erofs.rst +4
-0@@ -139,6 +139,21 @@ inode_share Enable inode page sharing for this filesystem. Inodes wi page cache. =================== ========================================================= +File-backed mounts +================== + +When CONFIG_EROFS_FS_BACKED_BY_FILE is enabled, EROFS file-backed imagesDocumentation/filesystems/erofs.rst inode_share Enable inode page sharing for this filesystem. Inodes wi · line 155
Quoted 10 lines
Documentation/filesystems/erofs.rst +10
-0+can be mounted directly without a loopback block device. The backing file +can be given either as a path, or as an already-opened file descriptor. + +When a file descriptor is used, the kernel resolves its path and records it +so that /proc/mounts and similar interfaces can still report the mount +source. + +Only regular files are accepted as backing files; to mount an image that +resides on a block device, use the traditional block device mount path +instead.Reviewed-by Gao Xiang <[email protected]>
Quoted 8 lines
Quoted 2 lines
Hi Christian, Jan, could you ack this (
fc->sourcefilling whensource_fdis used) if possible?Whenever I see a use of
d_path()(orfile_path()in this case) I'm a bit watchful because its result is inherently racy and unsafe. But in this case the result is only used foralloc_vfsmnt()which uses it formnt_devnameso in the worst case we'll get an unreliable path in/proc/mountsor similar. I guess that's acceptable. So feel free to add:
Thanks for your reply and comment. Yeah, the result of d_path() can become outdated later since it only uses seqcounts to ensure that within the process, but here I also think "mnt_devname" usage doesn't really matter (but I hope filling like this is fine and stable in the long term.)
Quoted 2 lines
Acked-by Jan Kara <[email protected]>
Thanks!
Thanks,
Gao Xiang
Quoted 6 lines
Honza
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Hi Giuseppe,
Quoted 6 lines
Allow userspace to pass an already-opened file descriptor as the mount source instead of a path string. This is useful for tools that already hold an fd to the image, such as composefs reusing an existing erofs backing file.
Signed-off-by Giuseppe Scrivano <[email protected]>
Chao Yu
maintainerQuoted 28 lines · Giuseppe Scrivano
Allow userspace to pass an already-opened file descriptor as the mount source instead of a path string. This is useful for tools that already hold an fd to the image, such as composefs reusing an existing erofs backing file.
Signed-off-by Giuseppe Scrivano <[email protected]>---
v4: https://lore.kernel.org/linux-fsdevel/[email protected]/
v3: https://lore.kernel.org/linux-fsdevel/[email protected]/
v2: https://lore.kernel.org/linux-fsdevel/[email protected]/
v1: https://lore.kernel.org/linux-fsdevel/ak5GfvVfWLJU1EwK@debian/Documentation/filesystems/erofs.rst | 15 ++++++ fs/erofs/super.c | 73 ++++++++++++++++++++++++----- 2 files changed, 77 insertions(+), 11 deletions(-)Documentation/filesystems/erofs.rst +4
-0@@ -139,6 +139,21 @@ inode_share Enable inode page sharing for this filesystem. Inodes wi page cache. =================== ========================================================= +File-backed mounts +================== + +When CONFIG_EROFS_FS_BACKED_BY_FILE is enabled, EROFS file-backed images
Documentation/filesystems/erofs.rst inode_share Enable inode page sharing for this filesystem. Inodes wi · line 155
Quoted 10 lines
Documentation/filesystems/erofs.rst +10
-0+can be mounted directly without a loopback block device. The backing file +can be given either as a path, or as an already-opened file descriptor. + +When a file descriptor is used, the kernel resolves its path and records it +so that /proc/mounts and similar interfaces can still report the mount +source. + +Only regular files are accepted as backing files; to mount an image that +resides on a block device, use the traditional block device mount path +instead.
Do we need to add an entry to describe the new mount option source= in "Mount options" section in erofs.rst?
Thanks,
Quoted 123 lines
Documentation/filesystems/erofs.rst +1
-0+ Sysfs Entries =============fs/erofs/super.c +62
-11@@ -386,6 +386,7 @@ static void erofs_default_options(struct erofs_sb_info *sbi)enum { Opt_user_xattr, Opt_acl, Opt_cache_strategy, Opt_dax, Opt_dax_enum, Opt_device, Opt_domain_id, Opt_directio, Opt_fsoffset, Opt_inode_share, + Opt_source, };static const struct constant_table erofs_param_cache_strategy[] = {@@ -402,17 +403,18 @@ static const struct constant_table erofs_dax_param_enums[] = { };static const struct fs_parameter_spec erofs_fs_parameters[] = { -fsparam_flag_no ("user_xattr" , Opt_user_xattr), -fsparam_flag_no ("acl" , Opt_acl), -fsparam_enum ("cache_strategy" , Opt_cache_strategy, +fsparam_flag_no ("user_xattr" , Opt_user_xattr), +fsparam_flag_no ("acl" , Opt_acl), +fsparam_enum ("cache_strategy" , Opt_cache_strategy, erofs_param_cache_strategy), -fsparam_flag ("dax" , Opt_dax), -fsparam_enum ("dax" , Opt_dax_enum, erofs_dax_param_enums), -fsparam_string ("device" , Opt_device), -fsparam_string ("domain_id" , Opt_domain_id), -fsparam_flag_no ("directio" , Opt_directio), -fsparam_u64 ("fsoffset" , Opt_fsoffset), -fsparam_flag ("inode_share" , Opt_inode_share), +fsparam_flag ("dax" , Opt_dax), +fsparam_enum ("dax" , Opt_dax_enum, erofs_dax_param_enums), +fsparam_string ("device" , Opt_device), +fsparam_string ("domain_id" , Opt_domain_id), +fsparam_flag_no ("directio" , Opt_directio), +fsparam_u64 ("fsoffset" , Opt_fsoffset), +fsparam_flag ("inode_share" , Opt_inode_share), +fsparam_file_or_string ("source" , Opt_source), {} };@@ -437,6 +439,40 @@ static bool erofs_fc_set_dax_mode(struct fs_context *fc, unsigned int mode)return false; } +static int erofs_fc_parse_source (struct fs_context *fc, +struct fs_parameter *param) +{ +struct erofs_sb_info *sbi = fc->s_fs_info; + +if (fc->source || sbi->dif0.file) +return invalf (fc,"Multiple sources" ); + +switch (param->type) { +case fs_value_is_string: + fc->source = param->string; + param->string =NULL ; +return 0 ; +case fs_value_is_file: { + char *buf __free(kfree) = kmalloc(PATH_MAX, GFP_KERNEL); +char *p; + +if (!buf) +return -ENOMEM ; + p =file_path (param->file, buf,PATH_MAX ); +if (IS_ERR (p)) +return PTR_ERR (p); + fc->source =kstrdup (p,GFP_KERNEL ); +if (!fc->source) +return -ENOMEM ; + sbi->dif0.file =no_free_ptr (param->file); +return 0 ; + } +default : +WARN_ON_ONCE (true); +return -EINVAL ; + } +} +static int erofs_fc_parse_param (struct fs_context *fc,struct fs_parameter *param) {@@ -524,6 +560,8 @@ static int erofs_fc_parse_param(struct fs_context *fc,else set_opt (&sbi->opt,INODE_SHARE );break ; +case Opt_source: +return erofs_fc_parse_source (fc, param); }return 0 ; }@@ -752,13 +790,26 @@ static int erofs_fc_fill_super(struct super_block *sb, struct fs_context *fc)static int erofs_fc_get_tree (struct fs_context *fc) { +struct erofs_sb_info *sbi = fc->s_fs_info;int ret; +if (sbi->dif0.file) { +if (!IS_ENABLED (CONFIG_EROFS_FS_BACKED_BY_FILE )) { +errorfc (fc,"source fd option not supported" ); +return -EINVAL ; + } +if (!S_ISREG (file_inode (sbi->dif0.file)->i_mode) || + !sbi->dif0.file->f_mapping->a_ops->read_folio) { +errorfc (fc,"source is unsupported" ); +return -EINVAL ; + } +return get_tree_nodev (fc, erofs_fc_fill_super); + } + ret =get_tree_bdev_flags (fc, erofs_fc_fill_super,IS_ENABLED (CONFIG_EROFS_FS_BACKED_BY_FILE ) ?GET_TREE_BDEV_QUIET_LOOKUP :0 );if (IS_ENABLED (CONFIG_EROFS_FS_BACKED_BY_FILE ) && ret == -ENOTBLK ) { -struct erofs_sb_info *sbi = fc->s_fs_info;struct file *file;if (!fc->source)
Quoted 40 lines · Chao Yu
Quoted 25 lines · Giuseppe Scrivano
Allow userspace to pass an already-opened file descriptor as the mount source instead of a path string. This is useful for tools that already hold an fd to the image, such as composefs reusing an existing erofs backing file.
Signed-off-by Giuseppe Scrivano <[email protected]>---
v4: https://lore.kernel.org/linux-fsdevel/[email protected]/
v3: https://lore.kernel.org/linux-fsdevel/[email protected]/
v2: https://lore.kernel.org/linux-fsdevel/[email protected]/
v1: https://lore.kernel.org/linux-fsdevel/ak5GfvVfWLJU1EwK@debian/Documentation/filesystems/erofs.rst | 15 ++++++ fs/erofs/super.c | 73 ++++++++++++++++++++++++----- 2 files changed, 77 insertions(+), 11 deletions(-)Documentation/filesystems/erofs.rst +3
-0@@ -139,6 +139,21 @@ inode_share Enable inode page sharing for this filesystem. Inodes wi page cache. =================== ========================================================= +File-backed mounts +================== + +When CONFIG_EROFS_FS_BACKED_BY_FILE is enabled, EROFS file-backed imagesDocumentation/filesystems/erofs.rst inode_share Enable inode page sharing for this filesystem. Inodes wi · line 154
Quoted 10 lines
Documentation/filesystems/erofs.rst +10
-0+can be mounted directly without a loopback block device. The backing file +can be given either as a path, or as an already-opened file descriptor. + +When a file descriptor is used, the kernel resolves its path and records it +so that /proc/mounts and similar interfaces can still report the mount +source. + +Only regular files are accepted as backing files; to mount an image that +resides on a block device, use the traditional block device mount path +instead.Do we need to add an entry to describe the new mount option source= in "Mount options" section in
erofs.rst?
Quoted 1 line
Thanks,
I've another patch "erofs: reuse superblock for file-backed mounts" that also touches erofs.rst and it is currently based on top of this version. I wonder what is your preferred way to handle them.
Will maintainers deal with conflicts or do I need to submit them as a single series?
Do you prefer a new submission v6 with the following fixup?
Documentation/filesystems/erofs.rst +2 -0
@@ -137,6 +137,8 @@ fsoffset=%llu Specify block-aligned filesystem offset for the primary d inode_share Enable inode page sharing for this filesystem. Inodes with identical content within the same domain ID can share the page cache. +source=%s (For file-backed mounts) Specify the backing image as a path + or as an already-opened file descriptor.
Thanks,
Giuseppe
Quoted 42 lines · Giuseppe Scrivano
Quoted 40 lines · Chao Yu
Quoted 25 lines · Giuseppe Scrivano
Allow userspace to pass an already-opened file descriptor as the mount source instead of a path string. This is useful for tools that already hold an fd to the image, such as composefs reusing an existing erofs backing file.
Signed-off-by Giuseppe Scrivano <[email protected]>---
v4: https://lore.kernel.org/linux-fsdevel/[email protected]/
v3: https://lore.kernel.org/linux-fsdevel/[email protected]/
v2: https://lore.kernel.org/linux-fsdevel/[email protected]/
v1: https://lore.kernel.org/linux-fsdevel/ak5GfvVfWLJU1EwK@debian/Documentation/filesystems/erofs.rst | 15 ++++++ fs/erofs/super.c | 73 ++++++++++++++++++++++++----- 2 files changed, 77 insertions(+), 11 deletions(-)Documentation/filesystems/erofs.rst +3
-0@@ -139,6 +139,21 @@ inode_share Enable inode page sharing for this filesystem. Inodes wi page cache. =================== ========================================================= +File-backed mounts +================== + +When CONFIG_EROFS_FS_BACKED_BY_FILE is enabled, EROFS file-backed imagesDocumentation/filesystems/erofs.rst inode_share Enable inode page sharing for this filesystem. Inodes wi · line 154
Quoted 10 lines
Documentation/filesystems/erofs.rst +10
-0+can be mounted directly without a loopback block device. The backing file +can be given either as a path, or as an already-opened file descriptor. + +When a file descriptor is used, the kernel resolves its path and records it +so that /proc/mounts and similar interfaces can still report the mount +source. + +Only regular files are accepted as backing files; to mount an image that +resides on a block device, use the traditional block device mount path +instead.Do we need to add an entry to describe the new mount option source= in "Mount options" section in
erofs.rst?
Quoted 5 lines
Quoted 1 line
Thanks,
I've another patch "erofs: reuse superblock for file-backed mounts" that also touches
erofs.rstand it is currently based on top of this version. I wonder what is your preferred way to handle them.
EROFS dev branch usually has a small number of patches. Since Chao gave a new suggestion, I think a v6 is needed (but you could add all previous reviewed-by:).
And "erofs: reuse superblock for file-backed mounts" needs to be rebased too, I will find time to play with it this week (or you could add a testcase in erofs-utils experimental-tests if you have time.)
Quoted 11 lines
Will maintainers deal with conflicts or do I need to submit them as a single series?
Do you prefer a new submission v6 with the following fixup?
Documentation/filesystems/erofs.rst +0
-0
Documentation/filesystems/erofs.rst fsoffset=%llu Specify block-aligned filesystem offset for the primary d · line 141
Quoted 5 lines
Documentation/filesystems/erofs.rst +2
-0@@ -137,6 +137,8 @@ fsoffset=%llu Specify block-aligned filesystem offset for the primary d inode_share Enable inode page sharing for this filesystem. Inodes with identical content within the same domain ID can share the page cache. +source=%s (For file-backed mounts) Specify the backing image as a path + or as an already-opened file descriptor.
Not quite sure "an already-opened file descriptor" is "%s", but I'm fine since it's quite a minor one (it's unneeded to nitpick the documentation).
Thanks,
Gao Xiang
Quoted 5 lines
Documentation/filesystems/erofs.rst +0
-0Thanks,Giuseppe
Quoted 63 lines · Gao Xiang
Quoted 42 lines · Giuseppe Scrivano
Quoted 40 lines · Chao Yu
Quoted 25 lines · Giuseppe Scrivano
Allow userspace to pass an already-opened file descriptor as the mount source instead of a path string. This is useful for tools that already hold an fd to the image, such as composefs reusing an existing erofs backing file.
Signed-off-by Giuseppe Scrivano <[email protected]>---
v4: https://lore.kernel.org/linux-fsdevel/[email protected]/
v3: https://lore.kernel.org/linux-fsdevel/[email protected]/
v2: https://lore.kernel.org/linux-fsdevel/[email protected]/
v1: https://lore.kernel.org/linux-fsdevel/ak5GfvVfWLJU1EwK@debian/Documentation/filesystems/erofs.rst | 15 ++++++ fs/erofs/super.c | 73 ++++++++++++++++++++++++----- 2 files changed, 77 insertions(+), 11 deletions(-)Documentation/filesystems/erofs.rst +3
-0@@ -139,6 +139,21 @@ inode_share Enable inode page sharing for this filesystem. Inodes wi page cache. =================== ========================================================= +File-backed mounts +================== + +When CONFIG_EROFS_FS_BACKED_BY_FILE is enabled, EROFS file-backed imagesDocumentation/filesystems/erofs.rst inode_share Enable inode page sharing for this filesystem. Inodes wi · line 154
Quoted 10 lines
Documentation/filesystems/erofs.rst +10
-0+can be mounted directly without a loopback block device. The backing file +can be given either as a path, or as an already-opened file descriptor. + +When a file descriptor is used, the kernel resolves its path and records it +so that /proc/mounts and similar interfaces can still report the mount +source. + +Only regular files are accepted as backing files; to mount an image that +resides on a block device, use the traditional block device mount path +instead.Do we need to add an entry to describe the new mount option source= in "Mount options" section in
erofs.rst?Quoted 5 lines
Quoted 1 line
Thanks,
I've another patch "erofs: reuse superblock for file-backed mounts" that also touches
erofs.rstand it is currently based on top of this version. I wonder what is your preferred way to handle them.EROFS dev branch usually has a small number of patches. Since Chao gave a new suggestion, I think a v6 is needed (but you could add all previous reviewed-by:).
And "erofs: reuse superblock for file-backed mounts" needs to be rebased too, I will find time to play with it this week (or you could add a testcase in erofs-utils experimental-tests if you have time.)
Quoted 6 lines
Will maintainers deal with conflicts or do I need to submit them as a single series?
Do you prefer a new submission v6 with the following fixup?
Quoted 14 lines
Documentation/filesystems/erofs.rst fsoffset=%llu Specify block-aligned filesystem offset for the primary d · line 141
Quoted 10 lines
Documentation/filesystems/erofs.rst +2
-0@@ -137,6 +137,8 @@ fsoffset=%llu Specify block-aligned filesystem offset for the primary d inode_share Enable inode page sharing for this filesystem. Inodes with identical content within the same domain ID can share the page cache. +source=%s (For file-backed mounts) Specify the backing image as a path + or as an already-opened file descriptor.Not quite sure "an already-opened file descriptor" is "%s", but I'm fine since it's quite a minor one (it's unneeded to nitpick the documentation).
thanks, I've sent v6 as well as the rebase of "erofs: reuse superblock for file-backed mounts" on top of it.
Regards,
Giuseppe