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, willy@infradead.org, linux-kernel@vger.kernel.org, tianzichen@kuaishou.com, joseph.qi@linux.alibaba.com, zhangjiachen.jaycee@bytedance.com, linux-fsdevel@vger.kernel.org, luodaowen.backend@bytedance.com, gerry@linux.alibaba.com, torvalds@linux-foundation.org, yinxin.x@bytedance.com Subject: [PATCH v11 10/22] erofs: add fscache mode check helper Date: Mon, 9 May 2022 15:40:16 +0800 [thread overview] Message-ID: <20220509074028.74954-11-jefflexu@linux.alibaba.com> (raw) In-Reply-To: <20220509074028.74954-1-jefflexu@linux.alibaba.com> Until then erofs is exactly blockdev based filesystem. A new fscache-based mode is going to be introduced for erofs to support scenarios where on-demand read semantics is needed, e.g. container image distribution. In this case, erofs could be mounted from data blobs through fscache. Add a helper checking which mode erofs works in, and twist the code in preparation for the upcoming fscache mode. Signed-off-by: Jeffle Xu <jefflexu@linux.alibaba.com> Reviewed-by: Gao Xiang <hsiangkao@linux.alibaba.com> --- fs/erofs/internal.h | 5 +++++ fs/erofs/super.c | 44 +++++++++++++++++++++++++++++--------------- 2 files changed, 34 insertions(+), 15 deletions(-) diff --git a/fs/erofs/internal.h b/fs/erofs/internal.h index fe9564e5091e..05a97533b1e9 100644 --- a/fs/erofs/internal.h +++ b/fs/erofs/internal.h @@ -161,6 +161,11 @@ struct erofs_sb_info { #define set_opt(opt, option) ((opt)->mount_opt |= EROFS_MOUNT_##option) #define test_opt(opt, option) ((opt)->mount_opt & EROFS_MOUNT_##option) +static inline bool erofs_is_fscache_mode(struct super_block *sb) +{ + return IS_ENABLED(CONFIG_EROFS_FS_ONDEMAND) && !sb->s_bdev; +} + enum { EROFS_ZIP_CACHE_DISABLED, EROFS_ZIP_CACHE_READAHEAD, diff --git a/fs/erofs/super.c b/fs/erofs/super.c index 0c4b41130c2f..724d5ff0d78c 100644 --- a/fs/erofs/super.c +++ b/fs/erofs/super.c @@ -259,15 +259,19 @@ static int erofs_init_devices(struct super_block *sb, } dis = ptr + erofs_blkoff(pos); - bdev = blkdev_get_by_path(dif->path, - FMODE_READ | FMODE_EXCL, - sb->s_type); - if (IS_ERR(bdev)) { - err = PTR_ERR(bdev); - break; + if (!erofs_is_fscache_mode(sb)) { + bdev = blkdev_get_by_path(dif->path, + FMODE_READ | FMODE_EXCL, + sb->s_type); + if (IS_ERR(bdev)) { + err = PTR_ERR(bdev); + break; + } + dif->bdev = bdev; + dif->dax_dev = fs_dax_get_by_bdev(bdev, + &dif->dax_part_off); } - dif->bdev = bdev; - dif->dax_dev = fs_dax_get_by_bdev(bdev, &dif->dax_part_off); + dif->blocks = le32_to_cpu(dis->blocks); dif->mapped_blkaddr = le32_to_cpu(dis->mapped_blkaddr); sbi->total_blocks += dif->blocks; @@ -586,21 +590,28 @@ 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; - } - sbi = kzalloc(sizeof(*sbi), GFP_KERNEL); if (!sbi) return -ENOMEM; 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_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->dax_dev = fs_dax_get_by_bdev(sb->s_bdev, + &sbi->dax_part_off); + } + err = erofs_read_superblock(sb); if (err) return err; @@ -857,7 +868,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; -- 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, yinxin.x@bytedance.com, zhangjiachen.jaycee@bytedance.com, zhujia.zj@bytedance.com Subject: [PATCH v11 10/22] erofs: add fscache mode check helper Date: Mon, 9 May 2022 15:40:16 +0800 [thread overview] Message-ID: <20220509074028.74954-11-jefflexu@linux.alibaba.com> (raw) In-Reply-To: <20220509074028.74954-1-jefflexu@linux.alibaba.com> Until then erofs is exactly blockdev based filesystem. A new fscache-based mode is going to be introduced for erofs to support scenarios where on-demand read semantics is needed, e.g. container image distribution. In this case, erofs could be mounted from data blobs through fscache. Add a helper checking which mode erofs works in, and twist the code in preparation for the upcoming fscache mode. Signed-off-by: Jeffle Xu <jefflexu@linux.alibaba.com> Reviewed-by: Gao Xiang <hsiangkao@linux.alibaba.com> --- fs/erofs/internal.h | 5 +++++ fs/erofs/super.c | 44 +++++++++++++++++++++++++++++--------------- 2 files changed, 34 insertions(+), 15 deletions(-) diff --git a/fs/erofs/internal.h b/fs/erofs/internal.h index fe9564e5091e..05a97533b1e9 100644 --- a/fs/erofs/internal.h +++ b/fs/erofs/internal.h @@ -161,6 +161,11 @@ struct erofs_sb_info { #define set_opt(opt, option) ((opt)->mount_opt |= EROFS_MOUNT_##option) #define test_opt(opt, option) ((opt)->mount_opt & EROFS_MOUNT_##option) +static inline bool erofs_is_fscache_mode(struct super_block *sb) +{ + return IS_ENABLED(CONFIG_EROFS_FS_ONDEMAND) && !sb->s_bdev; +} + enum { EROFS_ZIP_CACHE_DISABLED, EROFS_ZIP_CACHE_READAHEAD, diff --git a/fs/erofs/super.c b/fs/erofs/super.c index 0c4b41130c2f..724d5ff0d78c 100644 --- a/fs/erofs/super.c +++ b/fs/erofs/super.c @@ -259,15 +259,19 @@ static int erofs_init_devices(struct super_block *sb, } dis = ptr + erofs_blkoff(pos); - bdev = blkdev_get_by_path(dif->path, - FMODE_READ | FMODE_EXCL, - sb->s_type); - if (IS_ERR(bdev)) { - err = PTR_ERR(bdev); - break; + if (!erofs_is_fscache_mode(sb)) { + bdev = blkdev_get_by_path(dif->path, + FMODE_READ | FMODE_EXCL, + sb->s_type); + if (IS_ERR(bdev)) { + err = PTR_ERR(bdev); + break; + } + dif->bdev = bdev; + dif->dax_dev = fs_dax_get_by_bdev(bdev, + &dif->dax_part_off); } - dif->bdev = bdev; - dif->dax_dev = fs_dax_get_by_bdev(bdev, &dif->dax_part_off); + dif->blocks = le32_to_cpu(dis->blocks); dif->mapped_blkaddr = le32_to_cpu(dis->mapped_blkaddr); sbi->total_blocks += dif->blocks; @@ -586,21 +590,28 @@ 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; - } - sbi = kzalloc(sizeof(*sbi), GFP_KERNEL); if (!sbi) return -ENOMEM; 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_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->dax_dev = fs_dax_get_by_bdev(sb->s_bdev, + &sbi->dax_part_off); + } + err = erofs_read_superblock(sb); if (err) return err; @@ -857,7 +868,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; -- 2.27.0
next prev parent reply other threads:[~2022-05-09 7:41 UTC|newest] Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-05-09 7:40 [PATCH v11 00/22] fscache, erofs: fscache-based on-demand read semantics Jeffle Xu 2022-05-09 7:40 ` [PATCH v11 00/22] fscache,erofs: " Jeffle Xu 2022-05-09 7:40 ` [PATCH v11 01/22] cachefiles: extract write routine Jeffle Xu 2022-05-09 7:40 ` Jeffle Xu 2022-05-09 7:40 ` [PATCH v11 02/22] cachefiles: notify the user daemon when looking up cookie Jeffle Xu 2022-05-09 7:40 ` Jeffle Xu 2022-05-09 7:40 ` [PATCH v11 03/22] cachefiles: unbind cachefiles gracefully in on-demand mode Jeffle Xu 2022-05-09 7:40 ` Jeffle Xu 2022-05-09 7:40 ` [PATCH v11 04/22] cachefiles: notify the user daemon when withdrawing cookie Jeffle Xu 2022-05-09 7:40 ` Jeffle Xu 2022-05-09 7:40 ` [PATCH v11 05/22] cachefiles: implement on-demand read Jeffle Xu 2022-05-09 7:40 ` Jeffle Xu 2022-05-09 7:40 ` [PATCH v11 06/22] cachefiles: enable on-demand read mode Jeffle Xu 2022-05-09 7:40 ` Jeffle Xu 2022-05-09 7:40 ` [PATCH v11 07/22] cachefiles: add tracepoints for " Jeffle Xu 2022-05-09 7:40 ` Jeffle Xu 2022-05-09 7:40 ` [PATCH v11 08/22] cachefiles: document " Jeffle Xu 2022-05-09 7:40 ` Jeffle Xu 2022-05-09 7:40 ` [PATCH v11 09/22] erofs: make erofs_map_blocks() generally available Jeffle Xu 2022-05-09 7:40 ` Jeffle Xu 2022-05-09 7:40 ` Jeffle Xu [this message] 2022-05-09 7:40 ` [PATCH v11 10/22] erofs: add fscache mode check helper Jeffle Xu 2022-05-09 7:40 ` [PATCH v11 11/22] erofs: register fscache volume Jeffle Xu 2022-05-09 7:40 ` Jeffle Xu 2022-05-09 7:40 ` [PATCH v11 12/22] erofs: add fscache context helper functions Jeffle Xu 2022-05-09 7:40 ` Jeffle Xu 2022-05-09 7:40 ` [PATCH v11 13/22] erofs: add anonymous inode caching metadata for data blobs Jeffle Xu 2022-05-09 7:40 ` Jeffle Xu 2022-05-09 7:40 ` [PATCH v11 14/22] erofs: add erofs_fscache_read_folios() helper Jeffle Xu 2022-05-09 7:40 ` Jeffle Xu 2022-05-09 7:40 ` [PATCH v11 15/22] erofs: register fscache context for primary data blob Jeffle Xu 2022-05-09 7:40 ` Jeffle Xu 2022-05-09 7:40 ` [PATCH v11 16/22] erofs: register fscache context for extra data blobs Jeffle Xu 2022-05-09 7:40 ` Jeffle Xu 2022-05-09 7:40 ` [PATCH v11 17/22] erofs: implement fscache-based metadata read Jeffle Xu 2022-05-09 7:40 ` Jeffle Xu 2022-05-09 7:40 ` [PATCH v11 18/22] erofs: implement fscache-based data read for non-inline layout Jeffle Xu 2022-05-09 7:40 ` Jeffle Xu 2022-05-09 7:40 ` [PATCH v11 19/22] erofs: implement fscache-based data read for inline layout Jeffle Xu 2022-05-09 7:40 ` Jeffle Xu 2022-05-09 7:40 ` [PATCH v11 20/22] erofs: implement fscache-based data readahead Jeffle Xu 2022-05-09 7:40 ` Jeffle Xu 2022-05-09 7:40 ` [PATCH v11 21/22] erofs: add 'fsid' mount option Jeffle Xu 2022-05-09 7:40 ` Jeffle Xu 2022-05-09 7:40 ` [PATCH v11 22/22] erofs: change to use asynchronous io for fscache readpage/readahead Jeffle Xu 2022-05-09 7:40 ` Jeffle Xu 2022-05-10 6:48 ` [PATCH v11 00/22] fscache, erofs: fscache-based on-demand read semantics 严松 2022-05-10 6:48 ` 严松 via Linux-erofs 2022-05-10 12:50 ` [PATCH v11 02/22] cachefiles: notify the user daemon when looking up cookie David Howells 2022-05-10 12:50 ` David Howells 2022-05-10 12:53 ` [PATCH v11 03/22] cachefiles: unbind cachefiles gracefully in on-demand mode David Howells 2022-05-10 12:53 ` David Howells 2022-05-10 12:56 ` [PATCH v11 06/22] cachefiles: enable on-demand read mode David Howells 2022-05-10 12:56 ` David Howells 2022-05-10 13:29 ` Gao Xiang 2022-05-10 13:29 ` Gao Xiang 2022-05-10 13:01 ` [PATCH v11 08/22] cachefiles: document " David Howells 2022-05-10 13:01 ` David Howells 2022-05-10 14:14 ` [PATCH v11 00/22] fscache,erofs: fscache-based on-demand read semantics Chao Yu 2022-05-10 14:14 ` Chao Yu
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=20220509074028.74954-11-jefflexu@linux.alibaba.com \ --to=jefflexu@linux.alibaba.com \ --cc=chao@kernel.org \ --cc=dhowells@redhat.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 \ --cc=yinxin.x@bytedance.com \ --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.