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 Subject: [PATCH v5 19/22] erofs: register cookie context for data blobs Date: Wed, 16 Mar 2022 21:17:20 +0800 [thread overview] Message-ID: <20220316131723.111553-20-jefflexu@linux.alibaba.com> (raw) In-Reply-To: <20220316131723.111553-1-jefflexu@linux.alibaba.com> Similar to the multi device mode, erofs could be mounted from multiple blob files (one bootstrap blob file and optional multiple data blob files). In this case, each device slot contains the path of corresponding data blob file. This patch registers corresponding cookie context for each data blob file. Signed-off-by: Jeffle Xu <jefflexu@linux.alibaba.com> --- fs/erofs/internal.h | 1 + fs/erofs/super.c | 27 +++++++++++++++++++-------- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/fs/erofs/internal.h b/fs/erofs/internal.h index f94a921eff98..d93de8b6ff44 100644 --- a/fs/erofs/internal.h +++ b/fs/erofs/internal.h @@ -53,6 +53,7 @@ struct erofs_device_info { struct block_device *bdev; struct dax_device *dax_dev; u64 dax_part_off; + struct erofs_fscache_context *ctx; u32 blocks; u32 mapped_blkaddr; diff --git a/fs/erofs/super.c b/fs/erofs/super.c index 8c5783c6f71f..f058a04a00c7 100644 --- a/fs/erofs/super.c +++ b/fs/erofs/super.c @@ -250,6 +250,7 @@ static int erofs_init_devices(struct super_block *sb, down_read(&sbi->devs->rwsem); idr_for_each_entry(&sbi->devs->tree, dif, id) { struct block_device *bdev; + struct erofs_fscache_context *ctx; ptr = erofs_read_metabuf(&buf, sb, erofs_blknr(pos), EROFS_KMAP); @@ -259,15 +260,24 @@ 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_bdev_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); + } else { + ctx = erofs_fscache_get_ctx(sb, dif->path, false); + if (IS_ERR(ctx)) { + err = PTR_ERR(ctx); + break; + } + dif->ctx = ctx; } - 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; @@ -694,6 +704,7 @@ static int erofs_release_device_info(int id, void *ptr, void *data) { struct erofs_device_info *dif = ptr; + erofs_fscache_put_ctx(dif->ctx); fs_put_dax(dif->dax_dev); if (dif->bdev) blkdev_put(dif->bdev, FMODE_READ | FMODE_EXCL); -- 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: gregkh@linuxfoundation.org, willy@infradead.org, linux-kernel@vger.kernel.org, joseph.qi@linux.alibaba.com, linux-fsdevel@vger.kernel.org, luodaowen.backend@bytedance.com, gerry@linux.alibaba.com, torvalds@linux-foundation.org Subject: [PATCH v5 19/22] erofs: register cookie context for data blobs Date: Wed, 16 Mar 2022 21:17:20 +0800 [thread overview] Message-ID: <20220316131723.111553-20-jefflexu@linux.alibaba.com> (raw) In-Reply-To: <20220316131723.111553-1-jefflexu@linux.alibaba.com> Similar to the multi device mode, erofs could be mounted from multiple blob files (one bootstrap blob file and optional multiple data blob files). In this case, each device slot contains the path of corresponding data blob file. This patch registers corresponding cookie context for each data blob file. Signed-off-by: Jeffle Xu <jefflexu@linux.alibaba.com> --- fs/erofs/internal.h | 1 + fs/erofs/super.c | 27 +++++++++++++++++++-------- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/fs/erofs/internal.h b/fs/erofs/internal.h index f94a921eff98..d93de8b6ff44 100644 --- a/fs/erofs/internal.h +++ b/fs/erofs/internal.h @@ -53,6 +53,7 @@ struct erofs_device_info { struct block_device *bdev; struct dax_device *dax_dev; u64 dax_part_off; + struct erofs_fscache_context *ctx; u32 blocks; u32 mapped_blkaddr; diff --git a/fs/erofs/super.c b/fs/erofs/super.c index 8c5783c6f71f..f058a04a00c7 100644 --- a/fs/erofs/super.c +++ b/fs/erofs/super.c @@ -250,6 +250,7 @@ static int erofs_init_devices(struct super_block *sb, down_read(&sbi->devs->rwsem); idr_for_each_entry(&sbi->devs->tree, dif, id) { struct block_device *bdev; + struct erofs_fscache_context *ctx; ptr = erofs_read_metabuf(&buf, sb, erofs_blknr(pos), EROFS_KMAP); @@ -259,15 +260,24 @@ 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_bdev_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); + } else { + ctx = erofs_fscache_get_ctx(sb, dif->path, false); + if (IS_ERR(ctx)) { + err = PTR_ERR(ctx); + break; + } + dif->ctx = ctx; } - 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; @@ -694,6 +704,7 @@ static int erofs_release_device_info(int id, void *ptr, void *data) { struct erofs_device_info *dif = ptr; + erofs_fscache_put_ctx(dif->ctx); fs_put_dax(dif->dax_dev); if (dif->bdev) blkdev_put(dif->bdev, FMODE_READ | FMODE_EXCL); -- 2.27.0
next prev parent reply other threads:[~2022-03-16 13:18 UTC|newest] Thread overview: 99+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-03-16 13:17 [PATCH v5 00/22] fscache,erofs: fscache-based on-demand read semantics Jeffle Xu 2022-03-16 13:17 ` [PATCH v5 00/22] fscache, erofs: " Jeffle Xu 2022-03-16 13:17 ` [PATCH v5 01/22] fscache: export fscache_end_operation() Jeffle Xu 2022-03-16 13:17 ` Jeffle Xu 2022-03-16 13:17 ` [PATCH v5 02/22] cachefiles: extract write routine Jeffle Xu 2022-03-16 13:17 ` Jeffle Xu 2022-03-16 13:17 ` [PATCH v5 03/22] cachefiles: introduce on-demand read mode Jeffle Xu 2022-03-16 13:17 ` Jeffle Xu 2022-03-21 13:40 ` Matthew Wilcox 2022-03-21 13:40 ` Matthew Wilcox 2022-03-21 14:08 ` JeffleXu 2022-03-21 14:08 ` JeffleXu 2022-03-21 14:26 ` Matthew Wilcox 2022-03-21 14:26 ` Matthew Wilcox 2022-03-21 15:18 ` JeffleXu 2022-03-21 15:18 ` JeffleXu 2022-03-21 15:21 ` Matthew Wilcox 2022-03-21 15:21 ` Matthew Wilcox 2022-03-21 15:30 ` David Howells 2022-03-21 15:30 ` David Howells 2022-03-22 17:04 ` Matthew Wilcox 2022-03-22 17:04 ` Matthew Wilcox 2022-03-23 5:32 ` JeffleXu 2022-03-23 5:32 ` JeffleXu 2022-03-21 14:14 ` David Howells 2022-03-21 14:14 ` David Howells 2022-03-21 14:20 ` [Linux-cachefs] " Gao Xiang 2022-03-21 14:20 ` Gao Xiang 2022-03-16 13:17 ` [PATCH v5 04/22] cachefiles: notify user daemon with anon_fd when looking up cookie Jeffle Xu 2022-03-16 13:17 ` Jeffle Xu 2022-03-16 19:37 ` kernel test robot 2022-03-16 19:37 ` kernel test robot 2022-03-16 13:17 ` [PATCH v5 05/22] cachefiles: notify user daemon when withdrawing cookie Jeffle Xu 2022-03-16 13:17 ` Jeffle Xu 2022-03-16 13:17 ` [PATCH v5 06/22] cachefiles: implement on-demand read Jeffle Xu 2022-03-16 13:17 ` Jeffle Xu 2022-03-16 13:17 ` [PATCH v5 07/22] cachefiles: document on-demand read mode Jeffle Xu 2022-03-16 13:17 ` Jeffle Xu 2022-03-16 13:17 ` [PATCH v5 08/22] erofs: use meta buffers for erofs_read_superblock() Jeffle Xu 2022-03-16 13:17 ` Jeffle Xu 2022-03-16 13:17 ` [PATCH v5 09/22] erofs: make erofs_map_blocks() generally available Jeffle Xu 2022-03-16 13:17 ` Jeffle Xu 2022-03-17 5:35 ` [Linux-cachefs] " Gao Xiang 2022-03-17 5:35 ` Gao Xiang 2022-03-16 13:17 ` [PATCH v5 10/22] erofs: add mode checking helper Jeffle Xu 2022-03-16 13:17 ` Jeffle Xu 2022-03-17 5:36 ` [Linux-cachefs] " Gao Xiang 2022-03-17 5:36 ` Gao Xiang 2022-03-18 5:26 ` JeffleXu 2022-03-16 13:17 ` [PATCH v5 11/22] erofs: register global fscache volume Jeffle Xu 2022-03-16 13:17 ` Jeffle Xu 2022-03-16 21:52 ` kernel test robot 2022-03-16 21:52 ` kernel test robot 2022-03-17 1:49 ` kernel test robot 2022-03-17 1:49 ` kernel test robot 2022-03-16 13:17 ` [PATCH v5 12/22] erofs: add cookie context helper functions Jeffle Xu 2022-03-16 13:17 ` Jeffle Xu 2022-03-16 13:17 ` [PATCH v5 13/22] erofs: add anonymous inode managing page cache of blob file Jeffle Xu 2022-03-16 13:17 ` Jeffle Xu 2022-03-16 13:17 ` [PATCH v5 14/22] erofs: add erofs_fscache_read_pages() helper Jeffle Xu 2022-03-16 13:17 ` Jeffle Xu 2022-03-16 13:17 ` [PATCH v5 15/22] erofs: register cookie context for bootstrap blob Jeffle Xu 2022-03-16 13:17 ` Jeffle Xu 2022-03-16 13:17 ` [PATCH v5 16/22] erofs: implement fscache-based metadata read Jeffle Xu 2022-03-16 13:17 ` Jeffle Xu 2022-03-16 13:17 ` [PATCH v5 17/22] erofs: implement fscache-based data read for non-inline layout Jeffle Xu 2022-03-16 13:17 ` Jeffle Xu 2022-03-17 6:18 ` [Linux-cachefs] " Gao Xiang 2022-03-17 6:18 ` Gao Xiang 2022-03-18 5:29 ` JeffleXu 2022-03-16 13:17 ` [PATCH v5 18/22] erofs: implement fscache-based data read for inline layout Jeffle Xu 2022-03-16 13:17 ` Jeffle Xu 2022-03-16 13:17 ` Jeffle Xu [this message] 2022-03-16 13:17 ` [PATCH v5 19/22] erofs: register cookie context for data blobs Jeffle Xu 2022-03-16 13:17 ` [PATCH v5 20/22] erofs: implement fscache-based data read " Jeffle Xu 2022-03-16 13:17 ` Jeffle Xu 2022-03-16 13:17 ` [PATCH v5 21/22] erofs: implement fscache-based data readahead Jeffle Xu 2022-03-16 13:17 ` Jeffle Xu 2022-03-17 5:22 ` Gao Xiang 2022-03-17 5:22 ` Gao Xiang 2022-03-18 5:41 ` JeffleXu 2022-03-16 13:17 ` [PATCH v5 22/22] erofs: add 'uuid' mount option Jeffle Xu 2022-03-16 13:17 ` Jeffle Xu 2022-03-21 13:34 ` [PATCH v5 03/22] cachefiles: introduce on-demand read mode David Howells 2022-03-21 13:34 ` David Howells 2022-03-21 14:16 ` JeffleXu 2022-03-21 14:16 ` JeffleXu 2022-03-21 14:01 ` [PATCH v5 04/22] cachefiles: notify user daemon with anon_fd when looking up cookie David Howells 2022-03-21 14:01 ` David Howells 2022-03-21 14:43 ` JeffleXu 2022-03-21 14:43 ` JeffleXu 2022-03-21 14:05 ` [PATCH v5 06/22] cachefiles: implement on-demand read David Howells 2022-03-21 14:05 ` David Howells 2022-03-21 14:51 ` JeffleXu 2022-03-21 14:51 ` JeffleXu 2022-03-21 14:20 ` [PATCH v5 05/22] cachefiles: notify user daemon when withdrawing cookie David Howells 2022-03-21 14:20 ` David Howells 2022-03-21 14:31 ` JeffleXu 2022-03-21 14:31 ` 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=20220316131723.111553-20-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=luodaowen.backend@bytedance.com \ --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: 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.