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
Subject: [PATCH v4 21/21] erofs: add 'uuid' mount option
Date: Mon, 7 Mar 2022 20:33:05 +0800 [thread overview]
Message-ID: <20220307123305.79520-22-jefflexu@linux.alibaba.com> (raw)
In-Reply-To: <20220307123305.79520-1-jefflexu@linux.alibaba.com>
Introduce 'uuid' 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 path 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, 37 insertions(+), 7 deletions(-)
diff --git a/fs/erofs/super.c b/fs/erofs/super.c
index 2942029a7049..8bc4b782f9a9 100644
--- a/fs/erofs/super.c
+++ b/fs/erofs/super.c
@@ -400,6 +400,7 @@ enum {
Opt_dax,
Opt_dax_enum,
Opt_device,
+ Opt_uuid,
Opt_err
};
@@ -424,6 +425,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("uuid", Opt_uuid),
{}
};
@@ -519,6 +521,12 @@ static int erofs_fc_parse_param(struct fs_context *fc,
}
++ctx->devs->extra_devices;
break;
+ case Opt_uuid:
+ kfree(ctx->opt.uuid);
+ ctx->opt.uuid = kstrdup(param->string, GFP_KERNEL);
+ if (!ctx->opt.uuid)
+ return -ENOMEM;
+ break;
default:
return -ENOPARAM;
}
@@ -593,9 +601,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 (erofs_bdev_mode(sb)) {
+ if (!sb_set_blocksize(sb, EROFS_BLKSIZ)) {
+ erofs_err(sb, "failed to set erofs blksize");
+ return -EINVAL;
+ }
+ } else {
+ sb->s_blocksize = EROFS_BLKSIZ;
+ sb->s_blocksize_bits = LOG_BLOCK_SIZE;
}
sbi = kzalloc(sizeof(*sbi), GFP_KERNEL);
@@ -604,11 +617,12 @@ 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;
- if (!erofs_bdev_mode(sb)) {
+ if (erofs_bdev_mode(sb)) {
+ sbi->dax_dev = fs_dax_get_by_bdev(sb->s_bdev, &sbi->dax_part_off);
+ } else {
struct erofs_fscache_context *bootstrap;
bootstrap = erofs_fscache_get_ctx(sb, ctx->opt.uuid, true);
@@ -620,6 +634,8 @@ 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;
}
err = erofs_read_superblock(sb);
@@ -682,6 +698,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 (ctx->opt.uuid)
+ return get_tree_nodev(fc, erofs_fc_fill_super);
+
return get_tree_bdev(fc, erofs_fc_fill_super);
}
@@ -731,6 +752,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.uuid);
kfree(ctx);
}
@@ -771,7 +793,10 @@ static void erofs_kill_sb(struct super_block *sb)
WARN_ON(sb->s_magic != EROFS_SUPER_MAGIC);
- kill_block_super(sb);
+ if (erofs_bdev_mode(sb))
+ kill_block_super(sb);
+ else
+ generic_shutdown_super(sb);
sbi = EROFS_SB(sb);
if (!sbi)
@@ -889,7 +914,12 @@ 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;
+
+ if (erofs_bdev_mode(sb))
+ id = huge_encode_dev(sb->s_bdev->bd_dev);
+ else
+ id = 0; /* TODO */
buf->f_type = sb->s_magic;
buf->f_bsize = EROFS_BLKSIZ;
--
2.27.0
next prev parent reply other threads:[~2022-03-07 12:34 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-07 12:32 [PATCH v4 00/21] fscache,erofs: fscache-based on-demand read semantics Jeffle Xu
2022-03-07 12:32 ` [PATCH v4 01/21] fscache: export fscache_end_operation() Jeffle Xu
2022-03-07 12:32 ` [PATCH v4 02/21] cachefiles: export write routine Jeffle Xu
2022-03-07 12:32 ` [PATCH v4 03/21] cachefiles: introduce on-demand read mode Jeffle Xu
2022-03-07 12:32 ` [PATCH v4 04/21] cachefiles: notify user daemon with anon_fd when opening cache file Jeffle Xu
2022-03-07 12:32 ` [PATCH v4 05/21] cachefiles: implement on-demand read Jeffle Xu
2022-03-07 12:32 ` [PATCH v4 06/21] cachefiles: document on-demand read mode Jeffle Xu
2022-03-07 12:32 ` [PATCH v4 07/21] erofs: use meta buffers for erofs_read_superblock() Jeffle Xu
2022-03-11 7:36 ` Chao Yu
2022-03-07 12:32 ` [PATCH v4 08/21] erofs: export erofs_map_blocks() Jeffle Xu
2022-03-07 12:32 ` [PATCH v4 09/21] erofs: add mode checking helper Jeffle Xu
2022-03-07 12:32 ` [PATCH v4 10/21] erofs: register global fscache volume Jeffle Xu
2022-03-07 12:32 ` [PATCH v4 11/21] erofs: add cookie context helper functions Jeffle Xu
2022-03-07 12:32 ` [PATCH v4 12/21] erofs: add anonymous inode managing page cache of blob file Jeffle Xu
2022-03-07 12:32 ` [PATCH v4 13/21] erofs: add erofs_fscache_read_pages() helper Jeffle Xu
2022-03-07 12:32 ` [PATCH v4 14/21] erofs: register cookie context for bootstrap blob Jeffle Xu
2022-03-07 12:32 ` [PATCH v4 15/21] erofs: implement fscache-based metadata read Jeffle Xu
2022-03-07 12:33 ` [PATCH v4 16/21] erofs: implement fscache-based data read for non-inline layout Jeffle Xu
2022-03-07 12:33 ` [PATCH v4 17/21] erofs: implement fscache-based data read for inline layout Jeffle Xu
2022-03-07 12:33 ` [PATCH v4 18/21] erofs: register cookie context for data blobs Jeffle Xu
2022-03-07 12:33 ` [PATCH v4 19/21] erofs: implement fscache-based data read " Jeffle Xu
2022-03-07 12:33 ` [PATCH v4 20/21] erofs: implement fscache-based data readahead Jeffle Xu
2022-03-07 12:33 ` Jeffle Xu [this message]
2022-03-14 9:24 ` [PATCH v4 00/21] fscache,erofs: fscache-based on-demand read semantics luodaowen.backend
2022-03-18 9:42 ` Fan,Naihao
2022-03-18 11:48 ` 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=20220307123305.79520-22-jefflexu@linux.alibaba.com \
--to=jefflexu@linux.alibaba.com \
--cc=bo.liu@linux.alibaba.com \
--cc=chao@kernel.org \
--cc=dhowells@redhat.com \
--cc=eguan@linux.alibaba.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=tao.peng@linux.alibaba.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: 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