From: Jeffle Xu <jefflexu@linux.alibaba.com> To: dhowells@redhat.com, linux-cachefs@redhat.com, xiang@kernel.org, chao@kernel.org, linux-erofs@lists.ozlabs.org Cc: gregkh@linuxfoundation.org, fannaihao@baidu.com, willy@infradead.org, linux-kernel@vger.kernel.org, tianzichen@kuaishou.com, joseph.qi@linux.alibaba.com, linux-fsdevel@vger.kernel.org, luodaowen.backend@bytedance.com, gerry@linux.alibaba.com, torvalds@linux-foundation.org Subject: [PATCH v6 22/22] erofs: add 'tag' mount option Date: Fri, 25 Mar 2022 20:22:23 +0800 [thread overview] Message-ID: <20220325122223.102958-23-jefflexu@linux.alibaba.com> (raw) In-Reply-To: <20220325122223.102958-1-jefflexu@linux.alibaba.com> Introduce 'tag' mount option to enable on-demand read sementics. In this case, erofs could be mounted from blob files instead of blkdev. By then users could specify the name of bootstrap blob file containing the complete erofs image. Signed-off-by: Jeffle Xu <jefflexu@linux.alibaba.com> --- fs/erofs/super.c | 44 ++++++++++++++++++++++++++++++++++++++------ 1 file changed, 38 insertions(+), 6 deletions(-) diff --git a/fs/erofs/super.c b/fs/erofs/super.c index 8ac400581784..6ea83f36842c 100644 --- a/fs/erofs/super.c +++ b/fs/erofs/super.c @@ -403,6 +403,7 @@ enum { Opt_dax, Opt_dax_enum, Opt_device, + Opt_tag, Opt_err }; @@ -427,6 +428,7 @@ static const struct fs_parameter_spec erofs_fs_parameters[] = { fsparam_flag("dax", Opt_dax), fsparam_enum("dax", Opt_dax_enum, erofs_dax_param_enums), fsparam_string("device", Opt_device), + fsparam_string("tag", Opt_tag), {} }; @@ -522,6 +524,16 @@ static int erofs_fc_parse_param(struct fs_context *fc, } ++ctx->devs->extra_devices; break; + case Opt_tag: +#ifdef CONFIG_EROFS_FS_ONDEMAND + kfree(ctx->opt.tag); + ctx->opt.tag = kstrdup(param->string, GFP_KERNEL); + if (!ctx->opt.tag) + return -ENOMEM; +#else + errorfc(fc, "tag option not supported"); +#endif + break; default: return -ENOPARAM; } @@ -596,9 +608,14 @@ static int erofs_fc_fill_super(struct super_block *sb, struct fs_context *fc) sb->s_magic = EROFS_SUPER_MAGIC; - if (!sb_set_blocksize(sb, EROFS_BLKSIZ)) { - erofs_err(sb, "failed to set erofs blksize"); - return -EINVAL; + if (IS_ENABLED(CONFIG_EROFS_FS_ONDEMAND) && erofs_is_nodev_mode(sb)) { + sb->s_blocksize = EROFS_BLKSIZ; + sb->s_blocksize_bits = LOG_BLOCK_SIZE; + } else { + if (!sb_set_blocksize(sb, EROFS_BLKSIZ)) { + erofs_err(sb, "failed to set erofs blksize"); + return -EINVAL; + } } sbi = kzalloc(sizeof(*sbi), GFP_KERNEL); @@ -607,7 +624,6 @@ static int erofs_fc_fill_super(struct super_block *sb, struct fs_context *fc) sb->s_fs_info = sbi; sbi->opt = ctx->opt; - sbi->dax_dev = fs_dax_get_by_bdev(sb->s_bdev, &sbi->dax_part_off); sbi->devs = ctx->devs; ctx->devs = NULL; @@ -623,6 +639,10 @@ static int erofs_fc_fill_super(struct super_block *sb, struct fs_context *fc) err = super_setup_bdi(sb); if (err) return err; + + sbi->dax_dev = NULL; + } else { + sbi->dax_dev = fs_dax_get_by_bdev(sb->s_bdev, &sbi->dax_part_off); } err = erofs_read_superblock(sb); @@ -685,6 +705,11 @@ 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_fs_context *ctx = fc->fs_private; + + if (IS_ENABLED(CONFIG_EROFS_FS_ONDEMAND) && ctx->opt.tag) + return get_tree_nodev(fc, erofs_fc_fill_super); + return get_tree_bdev(fc, erofs_fc_fill_super); } @@ -734,6 +759,7 @@ static void erofs_fc_free(struct fs_context *fc) struct erofs_fs_context *ctx = fc->fs_private; erofs_free_dev_context(ctx->devs); + kfree(ctx->opt.tag); kfree(ctx); } @@ -774,7 +800,10 @@ static void erofs_kill_sb(struct super_block *sb) WARN_ON(sb->s_magic != EROFS_SUPER_MAGIC); - kill_block_super(sb); + if (IS_ENABLED(CONFIG_EROFS_FS_ONDEMAND) && erofs_is_nodev_mode(sb)) + generic_shutdown_super(sb); + else + kill_block_super(sb); sbi = EROFS_SB(sb); if (!sbi) @@ -896,7 +925,10 @@ static int erofs_statfs(struct dentry *dentry, struct kstatfs *buf) { struct super_block *sb = dentry->d_sb; struct erofs_sb_info *sbi = EROFS_SB(sb); - u64 id = huge_encode_dev(sb->s_bdev->bd_dev); + u64 id = 0; + + if (!IS_ENABLED(CONFIG_EROFS_FS_ONDEMAND) || !erofs_is_nodev_mode(sb)) + id = huge_encode_dev(sb->s_bdev->bd_dev); buf->f_type = sb->s_magic; buf->f_bsize = EROFS_BLKSIZ; -- 2.27.0
WARNING: multiple messages have this Message-ID (diff)
From: Jeffle Xu <jefflexu@linux.alibaba.com> To: dhowells@redhat.com, linux-cachefs@redhat.com, xiang@kernel.org, chao@kernel.org, linux-erofs@lists.ozlabs.org Cc: torvalds@linux-foundation.org, gregkh@linuxfoundation.org, willy@infradead.org, linux-fsdevel@vger.kernel.org, joseph.qi@linux.alibaba.com, bo.liu@linux.alibaba.com, tao.peng@linux.alibaba.com, gerry@linux.alibaba.com, eguan@linux.alibaba.com, linux-kernel@vger.kernel.org, luodaowen.backend@bytedance.com, tianzichen@kuaishou.com, fannaihao@baidu.com Subject: [PATCH v6 22/22] erofs: add 'tag' mount option Date: Fri, 25 Mar 2022 20:22:23 +0800 [thread overview] Message-ID: <20220325122223.102958-23-jefflexu@linux.alibaba.com> (raw) In-Reply-To: <20220325122223.102958-1-jefflexu@linux.alibaba.com> Introduce 'tag' mount option to enable on-demand read sementics. In this case, erofs could be mounted from blob files instead of blkdev. By then users could specify the name of bootstrap blob file containing the complete erofs image. Signed-off-by: Jeffle Xu <jefflexu@linux.alibaba.com> --- fs/erofs/super.c | 44 ++++++++++++++++++++++++++++++++++++++------ 1 file changed, 38 insertions(+), 6 deletions(-) diff --git a/fs/erofs/super.c b/fs/erofs/super.c index 8ac400581784..6ea83f36842c 100644 --- a/fs/erofs/super.c +++ b/fs/erofs/super.c @@ -403,6 +403,7 @@ enum { Opt_dax, Opt_dax_enum, Opt_device, + Opt_tag, Opt_err }; @@ -427,6 +428,7 @@ static const struct fs_parameter_spec erofs_fs_parameters[] = { fsparam_flag("dax", Opt_dax), fsparam_enum("dax", Opt_dax_enum, erofs_dax_param_enums), fsparam_string("device", Opt_device), + fsparam_string("tag", Opt_tag), {} }; @@ -522,6 +524,16 @@ static int erofs_fc_parse_param(struct fs_context *fc, } ++ctx->devs->extra_devices; break; + case Opt_tag: +#ifdef CONFIG_EROFS_FS_ONDEMAND + kfree(ctx->opt.tag); + ctx->opt.tag = kstrdup(param->string, GFP_KERNEL); + if (!ctx->opt.tag) + return -ENOMEM; +#else + errorfc(fc, "tag option not supported"); +#endif + break; default: return -ENOPARAM; } @@ -596,9 +608,14 @@ static int erofs_fc_fill_super(struct super_block *sb, struct fs_context *fc) sb->s_magic = EROFS_SUPER_MAGIC; - if (!sb_set_blocksize(sb, EROFS_BLKSIZ)) { - erofs_err(sb, "failed to set erofs blksize"); - return -EINVAL; + if (IS_ENABLED(CONFIG_EROFS_FS_ONDEMAND) && erofs_is_nodev_mode(sb)) { + sb->s_blocksize = EROFS_BLKSIZ; + sb->s_blocksize_bits = LOG_BLOCK_SIZE; + } else { + if (!sb_set_blocksize(sb, EROFS_BLKSIZ)) { + erofs_err(sb, "failed to set erofs blksize"); + return -EINVAL; + } } sbi = kzalloc(sizeof(*sbi), GFP_KERNEL); @@ -607,7 +624,6 @@ static int erofs_fc_fill_super(struct super_block *sb, struct fs_context *fc) sb->s_fs_info = sbi; sbi->opt = ctx->opt; - sbi->dax_dev = fs_dax_get_by_bdev(sb->s_bdev, &sbi->dax_part_off); sbi->devs = ctx->devs; ctx->devs = NULL; @@ -623,6 +639,10 @@ static int erofs_fc_fill_super(struct super_block *sb, struct fs_context *fc) err = super_setup_bdi(sb); if (err) return err; + + sbi->dax_dev = NULL; + } else { + sbi->dax_dev = fs_dax_get_by_bdev(sb->s_bdev, &sbi->dax_part_off); } err = erofs_read_superblock(sb); @@ -685,6 +705,11 @@ 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_fs_context *ctx = fc->fs_private; + + if (IS_ENABLED(CONFIG_EROFS_FS_ONDEMAND) && ctx->opt.tag) + return get_tree_nodev(fc, erofs_fc_fill_super); + return get_tree_bdev(fc, erofs_fc_fill_super); } @@ -734,6 +759,7 @@ static void erofs_fc_free(struct fs_context *fc) struct erofs_fs_context *ctx = fc->fs_private; erofs_free_dev_context(ctx->devs); + kfree(ctx->opt.tag); kfree(ctx); } @@ -774,7 +800,10 @@ static void erofs_kill_sb(struct super_block *sb) WARN_ON(sb->s_magic != EROFS_SUPER_MAGIC); - kill_block_super(sb); + if (IS_ENABLED(CONFIG_EROFS_FS_ONDEMAND) && erofs_is_nodev_mode(sb)) + generic_shutdown_super(sb); + else + kill_block_super(sb); sbi = EROFS_SB(sb); if (!sbi) @@ -896,7 +925,10 @@ static int erofs_statfs(struct dentry *dentry, struct kstatfs *buf) { struct super_block *sb = dentry->d_sb; struct erofs_sb_info *sbi = EROFS_SB(sb); - u64 id = huge_encode_dev(sb->s_bdev->bd_dev); + u64 id = 0; + + if (!IS_ENABLED(CONFIG_EROFS_FS_ONDEMAND) || !erofs_is_nodev_mode(sb)) + id = huge_encode_dev(sb->s_bdev->bd_dev); buf->f_type = sb->s_magic; buf->f_bsize = EROFS_BLKSIZ; -- 2.27.0
next prev parent reply other threads:[~2022-03-25 12:23 UTC|newest] Thread overview: 73+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-03-25 12:22 [PATCH v6 00/22] fscache,erofs: fscache-based on-demand read semantics Jeffle Xu 2022-03-25 12:22 ` [PATCH v6 00/22] fscache, erofs: " Jeffle Xu 2022-03-25 12:22 ` [PATCH v6 01/22] fscache: export fscache_end_operation() Jeffle Xu 2022-03-25 12:22 ` Jeffle Xu 2022-03-25 12:22 ` [PATCH v6 02/22] cachefiles: extract write routine Jeffle Xu 2022-03-25 12:22 ` Jeffle Xu 2022-03-25 12:22 ` [PATCH v6 03/22] cachefiles: notify user daemon with anon_fd when looking up cookie Jeffle Xu 2022-03-25 12:22 ` Jeffle Xu 2022-03-25 20:52 ` kernel test robot 2022-03-25 20:52 ` kernel test robot 2022-03-25 23:25 ` kernel test robot 2022-03-25 23:25 ` kernel test robot 2022-03-29 6:14 ` [Linux-cachefs] " JeffleXu 2022-03-29 6:14 ` JeffleXu 2022-03-25 12:22 ` [PATCH v6 04/22] cachefiles: notify user daemon when withdrawing cookie Jeffle Xu 2022-03-25 12:22 ` Jeffle Xu 2022-03-25 12:22 ` [PATCH v6 05/22] cachefiles: implement on-demand read Jeffle Xu 2022-03-25 12:22 ` Jeffle Xu 2022-03-25 12:22 ` [PATCH v6 06/22] cachefiles: enable on-demand read mode Jeffle Xu 2022-03-25 12:22 ` Jeffle Xu 2022-03-25 12:22 ` [PATCH v6 07/22] cachefiles: document " Jeffle Xu 2022-03-25 12:22 ` Jeffle Xu 2022-03-25 12:22 ` [PATCH v6 08/22] erofs: use meta buffers for erofs_read_superblock() Jeffle Xu 2022-03-25 12:22 ` Jeffle Xu 2022-03-25 12:22 ` [PATCH v6 09/22] erofs: make erofs_map_blocks() generally available Jeffle Xu 2022-03-25 12:22 ` Jeffle Xu 2022-03-25 12:22 ` [PATCH v6 10/22] erofs: add mode checking helper Jeffle Xu 2022-03-25 12:22 ` Jeffle Xu 2022-03-28 2:42 ` Gao Xiang 2022-03-28 2:42 ` Gao Xiang 2022-03-28 2:46 ` JeffleXu 2022-03-25 12:22 ` [PATCH v6 11/22] erofs: register global fscache volume Jeffle Xu 2022-03-25 12:22 ` Jeffle Xu 2022-03-25 12:22 ` [PATCH v6 12/22] erofs: add cookie context helper functions Jeffle Xu 2022-03-25 12:22 ` Jeffle Xu 2022-03-25 13:41 ` Gao Xiang 2022-03-25 13:41 ` Gao Xiang 2022-03-28 3:11 ` JeffleXu 2022-03-25 12:22 ` [PATCH v6 13/22] erofs: add anonymous inode managing page cache of blob file Jeffle Xu 2022-03-25 12:22 ` Jeffle Xu 2022-03-25 13:46 ` [Linux-cachefs] " Gao Xiang 2022-03-25 13:46 ` Gao Xiang 2022-03-25 12:22 ` [PATCH v6 14/22] erofs: add erofs_fscache_read_folios() helper Jeffle Xu 2022-03-25 12:22 ` Jeffle Xu 2022-03-28 2:49 ` [Linux-cachefs] " Gao Xiang 2022-03-28 2:49 ` Gao Xiang 2022-03-25 12:22 ` [PATCH v6 15/22] erofs: register cookie context for bootstrap blob Jeffle Xu 2022-03-25 12:22 ` Jeffle Xu 2022-03-28 3:04 ` Gao Xiang 2022-03-28 3:04 ` Gao Xiang 2022-03-28 3:15 ` JeffleXu 2022-03-25 12:22 ` [PATCH v6 16/22] erofs: implement fscache-based metadata read Jeffle Xu 2022-03-25 12:22 ` Jeffle Xu 2022-03-25 12:22 ` [PATCH v6 17/22] erofs: implement fscache-based data read for non-inline layout Jeffle Xu 2022-03-25 12:22 ` Jeffle Xu 2022-03-28 3:14 ` Gao Xiang 2022-03-28 3:14 ` Gao Xiang 2022-03-25 12:22 ` [PATCH v6 18/22] erofs: implement fscache-based data read for inline layout Jeffle Xu 2022-03-25 12:22 ` Jeffle Xu 2022-03-25 12:22 ` [PATCH v6 19/22] erofs: register cookie context for data blobs Jeffle Xu 2022-03-25 12:22 ` Jeffle Xu 2022-03-28 9:48 ` Gao Xiang 2022-03-28 9:48 ` Gao Xiang 2022-03-25 12:22 ` [PATCH v6 20/22] erofs: implement fscache-based data read " Jeffle Xu 2022-03-25 12:22 ` Jeffle Xu 2022-03-28 9:50 ` Gao Xiang 2022-03-28 9:50 ` Gao Xiang 2022-03-25 12:22 ` [PATCH v6 21/22] erofs: implement fscache-based data readahead Jeffle Xu 2022-03-25 12:22 ` Jeffle Xu 2022-03-28 10:55 ` Gao Xiang 2022-03-28 10:55 ` Gao Xiang 2022-03-25 12:22 ` Jeffle Xu [this message] 2022-03-25 12:22 ` [PATCH v6 22/22] erofs: add 'tag' mount option Jeffle Xu
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20220325122223.102958-23-jefflexu@linux.alibaba.com \ --to=jefflexu@linux.alibaba.com \ --cc=chao@kernel.org \ --cc=dhowells@redhat.com \ --cc=fannaihao@baidu.com \ --cc=gerry@linux.alibaba.com \ --cc=gregkh@linuxfoundation.org \ --cc=joseph.qi@linux.alibaba.com \ --cc=linux-cachefs@redhat.com \ --cc=linux-erofs@lists.ozlabs.org \ --cc=linux-fsdevel@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=luodaowen.backend@bytedance.com \ --cc=tianzichen@kuaishou.com \ --cc=torvalds@linux-foundation.org \ --cc=willy@infradead.org \ --cc=xiang@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.