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 16/22] erofs: implement fscache-based metadata read Date: Wed, 16 Mar 2022 21:17:17 +0800 [thread overview] Message-ID: <20220316131723.111553-17-jefflexu@linux.alibaba.com> (raw) In-Reply-To: <20220316131723.111553-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 | 11 +++++++++-- fs/erofs/fscache.c | 24 ++++++++++++++++++++++++ fs/erofs/internal.h | 3 +++ 3 files changed, 36 insertions(+), 2 deletions(-) diff --git a/fs/erofs/data.c b/fs/erofs/data.c index 6e2a28242453..1bff99576883 100644 --- a/fs/erofs/data.c +++ b/fs/erofs/data.c @@ -31,15 +31,22 @@ void erofs_put_metabuf(struct erofs_buf *buf) void *erofs_read_metabuf(struct erofs_buf *buf, struct super_block *sb, erofs_blk_t blkaddr, enum erofs_kmap_type type) { - struct address_space *const mapping = sb->s_bdev->bd_inode->i_mapping; + struct address_space *mapping; + struct erofs_sb_info *sbi = EROFS_SB(sb); erofs_off_t offset = blknr_to_addr(blkaddr); pgoff_t index = offset >> PAGE_SHIFT; struct page *page = buf->page; if (!page || page->index != index) { erofs_put_metabuf(buf); - page = read_cache_page_gfp(mapping, index, + if (erofs_bdev_mode(sb)) { + mapping = sb->s_bdev->bd_inode->i_mapping; + page = read_cache_page_gfp(mapping, index, mapping_gfp_constraint(mapping, ~__GFP_FS)); + } else { + page = erofs_fscache_read_cache_page(sbi->bootstrap, + index); + } if (IS_ERR(page)) return page; /* should already be PageUptodate, no need to lock page */ diff --git a/fs/erofs/fscache.c b/fs/erofs/fscache.c index 38b5a9380092..654414aa87ad 100644 --- a/fs/erofs/fscache.c +++ b/fs/erofs/fscache.c @@ -44,9 +44,33 @@ static inline int erofs_fscache_read_page(struct fscache_cookie *cookie, page_offset(page), PAGE_SIZE, pstart); } +static int erofs_fscache_readpage_blob(struct file *data, struct page *page) +{ + int ret; + struct erofs_fscache_context *ctx = + (struct erofs_fscache_context *)data; + + ret = erofs_fscache_read_page(ctx->cookie, page, page_offset(page)); + if (!ret) + SetPageUptodate(page); + else + SetPageError(page); + + unlock_page(page); + return ret; +} + static const struct address_space_operations erofs_fscache_blob_aops = { + .readpage = erofs_fscache_readpage_blob, }; +struct page *erofs_fscache_read_cache_page(struct erofs_fscache_context *ctx, + pgoff_t index) +{ + DBG_BUGON(!ctx->inode); + return read_mapping_page(ctx->inode->i_mapping, index, ctx); +} + static int erofs_fscache_init_cookie(struct erofs_fscache_context *ctx, char *path) { diff --git a/fs/erofs/internal.h b/fs/erofs/internal.h index cce39339c08e..35e7c330e59e 100644 --- a/fs/erofs/internal.h +++ b/fs/erofs/internal.h @@ -633,6 +633,9 @@ struct erofs_fscache_context *erofs_fscache_get_ctx(struct super_block *sb, char *path, bool need_inode); void erofs_fscache_put_ctx(struct erofs_fscache_context *ctx); +struct page *erofs_fscache_read_cache_page(struct erofs_fscache_context *ctx, + pgoff_t index); + #define EFSCORRUPTED EUCLEAN /* Filesystem is corrupted */ #endif /* __EROFS_INTERNAL_H */ -- 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 Subject: [PATCH v5 16/22] erofs: implement fscache-based metadata read Date: Wed, 16 Mar 2022 21:17:17 +0800 [thread overview] Message-ID: <20220316131723.111553-17-jefflexu@linux.alibaba.com> (raw) In-Reply-To: <20220316131723.111553-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 | 11 +++++++++-- fs/erofs/fscache.c | 24 ++++++++++++++++++++++++ fs/erofs/internal.h | 3 +++ 3 files changed, 36 insertions(+), 2 deletions(-) diff --git a/fs/erofs/data.c b/fs/erofs/data.c index 6e2a28242453..1bff99576883 100644 --- a/fs/erofs/data.c +++ b/fs/erofs/data.c @@ -31,15 +31,22 @@ void erofs_put_metabuf(struct erofs_buf *buf) void *erofs_read_metabuf(struct erofs_buf *buf, struct super_block *sb, erofs_blk_t blkaddr, enum erofs_kmap_type type) { - struct address_space *const mapping = sb->s_bdev->bd_inode->i_mapping; + struct address_space *mapping; + struct erofs_sb_info *sbi = EROFS_SB(sb); erofs_off_t offset = blknr_to_addr(blkaddr); pgoff_t index = offset >> PAGE_SHIFT; struct page *page = buf->page; if (!page || page->index != index) { erofs_put_metabuf(buf); - page = read_cache_page_gfp(mapping, index, + if (erofs_bdev_mode(sb)) { + mapping = sb->s_bdev->bd_inode->i_mapping; + page = read_cache_page_gfp(mapping, index, mapping_gfp_constraint(mapping, ~__GFP_FS)); + } else { + page = erofs_fscache_read_cache_page(sbi->bootstrap, + index); + } if (IS_ERR(page)) return page; /* should already be PageUptodate, no need to lock page */ diff --git a/fs/erofs/fscache.c b/fs/erofs/fscache.c index 38b5a9380092..654414aa87ad 100644 --- a/fs/erofs/fscache.c +++ b/fs/erofs/fscache.c @@ -44,9 +44,33 @@ static inline int erofs_fscache_read_page(struct fscache_cookie *cookie, page_offset(page), PAGE_SIZE, pstart); } +static int erofs_fscache_readpage_blob(struct file *data, struct page *page) +{ + int ret; + struct erofs_fscache_context *ctx = + (struct erofs_fscache_context *)data; + + ret = erofs_fscache_read_page(ctx->cookie, page, page_offset(page)); + if (!ret) + SetPageUptodate(page); + else + SetPageError(page); + + unlock_page(page); + return ret; +} + static const struct address_space_operations erofs_fscache_blob_aops = { + .readpage = erofs_fscache_readpage_blob, }; +struct page *erofs_fscache_read_cache_page(struct erofs_fscache_context *ctx, + pgoff_t index) +{ + DBG_BUGON(!ctx->inode); + return read_mapping_page(ctx->inode->i_mapping, index, ctx); +} + static int erofs_fscache_init_cookie(struct erofs_fscache_context *ctx, char *path) { diff --git a/fs/erofs/internal.h b/fs/erofs/internal.h index cce39339c08e..35e7c330e59e 100644 --- a/fs/erofs/internal.h +++ b/fs/erofs/internal.h @@ -633,6 +633,9 @@ struct erofs_fscache_context *erofs_fscache_get_ctx(struct super_block *sb, char *path, bool need_inode); void erofs_fscache_put_ctx(struct erofs_fscache_context *ctx); +struct page *erofs_fscache_read_cache_page(struct erofs_fscache_context *ctx, + pgoff_t index); + #define EFSCORRUPTED EUCLEAN /* Filesystem is corrupted */ #endif /* __EROFS_INTERNAL_H */ -- 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 ` Jeffle Xu [this message] 2022-03-16 13:17 ` [PATCH v5 16/22] erofs: implement fscache-based metadata read 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 ` [PATCH v5 19/22] erofs: register cookie context for data blobs Jeffle Xu 2022-03-16 13:17 ` 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-17-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=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.