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 15/20] erofs: register fscache context for extra data blobs
Date: Thu, 7 Apr 2022 22:15:38 +0800 [thread overview]
Message-ID: <Yk7yCp2fwnbXeyuI@debian> (raw)
In-Reply-To: <20220406075612.60298-16-jefflexu@linux.alibaba.com>
On Wed, Apr 06, 2022 at 03:56:07PM +0800, Jeffle Xu wrote:
> Similar to the multi device mode, erofs could be mounted from one
> primary data blob (mandatory) and multiple extra data blobs (optional).
>
> Register fscache context for each extra data blob.
>
> Signed-off-by: Jeffle Xu <jefflexu@linux.alibaba.com>
> ---
> fs/erofs/data.c | 3 +++
> fs/erofs/internal.h | 2 ++
> fs/erofs/super.c | 25 +++++++++++++++++--------
> 3 files changed, 22 insertions(+), 8 deletions(-)
>
> diff --git a/fs/erofs/data.c b/fs/erofs/data.c
> index bc22642358ec..14b64d960541 100644
> --- a/fs/erofs/data.c
> +++ b/fs/erofs/data.c
> @@ -199,6 +199,7 @@ int erofs_map_dev(struct super_block *sb, struct erofs_map_dev *map)
> map->m_bdev = sb->s_bdev;
> map->m_daxdev = EROFS_SB(sb)->dax_dev;
> map->m_dax_part_off = EROFS_SB(sb)->dax_part_off;
> + map->m_fscache = EROFS_SB(sb)->s_fscache;
>
> if (map->m_deviceid) {
> down_read(&devs->rwsem);
> @@ -210,6 +211,7 @@ int erofs_map_dev(struct super_block *sb, struct erofs_map_dev *map)
> map->m_bdev = dif->bdev;
> map->m_daxdev = dif->dax_dev;
> map->m_dax_part_off = dif->dax_part_off;
> + map->m_fscache = dif->fscache;
> up_read(&devs->rwsem);
> } else if (devs->extra_devices) {
> down_read(&devs->rwsem);
> @@ -227,6 +229,7 @@ int erofs_map_dev(struct super_block *sb, struct erofs_map_dev *map)
> map->m_bdev = dif->bdev;
> map->m_daxdev = dif->dax_dev;
> map->m_dax_part_off = dif->dax_part_off;
> + map->m_fscache = dif->fscache;
> break;
> }
> }
> diff --git a/fs/erofs/internal.h b/fs/erofs/internal.h
> index eb37b33bce37..90f7d6286a4f 100644
> --- a/fs/erofs/internal.h
> +++ b/fs/erofs/internal.h
> @@ -49,6 +49,7 @@ typedef u32 erofs_blk_t;
>
> struct erofs_device_info {
> char *path;
> + struct erofs_fscache *fscache;
> struct block_device *bdev;
> struct dax_device *dax_dev;
> u64 dax_part_off;
> @@ -482,6 +483,7 @@ static inline int z_erofs_map_blocks_iter(struct inode *inode,
> #endif /* !CONFIG_EROFS_FS_ZIP */
>
> struct erofs_map_dev {
> + struct erofs_fscache *m_fscache;
> struct block_device *m_bdev;
> struct dax_device *m_daxdev;
> u64 m_dax_part_off;
> diff --git a/fs/erofs/super.c b/fs/erofs/super.c
> index 9498b899b73b..8c7181cd37e6 100644
> --- a/fs/erofs/super.c
> +++ b/fs/erofs/super.c
> @@ -259,15 +259,23 @@ 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)) {
> + err = erofs_fscache_register_cookie(sb, &dif->fscache,
> + dif->path, false);
> + if (err)
> + break;
> + } else {
> + 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);
Overly long line, please help split into 2 lines if possible.
Otherwise looks good,
Reviewed-by: Gao Xiang <hsiangkao@linux.alibaba.com>
Thanks,
Gao Xiang
> }
> - 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;
> @@ -701,6 +709,7 @@ static int erofs_release_device_info(int id, void *ptr, void *data)
> fs_put_dax(dif->dax_dev);
> if (dif->bdev)
> blkdev_put(dif->bdev, FMODE_READ | FMODE_EXCL);
> + erofs_fscache_unregister_cookie(&dif->fscache);
> kfree(dif->path);
> kfree(dif);
> return 0;
> --
> 2.27.0
>
next prev parent reply other threads:[~2022-04-07 14:15 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 [this message]
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
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=Yk7yCp2fwnbXeyuI@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).