From: Gao Xiang <xiang@kernel.org>
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
Subject: Re: [PATCH v8 20/20] erofs: add 'fsid' mount option
Date: Thu, 7 Apr 2022 22:39:36 +0800 [thread overview]
Message-ID: <Yk73qB7j1tz+tJhE@debian> (raw)
In-Reply-To: <20220406075612.60298-21-jefflexu@linux.alibaba.com>
On Wed, Apr 06, 2022 at 03:56:12PM +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>
> ---
> fs/erofs/super.c | 48 ++++++++++++++++++++++++++++++++++++++++++------
> 1 file changed, 42 insertions(+), 6 deletions(-)
>
> diff --git a/fs/erofs/super.c b/fs/erofs/super.c
> index a5e4de60a0d8..292b4a70ce19 100644
> --- a/fs/erofs/super.c
> +++ b/fs/erofs/super.c
> @@ -398,6 +398,7 @@ enum {
> Opt_dax,
> Opt_dax_enum,
> Opt_device,
> + Opt_fsid,
> Opt_err
> };
>
> @@ -422,6 +423,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),
> {}
> };
>
> @@ -517,6 +519,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;
> }
> @@ -597,9 +609,14 @@ static int erofs_fc_fill_super(struct super_block *sb, struct fs_context *fc)
> sb->s_maxbytes = MAX_LFS_FILESIZE;
> sb->s_op = &erofs_sops;
>
> - if (!sb_set_blocksize(sb, EROFS_BLKSIZ)) {
> - erofs_err(sb, "failed to set erofs blksize");
> - return -EINVAL;
> + if (erofs_is_fscache_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);
> @@ -608,7 +625,7 @@ 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);
> + ctx->opt.fsid = NULL;
> sbi->devs = ctx->devs;
> ctx->devs = NULL;
>
> @@ -625,6 +642,8 @@ static int erofs_fc_fill_super(struct super_block *sb, struct fs_context *fc)
> err = super_setup_bdi(sb);
> if (err)
> return err;
> + } else {
> + sbi->dax_dev = fs_dax_get_by_bdev(sb->s_bdev, &sbi->dax_part_off);
It should go with the previous patch? And even over long line here.
Thanks,
Gao Xiang
> }
>
> err = erofs_read_superblock(sb);
> @@ -684,6 +703,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);
> }
>
> @@ -733,6 +757,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);
> }
>
> @@ -773,7 +798,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)
> @@ -783,6 +811,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;
> }
> @@ -884,7 +913,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 (!erofs_is_fscache_mode(sb))
> + id = huge_encode_dev(sb->s_bdev->bd_dev);
>
> buf->f_type = sb->s_magic;
> buf->f_bsize = EROFS_BLKSIZ;
> @@ -929,6 +961,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;
> }
>
> --
> 2.27.0
>
next prev parent reply other threads:[~2022-04-07 14:39 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-06 7:55 [PATCH v8 00/20] fscache,erofs: fscache-based on-demand read semantics Jeffle Xu
2022-04-06 7:55 ` [PATCH v8 01/20] cachefiles: unmark inode in use in error path Jeffle Xu
2022-04-06 7:55 ` [PATCH v8 02/20] cachefiles: extract write routine Jeffle Xu
2022-04-06 7:55 ` [PATCH v8 03/20] cachefiles: notify user daemon with anon_fd when looking up cookie Jeffle Xu
2022-04-06 7:55 ` [PATCH v8 04/20] cachefiles: notify user daemon when withdrawing cookie Jeffle Xu
2022-04-06 7:55 ` [PATCH v8 05/20] cachefiles: implement on-demand read Jeffle Xu
2022-04-06 7:55 ` [PATCH v8 06/20] cachefiles: enable on-demand read mode Jeffle Xu
2022-04-06 7:55 ` [PATCH v8 07/20] cachefiles: document " Jeffle Xu
2022-04-06 7:56 ` [PATCH v8 08/20] erofs: make erofs_map_blocks() generally available Jeffle Xu
2022-04-07 2:44 ` Gao Xiang
2022-04-06 7:56 ` [PATCH v8 09/20] erofs: add mode checking helper Jeffle Xu
2022-04-07 2:46 ` Gao Xiang
2022-04-06 7:56 ` [PATCH v8 10/20] erofs: register fscache volume Jeffle Xu
2022-04-07 2:50 ` Gao Xiang
2022-04-06 7:56 ` [PATCH v8 11/20] erofs: add fscache context helper functions Jeffle Xu
2022-04-07 3:25 ` Gao Xiang
2022-04-06 7:56 ` [PATCH v8 12/20] erofs: add anonymous inode managing page cache for data blob Jeffle Xu
2022-04-07 5:31 ` Gao Xiang
2022-04-08 2:14 ` JeffleXu
2022-04-06 7:56 ` [PATCH v8 13/20] erofs: add erofs_fscache_read_folios() helper Jeffle Xu
2022-04-07 14:05 ` Gao Xiang
2022-04-06 7:56 ` [PATCH v8 14/20] erofs: register fscache context for primary data blob Jeffle Xu
2022-04-07 14:09 ` Gao Xiang
2022-04-06 7:56 ` [PATCH v8 15/20] erofs: register fscache context for extra data blobs Jeffle Xu
2022-04-07 14:15 ` Gao Xiang
2022-04-08 2:11 ` JeffleXu
2022-04-06 7:56 ` [PATCH v8 16/20] erofs: implement fscache-based metadata read Jeffle Xu
2022-04-07 14:19 ` Gao Xiang
2022-04-06 7:56 ` [PATCH v8 17/20] erofs: implement fscache-based data read for non-inline layout Jeffle Xu
2022-04-07 14:24 ` Gao Xiang
2022-04-06 7:56 ` [PATCH v8 18/20] erofs: implement fscache-based data read for inline layout Jeffle Xu
2022-04-07 14:31 ` Gao Xiang
2022-04-06 7:56 ` [PATCH v8 19/20] erofs: implement fscache-based data readahead Jeffle Xu
2022-04-07 14:36 ` Gao Xiang
2022-04-06 7:56 ` [PATCH v8 20/20] erofs: add 'fsid' mount option Jeffle Xu
2022-04-07 14:39 ` Gao Xiang [this message]
2022-04-10 12:51 ` [PATCH v8 00/20] fscache,erofs: fscache-based on-demand read semantics Gao Xiang
2022-04-13 12:27 ` 田子晨
2022-04-14 8:10 ` Jiachen Zhang
2022-04-14 9:29 ` Gao Xiang
2022-04-11 12:13 ` [PATCH v8 02/20] cachefiles: extract write routine David Howells
2022-04-11 12:29 ` JeffleXu
2022-04-11 12:28 ` [PATCH v8 03/20] cachefiles: notify user daemon with anon_fd when looking up cookie David Howells
2022-04-11 12:36 ` JeffleXu
2022-04-11 12:32 ` David Howells
2022-04-11 12:36 ` JeffleXu
2022-04-11 12:35 ` [PATCH v8 04/20] cachefiles: notify user daemon when withdrawing cookie David Howells
2022-04-11 12:48 ` JeffleXu
2022-04-11 13:42 ` David Howells
2022-04-12 3:35 ` JeffleXu
2022-04-11 12:44 ` [PATCH v8 05/20] cachefiles: implement on-demand read David Howells
2022-04-11 12:50 ` JeffleXu
2022-04-11 13:38 ` [PATCH v8 07/20] cachefiles: document on-demand read mode David Howells
2022-04-12 3:17 ` JeffleXu
2022-04-11 13:43 ` [PATCH v8 00/20] fscache,erofs: fscache-based on-demand read semantics David Howells
2022-04-12 3:18 ` JeffleXu
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=Yk73qB7j1tz+tJhE@debian \
--to=xiang@kernel.org \
--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 \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).