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: 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 v1 14/23] erofs: register cookie context for data blobs Date: Mon, 27 Dec 2021 20:54:35 +0800 [thread overview] Message-ID: <20211227125444.21187-15-jefflexu@linux.alibaba.com> (raw) In-Reply-To: <20211227125444.21187-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. Similarly, the cleanup routine shall be contained in both .kill_sb() and .put_super() callback for the same reason. Signed-off-by: Jeffle Xu <jefflexu@linux.alibaba.com> --- fs/erofs/internal.h | 1 + fs/erofs/super.c | 12 +++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/fs/erofs/internal.h b/fs/erofs/internal.h index f3a1aa429a93..f60577a7aade 100644 --- a/fs/erofs/internal.h +++ b/fs/erofs/internal.h @@ -52,6 +52,7 @@ struct erofs_device_info { char *path; struct block_device *bdev; struct dax_device *dax_dev; + struct erofs_cookie_ctx *ctx; u32 blocks; u32 mapped_blkaddr; diff --git a/fs/erofs/super.c b/fs/erofs/super.c index 0e5964d8b24b..ea56122f7a35 100644 --- a/fs/erofs/super.c +++ b/fs/erofs/super.c @@ -287,6 +287,7 @@ static int erofs_init_devices(struct super_block *sb, idr_for_each_entry(&sbi->devs->tree, dif, id) { erofs_blk_t blk = erofs_blknr(pos); struct block_device *bdev; + struct erofs_cookie_ctx *ctx; if (!page || page->index != blk) { if (page) { @@ -315,7 +316,12 @@ static int erofs_init_devices(struct super_block *sb, dif->bdev = bdev; dif->dax_dev = fs_dax_get_by_bdev(bdev); } else { - /* TODO: multi devs in nodev mode */ + ctx = erofs_fscache_get_ctx(sb, dif->path); + if (IS_ERR(ctx)) { + err = PTR_ERR(ctx); + goto err_out; + } + dif->ctx = ctx; } dif->blocks = le32_to_cpu(dis->blocks); dif->mapped_blkaddr = le32_to_cpu(dis->mapped_blkaddr); @@ -755,6 +761,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); @@ -845,6 +852,9 @@ static void erofs_put_super(struct super_block *sb) iput(sbi->managed_cache); sbi->managed_cache = NULL; #endif + erofs_free_dev_context(sbi->devs); + sbi->devs = NULL; + erofs_fscache_put_ctx(sbi->bootstrap); sbi->bootstrap = NULL; } -- 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: tao.peng@linux.alibaba.com, linux-kernel@vger.kernel.org, joseph.qi@linux.alibaba.com, bo.liu@linux.alibaba.com, linux-fsdevel@vger.kernel.org, eguan@linux.alibaba.com, gerry@linux.alibaba.com Subject: [PATCH v1 14/23] erofs: register cookie context for data blobs Date: Mon, 27 Dec 2021 20:54:35 +0800 [thread overview] Message-ID: <20211227125444.21187-15-jefflexu@linux.alibaba.com> (raw) In-Reply-To: <20211227125444.21187-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. Similarly, the cleanup routine shall be contained in both .kill_sb() and .put_super() callback for the same reason. Signed-off-by: Jeffle Xu <jefflexu@linux.alibaba.com> --- fs/erofs/internal.h | 1 + fs/erofs/super.c | 12 +++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/fs/erofs/internal.h b/fs/erofs/internal.h index f3a1aa429a93..f60577a7aade 100644 --- a/fs/erofs/internal.h +++ b/fs/erofs/internal.h @@ -52,6 +52,7 @@ struct erofs_device_info { char *path; struct block_device *bdev; struct dax_device *dax_dev; + struct erofs_cookie_ctx *ctx; u32 blocks; u32 mapped_blkaddr; diff --git a/fs/erofs/super.c b/fs/erofs/super.c index 0e5964d8b24b..ea56122f7a35 100644 --- a/fs/erofs/super.c +++ b/fs/erofs/super.c @@ -287,6 +287,7 @@ static int erofs_init_devices(struct super_block *sb, idr_for_each_entry(&sbi->devs->tree, dif, id) { erofs_blk_t blk = erofs_blknr(pos); struct block_device *bdev; + struct erofs_cookie_ctx *ctx; if (!page || page->index != blk) { if (page) { @@ -315,7 +316,12 @@ static int erofs_init_devices(struct super_block *sb, dif->bdev = bdev; dif->dax_dev = fs_dax_get_by_bdev(bdev); } else { - /* TODO: multi devs in nodev mode */ + ctx = erofs_fscache_get_ctx(sb, dif->path); + if (IS_ERR(ctx)) { + err = PTR_ERR(ctx); + goto err_out; + } + dif->ctx = ctx; } dif->blocks = le32_to_cpu(dis->blocks); dif->mapped_blkaddr = le32_to_cpu(dis->mapped_blkaddr); @@ -755,6 +761,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); @@ -845,6 +852,9 @@ static void erofs_put_super(struct super_block *sb) iput(sbi->managed_cache); sbi->managed_cache = NULL; #endif + erofs_free_dev_context(sbi->devs); + sbi->devs = NULL; + erofs_fscache_put_ctx(sbi->bootstrap); sbi->bootstrap = NULL; } -- 2.27.0
next prev parent reply other threads:[~2021-12-27 12:55 UTC|newest] Thread overview: 90+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-12-27 12:54 [PATCH v1 00/23] fscache,erofs: fscache-based demand-read semantics Jeffle Xu 2021-12-27 12:54 ` Jeffle Xu 2021-12-27 12:54 ` [PATCH v1 01/23] cachefiles: add cachefiles_demand devnode Jeffle Xu 2021-12-27 12:54 ` Jeffle Xu 2021-12-28 2:47 ` Joseph Qi 2021-12-28 2:47 ` Joseph Qi 2021-12-28 12:34 ` JeffleXu 2021-12-28 12:34 ` JeffleXu 2021-12-27 12:54 ` [PATCH v1 02/23] cachefiles: add mode command to distinguish modes Jeffle Xu 2021-12-27 12:54 ` Jeffle Xu 2021-12-27 12:54 ` [PATCH v1 03/23] cachefiles: detect backing file size in demand-read mode Jeffle Xu 2021-12-27 12:54 ` Jeffle Xu 2021-12-27 12:54 ` [PATCH v1 04/23] netfs: make ops->init_rreq() optional Jeffle Xu 2021-12-27 12:54 ` Jeffle Xu 2021-12-27 12:54 ` [PATCH v1 05/23] netfs: add inode parameter to netfs_alloc_read_request() Jeffle Xu 2021-12-27 12:54 ` Jeffle Xu 2022-01-04 14:00 ` Gao Xiang 2022-01-04 14:00 ` Gao Xiang 2022-01-13 3:10 ` [Linux-cachefs] " JeffleXu 2022-01-13 3:10 ` JeffleXu 2022-01-13 12:09 ` Gao Xiang 2022-01-13 12:09 ` Gao Xiang 2021-12-27 12:54 ` [PATCH v1 06/23] erofs: export erofs_map_blocks() Jeffle Xu 2021-12-27 12:54 ` Jeffle Xu 2021-12-27 12:54 ` [PATCH v1 07/23] erofs: add nodev mode Jeffle Xu 2021-12-27 12:54 ` Jeffle Xu 2022-01-04 14:33 ` Gao Xiang 2022-01-04 14:33 ` Gao Xiang 2022-01-04 14:58 ` Gao Xiang 2022-01-04 14:58 ` Gao Xiang 2022-01-05 9:04 ` JeffleXu 2021-12-27 12:54 ` [PATCH v1 08/23] erofs: register global fscache volume Jeffle Xu 2021-12-27 12:54 ` Jeffle Xu 2021-12-27 12:54 ` [PATCH v1 09/23] erofs: add cookie context helper functions Jeffle Xu 2021-12-27 12:54 ` Jeffle Xu 2021-12-27 12:54 ` [PATCH v1 10/23] erofs: add anonymous inode managing page cache of blob file Jeffle Xu 2021-12-27 12:54 ` Jeffle Xu 2021-12-27 12:54 ` [PATCH v1 11/23] erofs: register cookie context for bootstrap Jeffle Xu 2021-12-27 12:54 ` Jeffle Xu 2021-12-27 12:54 ` [PATCH v1 12/23] erofs: implement fscache-based metadata read Jeffle Xu 2021-12-27 12:54 ` Jeffle Xu 2021-12-27 17:07 ` kernel test robot 2021-12-27 17:07 ` kernel test robot 2021-12-27 17:07 ` kernel test robot 2021-12-27 17:17 ` kernel test robot 2021-12-27 17:17 ` kernel test robot 2021-12-27 17:17 ` kernel test robot 2021-12-27 12:54 ` [PATCH v1 13/23] erofs: implement fscache-based data read Jeffle Xu 2021-12-27 12:54 ` Jeffle Xu 2022-01-03 6:32 ` JeffleXu 2022-01-03 6:32 ` JeffleXu 2022-01-04 14:40 ` Gao Xiang 2022-01-04 14:40 ` Gao Xiang 2022-01-05 2:29 ` JeffleXu 2021-12-27 12:54 ` Jeffle Xu [this message] 2021-12-27 12:54 ` [PATCH v1 14/23] erofs: register cookie context for data blobs Jeffle Xu 2021-12-27 12:54 ` [PATCH v1 15/23] erofs: implement fscache-based data read " Jeffle Xu 2021-12-27 12:54 ` Jeffle Xu 2021-12-27 12:54 ` [PATCH v1 16/23] erofs: add 'uuid' mount option Jeffle Xu 2021-12-27 12:54 ` Jeffle Xu 2021-12-27 12:54 ` [PATCH v1 17/23] netfs: support on demand read Jeffle Xu 2021-12-27 12:54 ` Jeffle Xu 2021-12-27 12:54 ` [PATCH v1 18/23] cachefiles: use idr tree managing pending " Jeffle Xu 2021-12-27 12:54 ` Jeffle Xu 2021-12-27 12:54 ` [PATCH v1 19/23] cachefiles: implement .demand_read() for " Jeffle Xu 2021-12-27 12:54 ` Jeffle Xu 2021-12-27 15:32 ` kernel test robot 2021-12-27 15:32 ` kernel test robot 2021-12-27 15:32 ` kernel test robot 2021-12-27 15:36 ` Matthew Wilcox 2021-12-27 15:36 ` Matthew Wilcox 2021-12-28 12:33 ` JeffleXu 2021-12-28 12:33 ` JeffleXu 2022-01-12 9:02 ` JeffleXu 2022-01-12 9:02 ` JeffleXu 2022-01-19 13:20 ` Matthew Wilcox 2022-01-19 13:20 ` Matthew Wilcox 2022-01-20 12:43 ` JeffleXu 2022-01-20 12:43 ` JeffleXu 2021-12-27 15:55 ` kernel test robot 2021-12-27 15:55 ` kernel test robot 2021-12-27 15:55 ` kernel test robot 2021-12-27 12:54 ` [PATCH v1 20/23] cachefiles: implement .poll() " Jeffle Xu 2021-12-27 12:54 ` Jeffle Xu 2021-12-27 12:54 ` [PATCH v1 21/23] cachefiles: implement .read() " Jeffle Xu 2021-12-27 12:54 ` Jeffle Xu 2021-12-27 12:54 ` [PATCH v1 22/23] cachefiles: add done command " Jeffle Xu 2021-12-27 12:54 ` Jeffle Xu 2021-12-27 12:54 ` [PATCH v1 23/23] erofs: support on " Jeffle Xu 2021-12-27 12:54 ` Jeffle Xu
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=20211227125444.21187-15-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=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=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.