From: Gao Xiang <hsiangkao@linux.alibaba.com> To: Jeffle Xu <jefflexu@linux.alibaba.com> Cc: dhowells@redhat.com, linux-cachefs@redhat.com, xiang@kernel.org, chao@kernel.org, linux-erofs@lists.ozlabs.org, 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, zhangjiachen.jaycee@bytedance.com Subject: Re: [PATCH v9 21/21] erofs: add 'fsid' mount option Date: Thu, 21 Apr 2022 19:59:22 +0800 [thread overview] Message-ID: <YmFHGjHkWOT7GoIm@B-P7TQMD6M-0146.local> (raw) In-Reply-To: <20220415123614.54024-22-jefflexu@linux.alibaba.com> On Fri, Apr 15, 2022 at 08:36:14PM +0800, Jeffle Xu wrote: > Introduce 'fsid' mount option to enable on-demand read sementics, in > which case, erofs will be mounted from data blobs. Users could specify > the name of primary data blob by this mount option. > > Signed-off-by: Jeffle Xu <jefflexu@linux.alibaba.com> Reviewed-by: Gao Xiang <hsiangkao@linux.alibaba.com> Thanks, Gao Xiang > --- > fs/erofs/super.c | 31 ++++++++++++++++++++++++++++++- > fs/erofs/sysfs.c | 4 ++-- > 2 files changed, 32 insertions(+), 3 deletions(-) > > diff --git a/fs/erofs/super.c b/fs/erofs/super.c > index f68ba929100d..4a623630e1c4 100644 > --- a/fs/erofs/super.c > +++ b/fs/erofs/super.c > @@ -371,6 +371,8 @@ static int erofs_read_superblock(struct super_block *sb) > > if (erofs_sb_has_ztailpacking(sbi)) > erofs_info(sb, "EXPERIMENTAL compressed inline data feature in use. Use at your own risk!"); > + if (erofs_is_fscache_mode(sb)) > + erofs_info(sb, "EXPERIMENTAL fscache-based on-demand read feature in use. Use at your own risk!"); > out: > erofs_put_metabuf(&buf); > return ret; > @@ -399,6 +401,7 @@ enum { > Opt_dax, > Opt_dax_enum, > Opt_device, > + Opt_fsid, > Opt_err > }; > > @@ -423,6 +426,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("fsid", Opt_fsid), > {} > }; > > @@ -518,6 +522,16 @@ static int erofs_fc_parse_param(struct fs_context *fc, > } > ++ctx->devs->extra_devices; > break; > + case Opt_fsid: > +#ifdef CONFIG_EROFS_FS_ONDEMAND > + kfree(ctx->opt.fsid); > + ctx->opt.fsid = kstrdup(param->string, GFP_KERNEL); > + if (!ctx->opt.fsid) > + return -ENOMEM; > +#else > + errorfc(fc, "fsid option not supported"); > +#endif > + break; > default: > return -ENOPARAM; > } > @@ -604,6 +618,7 @@ static int erofs_fc_fill_super(struct super_block *sb, struct fs_context *fc) > > sb->s_fs_info = sbi; > sbi->opt = ctx->opt; > + ctx->opt.fsid = NULL; > sbi->devs = ctx->devs; > ctx->devs = NULL; > > @@ -690,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.fsid) > + return get_tree_nodev(fc, erofs_fc_fill_super); > + > return get_tree_bdev(fc, erofs_fc_fill_super); > } > > @@ -739,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.fsid); > kfree(ctx); > } > > @@ -779,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 (erofs_is_fscache_mode(sb)) > + generic_shutdown_super(sb); > + else > + kill_block_super(sb); > > sbi = EROFS_SB(sb); > if (!sbi) > @@ -789,6 +813,7 @@ static void erofs_kill_sb(struct super_block *sb) > fs_put_dax(sbi->dax_dev); > erofs_fscache_unregister_cookie(&sbi->s_fscache); > erofs_fscache_unregister_fs(sb); > + kfree(sbi->opt.fsid); > kfree(sbi); > sb->s_fs_info = NULL; > } > @@ -938,6 +963,10 @@ static int erofs_show_options(struct seq_file *seq, struct dentry *root) > seq_puts(seq, ",dax=always"); > if (test_opt(opt, DAX_NEVER)) > seq_puts(seq, ",dax=never"); > +#ifdef CONFIG_EROFS_FS_ONDEMAND > + if (opt->fsid) > + seq_printf(seq, ",fsid=%s", opt->fsid); > +#endif > return 0; > } > > diff --git a/fs/erofs/sysfs.c b/fs/erofs/sysfs.c > index f3babf1e6608..c1383e508bbe 100644 > --- a/fs/erofs/sysfs.c > +++ b/fs/erofs/sysfs.c > @@ -205,8 +205,8 @@ int erofs_register_sysfs(struct super_block *sb) > > sbi->s_kobj.kset = &erofs_root; > init_completion(&sbi->s_kobj_unregister); > - err = kobject_init_and_add(&sbi->s_kobj, &erofs_sb_ktype, NULL, > - "%s", sb->s_id); > + err = kobject_init_and_add(&sbi->s_kobj, &erofs_sb_ktype, NULL, "%s", > + erofs_is_fscache_mode(sb) ? sbi->opt.fsid : sb->s_id); > if (err) > goto put_sb_kobj; > return 0; > -- > 2.27.0
WARNING: multiple messages have this Message-ID (diff)
From: Gao Xiang <hsiangkao@linux.alibaba.com> To: Jeffle Xu <jefflexu@linux.alibaba.com> Cc: tianzichen@kuaishou.com, linux-erofs@lists.ozlabs.org, fannaihao@baidu.com, willy@infradead.org, linux-kernel@vger.kernel.org, dhowells@redhat.com, joseph.qi@linux.alibaba.com, zhangjiachen.jaycee@bytedance.com, linux-cachefs@redhat.com, gregkh@linuxfoundation.org, linux-fsdevel@vger.kernel.org, luodaowen.backend@bytedance.com, gerry@linux.alibaba.com, torvalds@linux-foundation.org Subject: Re: [PATCH v9 21/21] erofs: add 'fsid' mount option Date: Thu, 21 Apr 2022 19:59:22 +0800 [thread overview] Message-ID: <YmFHGjHkWOT7GoIm@B-P7TQMD6M-0146.local> (raw) In-Reply-To: <20220415123614.54024-22-jefflexu@linux.alibaba.com> On Fri, Apr 15, 2022 at 08:36:14PM +0800, Jeffle Xu wrote: > Introduce 'fsid' mount option to enable on-demand read sementics, in > which case, erofs will be mounted from data blobs. Users could specify > the name of primary data blob by this mount option. > > Signed-off-by: Jeffle Xu <jefflexu@linux.alibaba.com> Reviewed-by: Gao Xiang <hsiangkao@linux.alibaba.com> Thanks, Gao Xiang > --- > fs/erofs/super.c | 31 ++++++++++++++++++++++++++++++- > fs/erofs/sysfs.c | 4 ++-- > 2 files changed, 32 insertions(+), 3 deletions(-) > > diff --git a/fs/erofs/super.c b/fs/erofs/super.c > index f68ba929100d..4a623630e1c4 100644 > --- a/fs/erofs/super.c > +++ b/fs/erofs/super.c > @@ -371,6 +371,8 @@ static int erofs_read_superblock(struct super_block *sb) > > if (erofs_sb_has_ztailpacking(sbi)) > erofs_info(sb, "EXPERIMENTAL compressed inline data feature in use. Use at your own risk!"); > + if (erofs_is_fscache_mode(sb)) > + erofs_info(sb, "EXPERIMENTAL fscache-based on-demand read feature in use. Use at your own risk!"); > out: > erofs_put_metabuf(&buf); > return ret; > @@ -399,6 +401,7 @@ enum { > Opt_dax, > Opt_dax_enum, > Opt_device, > + Opt_fsid, > Opt_err > }; > > @@ -423,6 +426,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("fsid", Opt_fsid), > {} > }; > > @@ -518,6 +522,16 @@ static int erofs_fc_parse_param(struct fs_context *fc, > } > ++ctx->devs->extra_devices; > break; > + case Opt_fsid: > +#ifdef CONFIG_EROFS_FS_ONDEMAND > + kfree(ctx->opt.fsid); > + ctx->opt.fsid = kstrdup(param->string, GFP_KERNEL); > + if (!ctx->opt.fsid) > + return -ENOMEM; > +#else > + errorfc(fc, "fsid option not supported"); > +#endif > + break; > default: > return -ENOPARAM; > } > @@ -604,6 +618,7 @@ static int erofs_fc_fill_super(struct super_block *sb, struct fs_context *fc) > > sb->s_fs_info = sbi; > sbi->opt = ctx->opt; > + ctx->opt.fsid = NULL; > sbi->devs = ctx->devs; > ctx->devs = NULL; > > @@ -690,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.fsid) > + return get_tree_nodev(fc, erofs_fc_fill_super); > + > return get_tree_bdev(fc, erofs_fc_fill_super); > } > > @@ -739,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.fsid); > kfree(ctx); > } > > @@ -779,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 (erofs_is_fscache_mode(sb)) > + generic_shutdown_super(sb); > + else > + kill_block_super(sb); > > sbi = EROFS_SB(sb); > if (!sbi) > @@ -789,6 +813,7 @@ static void erofs_kill_sb(struct super_block *sb) > fs_put_dax(sbi->dax_dev); > erofs_fscache_unregister_cookie(&sbi->s_fscache); > erofs_fscache_unregister_fs(sb); > + kfree(sbi->opt.fsid); > kfree(sbi); > sb->s_fs_info = NULL; > } > @@ -938,6 +963,10 @@ static int erofs_show_options(struct seq_file *seq, struct dentry *root) > seq_puts(seq, ",dax=always"); > if (test_opt(opt, DAX_NEVER)) > seq_puts(seq, ",dax=never"); > +#ifdef CONFIG_EROFS_FS_ONDEMAND > + if (opt->fsid) > + seq_printf(seq, ",fsid=%s", opt->fsid); > +#endif > return 0; > } > > diff --git a/fs/erofs/sysfs.c b/fs/erofs/sysfs.c > index f3babf1e6608..c1383e508bbe 100644 > --- a/fs/erofs/sysfs.c > +++ b/fs/erofs/sysfs.c > @@ -205,8 +205,8 @@ int erofs_register_sysfs(struct super_block *sb) > > sbi->s_kobj.kset = &erofs_root; > init_completion(&sbi->s_kobj_unregister); > - err = kobject_init_and_add(&sbi->s_kobj, &erofs_sb_ktype, NULL, > - "%s", sb->s_id); > + err = kobject_init_and_add(&sbi->s_kobj, &erofs_sb_ktype, NULL, "%s", > + erofs_is_fscache_mode(sb) ? sbi->opt.fsid : sb->s_id); > if (err) > goto put_sb_kobj; > return 0; > -- > 2.27.0
next prev parent reply other threads:[~2022-04-21 11:59 UTC|newest] Thread overview: 96+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-04-15 12:35 [PATCH v9 00/21] fscache,erofs: fscache-based on-demand read semantics Jeffle Xu 2022-04-15 12:35 ` [PATCH v9 00/21] fscache, erofs: " Jeffle Xu 2022-04-15 12:35 ` [PATCH v9 01/21] cachefiles: extract write routine Jeffle Xu 2022-04-15 12:35 ` Jeffle Xu 2022-04-15 12:35 ` [PATCH v9 02/21] cachefiles: notify user daemon when looking up cookie Jeffle Xu 2022-04-15 12:35 ` Jeffle Xu 2022-04-15 12:35 ` [PATCH v9 03/21] cachefiles: unbind cachefiles gracefully in on-demand mode Jeffle Xu 2022-04-15 12:35 ` Jeffle Xu 2022-04-15 12:35 ` [PATCH v9 04/21] cachefiles: notify user daemon when withdrawing cookie Jeffle Xu 2022-04-15 12:35 ` Jeffle Xu 2022-04-15 12:35 ` [PATCH v9 05/21] cachefiles: implement on-demand read Jeffle Xu 2022-04-15 12:35 ` Jeffle Xu 2022-04-15 12:35 ` [PATCH v9 06/21] cachefiles: enable on-demand read mode Jeffle Xu 2022-04-15 12:35 ` Jeffle Xu 2022-04-15 12:36 ` [PATCH v9 07/21] cachefiles: add tracepoints for " Jeffle Xu 2022-04-15 12:36 ` Jeffle Xu 2022-04-15 12:36 ` [PATCH v9 08/21] cachefiles: document " Jeffle Xu 2022-04-15 12:36 ` Jeffle Xu 2022-04-15 12:36 ` [PATCH v9 09/21] erofs: make erofs_map_blocks() generally available Jeffle Xu 2022-04-15 12:36 ` Jeffle Xu 2022-04-15 12:36 ` [PATCH v9 10/21] erofs: add fscache mode check helper Jeffle Xu 2022-04-15 12:36 ` Jeffle Xu 2022-04-21 7:53 ` Gao Xiang 2022-04-21 7:53 ` Gao Xiang 2022-04-15 12:36 ` [PATCH v9 11/21] erofs: register fscache volume Jeffle Xu 2022-04-15 12:36 ` Jeffle Xu 2022-04-15 12:36 ` [PATCH v9 12/21] erofs: add fscache context helper functions Jeffle Xu 2022-04-15 12:36 ` Jeffle Xu 2022-04-15 12:36 ` [PATCH v9 13/21] erofs: add anonymous inode caching metadata for data blobs Jeffle Xu 2022-04-15 12:36 ` Jeffle Xu 2022-04-15 12:36 ` [PATCH v9 14/21] erofs: add erofs_fscache_read_folios() helper Jeffle Xu 2022-04-15 12:36 ` Jeffle Xu 2022-04-15 12:36 ` [PATCH v9 15/21] erofs: register fscache context for primary data blob Jeffle Xu 2022-04-15 12:36 ` Jeffle Xu 2022-04-15 12:36 ` [PATCH v9 16/21] erofs: register fscache context for extra data blobs Jeffle Xu 2022-04-15 12:36 ` Jeffle Xu 2022-04-21 10:58 ` Gao Xiang 2022-04-21 10:58 ` Gao Xiang 2022-04-15 12:36 ` [PATCH v9 17/21] erofs: implement fscache-based metadata read Jeffle Xu 2022-04-15 12:36 ` Jeffle Xu 2022-04-21 13:03 ` Gao Xiang 2022-04-21 13:03 ` Gao Xiang 2022-04-15 12:36 ` [PATCH v9 18/21] erofs: implement fscache-based data read for non-inline layout Jeffle Xu 2022-04-15 12:36 ` Jeffle Xu 2022-04-21 11:13 ` Gao Xiang 2022-04-21 11:13 ` Gao Xiang 2022-04-15 12:36 ` [PATCH v9 19/21] erofs: implement fscache-based data read for inline layout Jeffle Xu 2022-04-15 12:36 ` Jeffle Xu 2022-04-21 11:14 ` Gao Xiang 2022-04-21 11:14 ` Gao Xiang 2022-04-15 12:36 ` [PATCH v9 20/21] erofs: implement fscache-based data readahead Jeffle Xu 2022-04-15 12:36 ` Jeffle Xu 2022-04-21 11:51 ` Gao Xiang 2022-04-21 11:51 ` Gao Xiang 2022-04-15 12:36 ` [PATCH v9 21/21] erofs: add 'fsid' mount option Jeffle Xu 2022-04-15 12:36 ` Jeffle Xu 2022-04-21 11:59 ` Gao Xiang [this message] 2022-04-21 11:59 ` Gao Xiang 2022-04-20 8:52 ` [PATCH v9 00/21] fscache, erofs: fscache-based on-demand read semantics JiaZhu 2022-04-20 8:52 ` JiaZhu 2022-04-21 13:24 ` [PATCH v9 01/21] cachefiles: extract write routine David Howells 2022-04-21 13:24 ` David Howells 2022-04-21 13:57 ` [PATCH v9 02/21] cachefiles: notify user daemon when looking up cookie David Howells 2022-04-21 13:57 ` David Howells 2022-04-21 14:47 ` JeffleXu 2022-04-21 14:47 ` JeffleXu 2022-04-21 14:02 ` [PATCH v9 03/21] cachefiles: unbind cachefiles gracefully in on-demand mode David Howells 2022-04-21 14:02 ` David Howells 2022-04-22 2:44 ` JeffleXu 2022-04-22 2:44 ` JeffleXu 2022-04-21 14:05 ` [PATCH v9 04/21] cachefiles: notify user daemon when withdrawing cookie David Howells 2022-04-21 14:05 ` David Howells 2022-04-21 14:57 ` JeffleXu 2022-04-21 14:57 ` JeffleXu 2022-04-21 14:14 ` [PATCH v9 05/21] cachefiles: implement on-demand read David Howells 2022-04-21 14:14 ` David Howells 2022-04-21 15:00 ` JeffleXu 2022-04-21 15:00 ` JeffleXu 2022-04-21 14:17 ` [PATCH v9 06/21] cachefiles: enable on-demand read mode David Howells 2022-04-21 14:17 ` David Howells 2022-04-21 15:11 ` JeffleXu 2022-04-21 15:11 ` JeffleXu 2022-04-21 14:19 ` [PATCH v9 07/21] cachefiles: add tracepoints for " David Howells 2022-04-21 14:19 ` David Howells 2022-04-21 14:47 ` [PATCH v9 08/21] cachefiles: document " David Howells 2022-04-21 14:47 ` David Howells 2022-04-22 3:10 ` JeffleXu 2022-04-22 3:10 ` JeffleXu 2022-04-21 14:54 ` EMFILE/ENFILE mitigation needed in erofs? David Howells 2022-04-21 14:54 ` David Howells 2022-04-21 16:14 ` JeffleXu 2022-04-21 16:14 ` JeffleXu 2022-04-21 17:57 ` David Howells 2022-04-21 17:57 ` David Howells 2022-04-21 18:16 ` Gao Xiang 2022-04-21 18:16 ` Gao Xiang
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=YmFHGjHkWOT7GoIm@B-P7TQMD6M-0146.local \ --to=hsiangkao@linux.alibaba.com \ --cc=bo.liu@linux.alibaba.com \ --cc=chao@kernel.org \ --cc=dhowells@redhat.com \ --cc=eguan@linux.alibaba.com \ --cc=fannaihao@baidu.com \ --cc=gerry@linux.alibaba.com \ --cc=gregkh@linuxfoundation.org \ --cc=jefflexu@linux.alibaba.com \ --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=tao.peng@linux.alibaba.com \ --cc=tianzichen@kuaishou.com \ --cc=torvalds@linux-foundation.org \ --cc=willy@infradead.org \ --cc=xiang@kernel.org \ --cc=zhangjiachen.jaycee@bytedance.com \ /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.