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 12/23] erofs: implement fscache-based metadata read Date: Mon, 27 Dec 2021 20:54:33 +0800 [thread overview] Message-ID: <20211227125444.21187-13-jefflexu@linux.alibaba.com> (raw) In-Reply-To: <20211227125444.21187-1-jefflexu@linux.alibaba.com> This patch implements the data plane of reading metadata from bootstrap blob file over fscache. Be noted that currently it only supports the scenario where the backing file has no hole. Once it hits a hole of the backing file, erofs will fail the IO with -EOPNOTSUPP for now. The following patch will fix this issue, i.e. implementing the demand reading mode. Signed-off-by: Jeffle Xu <jefflexu@linux.alibaba.com> --- fs/erofs/data.c | 4 +-- fs/erofs/fscache.c | 59 +++++++++++++++++++++++++++++++++++++++++++++ fs/erofs/internal.h | 3 +++ fs/erofs/super.c | 7 ++---- 4 files changed, 66 insertions(+), 7 deletions(-) diff --git a/fs/erofs/data.c b/fs/erofs/data.c index 61fa431d0713..f0857c285fac 100644 --- a/fs/erofs/data.c +++ b/fs/erofs/data.c @@ -19,8 +19,8 @@ struct page *erofs_get_meta_page(struct super_block *sb, erofs_blk_t blkaddr) page = read_cache_page_gfp(mapping, blkaddr, mapping_gfp_constraint(mapping, ~__GFP_FS)); } else { - /* TODO: data path in nodev mode */ - page = ERR_PTR(-EINVAL); + page = erofs_readpage_from_fscache(EROFS_SB(sb)->bootstrap, + blkaddr); } /* should already be PageUptodate */ diff --git a/fs/erofs/fscache.c b/fs/erofs/fscache.c index 4dfca7c95710..325f5663836b 100644 --- a/fs/erofs/fscache.c +++ b/fs/erofs/fscache.c @@ -6,6 +6,65 @@ static struct fscache_volume *volume; +static int erofs_begin_cache_operation(struct netfs_read_request *rreq) +{ + return fscache_begin_read_operation(&rreq->cache_resources, + rreq->netfs_priv); +} + +static void erofs_priv_cleanup(struct address_space *mapping, void *netfs_priv) +{ +} + +static void erofs_issue_op(struct netfs_read_subrequest *subreq) +{ + /* + * TODO: implement demand-read logic later. + * We rely on user daemon to prepare blob files under corresponding + * directory, and we can reach here if blob files don't exist. + */ + + netfs_subreq_terminated(subreq, -EOPNOTSUPP, false); +} + +const struct netfs_read_request_ops erofs_req_ops = { + .begin_cache_operation = erofs_begin_cache_operation, + .cleanup = erofs_priv_cleanup, + .issue_op = erofs_issue_op, +}; + +struct page *erofs_readpage_from_fscache(struct erofs_cookie_ctx *ctx, + pgoff_t index) +{ + struct folio *folio; + struct page *page; + struct super_block *sb = ctx->inode->i_sb; + int ret; + + page = find_or_create_page(ctx->inode->i_mapping, index, GFP_KERNEL); + if (unlikely(!page)) { + erofs_err(sb, "failed to allocate page"); + return ERR_PTR(-ENOMEM); + } + + /* The content is already buffered in the address space */ + if (PageUptodate(page)) { + unlock_page(page); + return page; + } + + /* Or a new page cache is created, then read the content from fscache */ + folio = page_folio(page); + + ret = netfs_readpage(NULL, folio, &erofs_req_ops, ctx->cookie); + if (unlikely(ret || !PageUptodate(page))) { + erofs_err(sb, "failed to read from fscache"); + return ERR_PTR(-EINVAL); + } + + return page; +} + static int erofs_fscache_init_cookie(struct erofs_cookie_ctx *ctx, char *path) { struct fscache_cookie *cookie; diff --git a/fs/erofs/internal.h b/fs/erofs/internal.h index 4ee4ff6774ba..10fb7ef26ddf 100644 --- a/fs/erofs/internal.h +++ b/fs/erofs/internal.h @@ -585,6 +585,9 @@ struct erofs_cookie_ctx *erofs_fscache_get_ctx(struct super_block *sb, char *path); void erofs_fscache_put_ctx(struct erofs_cookie_ctx *ctx); +struct page *erofs_readpage_from_fscache(struct erofs_cookie_ctx *ctx, + pgoff_t index); + #define EFSCORRUPTED EUCLEAN /* Filesystem is corrupted */ #endif /* __EROFS_INTERNAL_H */ diff --git a/fs/erofs/super.c b/fs/erofs/super.c index 141cabd01d32..0e5964d8b24b 100644 --- a/fs/erofs/super.c +++ b/fs/erofs/super.c @@ -334,25 +334,22 @@ static int erofs_init_devices(struct super_block *sb, static int erofs_read_superblock(struct super_block *sb) { - struct erofs_sb_info *sbi; + struct erofs_sb_info *sbi = EROFS_SB(sb); struct page *page; struct erofs_super_block *dsb; unsigned int blkszbits; void *data; int ret; - /* TODO: metadata path in nodev mode */ if (sb->s_bdev) page = read_mapping_page(sb->s_bdev->bd_inode->i_mapping, 0, NULL); else - page = ERR_PTR(-EOPNOTSUPP); + page = erofs_readpage_from_fscache(sbi->bootstrap, 0); if (IS_ERR(page)) { erofs_err(sb, "cannot read erofs superblock"); return PTR_ERR(page); } - sbi = EROFS_SB(sb); - data = kmap(page); dsb = (struct erofs_super_block *)(data + EROFS_SUPER_OFFSET); -- 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 12/23] erofs: implement fscache-based metadata read Date: Mon, 27 Dec 2021 20:54:33 +0800 [thread overview] Message-ID: <20211227125444.21187-13-jefflexu@linux.alibaba.com> (raw) In-Reply-To: <20211227125444.21187-1-jefflexu@linux.alibaba.com> This patch implements the data plane of reading metadata from bootstrap blob file over fscache. Be noted that currently it only supports the scenario where the backing file has no hole. Once it hits a hole of the backing file, erofs will fail the IO with -EOPNOTSUPP for now. The following patch will fix this issue, i.e. implementing the demand reading mode. Signed-off-by: Jeffle Xu <jefflexu@linux.alibaba.com> --- fs/erofs/data.c | 4 +-- fs/erofs/fscache.c | 59 +++++++++++++++++++++++++++++++++++++++++++++ fs/erofs/internal.h | 3 +++ fs/erofs/super.c | 7 ++---- 4 files changed, 66 insertions(+), 7 deletions(-) diff --git a/fs/erofs/data.c b/fs/erofs/data.c index 61fa431d0713..f0857c285fac 100644 --- a/fs/erofs/data.c +++ b/fs/erofs/data.c @@ -19,8 +19,8 @@ struct page *erofs_get_meta_page(struct super_block *sb, erofs_blk_t blkaddr) page = read_cache_page_gfp(mapping, blkaddr, mapping_gfp_constraint(mapping, ~__GFP_FS)); } else { - /* TODO: data path in nodev mode */ - page = ERR_PTR(-EINVAL); + page = erofs_readpage_from_fscache(EROFS_SB(sb)->bootstrap, + blkaddr); } /* should already be PageUptodate */ diff --git a/fs/erofs/fscache.c b/fs/erofs/fscache.c index 4dfca7c95710..325f5663836b 100644 --- a/fs/erofs/fscache.c +++ b/fs/erofs/fscache.c @@ -6,6 +6,65 @@ static struct fscache_volume *volume; +static int erofs_begin_cache_operation(struct netfs_read_request *rreq) +{ + return fscache_begin_read_operation(&rreq->cache_resources, + rreq->netfs_priv); +} + +static void erofs_priv_cleanup(struct address_space *mapping, void *netfs_priv) +{ +} + +static void erofs_issue_op(struct netfs_read_subrequest *subreq) +{ + /* + * TODO: implement demand-read logic later. + * We rely on user daemon to prepare blob files under corresponding + * directory, and we can reach here if blob files don't exist. + */ + + netfs_subreq_terminated(subreq, -EOPNOTSUPP, false); +} + +const struct netfs_read_request_ops erofs_req_ops = { + .begin_cache_operation = erofs_begin_cache_operation, + .cleanup = erofs_priv_cleanup, + .issue_op = erofs_issue_op, +}; + +struct page *erofs_readpage_from_fscache(struct erofs_cookie_ctx *ctx, + pgoff_t index) +{ + struct folio *folio; + struct page *page; + struct super_block *sb = ctx->inode->i_sb; + int ret; + + page = find_or_create_page(ctx->inode->i_mapping, index, GFP_KERNEL); + if (unlikely(!page)) { + erofs_err(sb, "failed to allocate page"); + return ERR_PTR(-ENOMEM); + } + + /* The content is already buffered in the address space */ + if (PageUptodate(page)) { + unlock_page(page); + return page; + } + + /* Or a new page cache is created, then read the content from fscache */ + folio = page_folio(page); + + ret = netfs_readpage(NULL, folio, &erofs_req_ops, ctx->cookie); + if (unlikely(ret || !PageUptodate(page))) { + erofs_err(sb, "failed to read from fscache"); + return ERR_PTR(-EINVAL); + } + + return page; +} + static int erofs_fscache_init_cookie(struct erofs_cookie_ctx *ctx, char *path) { struct fscache_cookie *cookie; diff --git a/fs/erofs/internal.h b/fs/erofs/internal.h index 4ee4ff6774ba..10fb7ef26ddf 100644 --- a/fs/erofs/internal.h +++ b/fs/erofs/internal.h @@ -585,6 +585,9 @@ struct erofs_cookie_ctx *erofs_fscache_get_ctx(struct super_block *sb, char *path); void erofs_fscache_put_ctx(struct erofs_cookie_ctx *ctx); +struct page *erofs_readpage_from_fscache(struct erofs_cookie_ctx *ctx, + pgoff_t index); + #define EFSCORRUPTED EUCLEAN /* Filesystem is corrupted */ #endif /* __EROFS_INTERNAL_H */ diff --git a/fs/erofs/super.c b/fs/erofs/super.c index 141cabd01d32..0e5964d8b24b 100644 --- a/fs/erofs/super.c +++ b/fs/erofs/super.c @@ -334,25 +334,22 @@ static int erofs_init_devices(struct super_block *sb, static int erofs_read_superblock(struct super_block *sb) { - struct erofs_sb_info *sbi; + struct erofs_sb_info *sbi = EROFS_SB(sb); struct page *page; struct erofs_super_block *dsb; unsigned int blkszbits; void *data; int ret; - /* TODO: metadata path in nodev mode */ if (sb->s_bdev) page = read_mapping_page(sb->s_bdev->bd_inode->i_mapping, 0, NULL); else - page = ERR_PTR(-EOPNOTSUPP); + page = erofs_readpage_from_fscache(sbi->bootstrap, 0); if (IS_ERR(page)) { erofs_err(sb, "cannot read erofs superblock"); return PTR_ERR(page); } - sbi = EROFS_SB(sb); - data = kmap(page); dsb = (struct erofs_super_block *)(data + EROFS_SUPER_OFFSET); -- 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 ` Jeffle Xu [this message] 2021-12-27 12:54 ` [PATCH v1 12/23] erofs: implement fscache-based metadata read 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 ` [PATCH v1 14/23] erofs: register cookie context for data blobs Jeffle Xu 2021-12-27 12:54 ` 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-13-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.