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, tianzichen@kuaishou.com, fannaihao@baidu.com, zhangjiachen.jaycee@bytedance.com Subject: [PATCH v9 17/21] erofs: implement fscache-based metadata read Date: Fri, 15 Apr 2022 20:36:10 +0800 [thread overview] Message-ID: <20220415123614.54024-18-jefflexu@linux.alibaba.com> (raw) In-Reply-To: <20220415123614.54024-1-jefflexu@linux.alibaba.com> Implement the data plane of reading metadata from primary data blob over fscache. Signed-off-by: Jeffle Xu <jefflexu@linux.alibaba.com> --- fs/erofs/data.c | 19 +++++++++++++++---- fs/erofs/fscache.c | 27 +++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 4 deletions(-) diff --git a/fs/erofs/data.c b/fs/erofs/data.c index 14b64d960541..bb9c1fd48c19 100644 --- a/fs/erofs/data.c +++ b/fs/erofs/data.c @@ -6,6 +6,7 @@ */ #include "internal.h" #include <linux/prefetch.h> +#include <linux/sched/mm.h> #include <linux/dax.h> #include <trace/events/erofs.h> @@ -35,14 +36,20 @@ void *erofs_bread(struct erofs_buf *buf, struct inode *inode, erofs_off_t offset = blknr_to_addr(blkaddr); pgoff_t index = offset >> PAGE_SHIFT; struct page *page = buf->page; + struct folio *folio; + unsigned int nofs_flag; if (!page || page->index != index) { erofs_put_metabuf(buf); - page = read_cache_page_gfp(mapping, index, - mapping_gfp_constraint(mapping, ~__GFP_FS)); - if (IS_ERR(page)) - return page; + + nofs_flag = memalloc_nofs_save(); + folio = read_cache_folio(mapping, index, NULL, NULL); + memalloc_nofs_restore(nofs_flag); + if (IS_ERR(folio)) + return folio; + /* should already be PageUptodate, no need to lock page */ + page = folio_file_page(folio, index); buf->page = page; } if (buf->kmap_type == EROFS_NO_KMAP) { @@ -63,6 +70,10 @@ void *erofs_bread(struct erofs_buf *buf, struct inode *inode, void *erofs_read_metabuf(struct erofs_buf *buf, struct super_block *sb, erofs_blk_t blkaddr, enum erofs_kmap_type type) { + if (erofs_is_fscache_mode(sb)) + return erofs_bread(buf, EROFS_SB(sb)->s_fscache->inode, + blkaddr, type); + return erofs_bread(buf, sb->s_bdev->bd_inode, blkaddr, type); } diff --git a/fs/erofs/fscache.c b/fs/erofs/fscache.c index 066f68c062e2..3f00eb34ac35 100644 --- a/fs/erofs/fscache.c +++ b/fs/erofs/fscache.c @@ -58,7 +58,34 @@ static int erofs_fscache_read_folios(struct fscache_cookie *cookie, return ret; } +static int erofs_fscache_meta_readpage(struct file *data, struct page *page) +{ + int ret; + struct folio *folio = page_folio(page); + struct super_block *sb = folio_mapping(folio)->host->i_sb; + struct erofs_map_dev mdev = { + .m_deviceid = 0, + .m_pa = folio_pos(folio), + }; + + ret = erofs_map_dev(sb, &mdev); + if (ret) + goto out; + + ret = erofs_fscache_read_folios(mdev.m_fscache->cookie, + folio_mapping(folio), folio_pos(folio), + folio_size(folio), mdev.m_pa); + if (ret) + goto out; + + folio_mark_uptodate(folio); +out: + folio_unlock(folio); + return ret; +} + static const struct address_space_operations erofs_fscache_meta_aops = { + .readpage = erofs_fscache_meta_readpage, }; /* -- 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, fannaihao@baidu.com, willy@infradead.org, linux-kernel@vger.kernel.org, tianzichen@kuaishou.com, joseph.qi@linux.alibaba.com, zhangjiachen.jaycee@bytedance.com, linux-fsdevel@vger.kernel.org, luodaowen.backend@bytedance.com, gerry@linux.alibaba.com, torvalds@linux-foundation.org Subject: [PATCH v9 17/21] erofs: implement fscache-based metadata read Date: Fri, 15 Apr 2022 20:36:10 +0800 [thread overview] Message-ID: <20220415123614.54024-18-jefflexu@linux.alibaba.com> (raw) In-Reply-To: <20220415123614.54024-1-jefflexu@linux.alibaba.com> Implement the data plane of reading metadata from primary data blob over fscache. Signed-off-by: Jeffle Xu <jefflexu@linux.alibaba.com> --- fs/erofs/data.c | 19 +++++++++++++++---- fs/erofs/fscache.c | 27 +++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 4 deletions(-) diff --git a/fs/erofs/data.c b/fs/erofs/data.c index 14b64d960541..bb9c1fd48c19 100644 --- a/fs/erofs/data.c +++ b/fs/erofs/data.c @@ -6,6 +6,7 @@ */ #include "internal.h" #include <linux/prefetch.h> +#include <linux/sched/mm.h> #include <linux/dax.h> #include <trace/events/erofs.h> @@ -35,14 +36,20 @@ void *erofs_bread(struct erofs_buf *buf, struct inode *inode, erofs_off_t offset = blknr_to_addr(blkaddr); pgoff_t index = offset >> PAGE_SHIFT; struct page *page = buf->page; + struct folio *folio; + unsigned int nofs_flag; if (!page || page->index != index) { erofs_put_metabuf(buf); - page = read_cache_page_gfp(mapping, index, - mapping_gfp_constraint(mapping, ~__GFP_FS)); - if (IS_ERR(page)) - return page; + + nofs_flag = memalloc_nofs_save(); + folio = read_cache_folio(mapping, index, NULL, NULL); + memalloc_nofs_restore(nofs_flag); + if (IS_ERR(folio)) + return folio; + /* should already be PageUptodate, no need to lock page */ + page = folio_file_page(folio, index); buf->page = page; } if (buf->kmap_type == EROFS_NO_KMAP) { @@ -63,6 +70,10 @@ void *erofs_bread(struct erofs_buf *buf, struct inode *inode, void *erofs_read_metabuf(struct erofs_buf *buf, struct super_block *sb, erofs_blk_t blkaddr, enum erofs_kmap_type type) { + if (erofs_is_fscache_mode(sb)) + return erofs_bread(buf, EROFS_SB(sb)->s_fscache->inode, + blkaddr, type); + return erofs_bread(buf, sb->s_bdev->bd_inode, blkaddr, type); } diff --git a/fs/erofs/fscache.c b/fs/erofs/fscache.c index 066f68c062e2..3f00eb34ac35 100644 --- a/fs/erofs/fscache.c +++ b/fs/erofs/fscache.c @@ -58,7 +58,34 @@ static int erofs_fscache_read_folios(struct fscache_cookie *cookie, return ret; } +static int erofs_fscache_meta_readpage(struct file *data, struct page *page) +{ + int ret; + struct folio *folio = page_folio(page); + struct super_block *sb = folio_mapping(folio)->host->i_sb; + struct erofs_map_dev mdev = { + .m_deviceid = 0, + .m_pa = folio_pos(folio), + }; + + ret = erofs_map_dev(sb, &mdev); + if (ret) + goto out; + + ret = erofs_fscache_read_folios(mdev.m_fscache->cookie, + folio_mapping(folio), folio_pos(folio), + folio_size(folio), mdev.m_pa); + if (ret) + goto out; + + folio_mark_uptodate(folio); +out: + folio_unlock(folio); + return ret; +} + static const struct address_space_operations erofs_fscache_meta_aops = { + .readpage = erofs_fscache_meta_readpage, }; /* -- 2.27.0
next prev parent reply other threads:[~2022-04-15 12:38 UTC|newest] Thread overview: 96+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-04-15 12:35 [PATCH v9 00/21] fscache,erofs: fscache-based on-demand read semantics Jeffle Xu 2022-04-15 12:35 ` [PATCH v9 00/21] fscache, erofs: " Jeffle Xu 2022-04-15 12:35 ` [PATCH v9 01/21] cachefiles: extract write routine Jeffle Xu 2022-04-15 12:35 ` Jeffle Xu 2022-04-15 12:35 ` [PATCH v9 02/21] cachefiles: notify user daemon when looking up cookie Jeffle Xu 2022-04-15 12:35 ` Jeffle Xu 2022-04-15 12:35 ` [PATCH v9 03/21] cachefiles: unbind cachefiles gracefully in on-demand mode Jeffle Xu 2022-04-15 12:35 ` Jeffle Xu 2022-04-15 12:35 ` [PATCH v9 04/21] cachefiles: notify user daemon when withdrawing cookie Jeffle Xu 2022-04-15 12:35 ` Jeffle Xu 2022-04-15 12:35 ` [PATCH v9 05/21] cachefiles: implement on-demand read Jeffle Xu 2022-04-15 12:35 ` Jeffle Xu 2022-04-15 12:35 ` [PATCH v9 06/21] cachefiles: enable on-demand read mode Jeffle Xu 2022-04-15 12:35 ` Jeffle Xu 2022-04-15 12:36 ` [PATCH v9 07/21] cachefiles: add tracepoints for " Jeffle Xu 2022-04-15 12:36 ` Jeffle Xu 2022-04-15 12:36 ` [PATCH v9 08/21] cachefiles: document " Jeffle Xu 2022-04-15 12:36 ` Jeffle Xu 2022-04-15 12:36 ` [PATCH v9 09/21] erofs: make erofs_map_blocks() generally available Jeffle Xu 2022-04-15 12:36 ` Jeffle Xu 2022-04-15 12:36 ` [PATCH v9 10/21] erofs: add fscache mode check helper Jeffle Xu 2022-04-15 12:36 ` Jeffle Xu 2022-04-21 7:53 ` Gao Xiang 2022-04-21 7:53 ` Gao Xiang 2022-04-15 12:36 ` [PATCH v9 11/21] erofs: register fscache volume Jeffle Xu 2022-04-15 12:36 ` Jeffle Xu 2022-04-15 12:36 ` [PATCH v9 12/21] erofs: add fscache context helper functions Jeffle Xu 2022-04-15 12:36 ` Jeffle Xu 2022-04-15 12:36 ` [PATCH v9 13/21] erofs: add anonymous inode caching metadata for data blobs Jeffle Xu 2022-04-15 12:36 ` Jeffle Xu 2022-04-15 12:36 ` [PATCH v9 14/21] erofs: add erofs_fscache_read_folios() helper Jeffle Xu 2022-04-15 12:36 ` Jeffle Xu 2022-04-15 12:36 ` [PATCH v9 15/21] erofs: register fscache context for primary data blob Jeffle Xu 2022-04-15 12:36 ` Jeffle Xu 2022-04-15 12:36 ` [PATCH v9 16/21] erofs: register fscache context for extra data blobs Jeffle Xu 2022-04-15 12:36 ` Jeffle Xu 2022-04-21 10:58 ` Gao Xiang 2022-04-21 10:58 ` Gao Xiang 2022-04-15 12:36 ` Jeffle Xu [this message] 2022-04-15 12:36 ` [PATCH v9 17/21] erofs: implement fscache-based metadata read Jeffle Xu 2022-04-21 13:03 ` Gao Xiang 2022-04-21 13:03 ` Gao Xiang 2022-04-15 12:36 ` [PATCH v9 18/21] erofs: implement fscache-based data read for non-inline layout Jeffle Xu 2022-04-15 12:36 ` Jeffle Xu 2022-04-21 11:13 ` Gao Xiang 2022-04-21 11:13 ` Gao Xiang 2022-04-15 12:36 ` [PATCH v9 19/21] erofs: implement fscache-based data read for inline layout Jeffle Xu 2022-04-15 12:36 ` Jeffle Xu 2022-04-21 11:14 ` Gao Xiang 2022-04-21 11:14 ` Gao Xiang 2022-04-15 12:36 ` [PATCH v9 20/21] erofs: implement fscache-based data readahead Jeffle Xu 2022-04-15 12:36 ` Jeffle Xu 2022-04-21 11:51 ` Gao Xiang 2022-04-21 11:51 ` Gao Xiang 2022-04-15 12:36 ` [PATCH v9 21/21] erofs: add 'fsid' mount option Jeffle Xu 2022-04-15 12:36 ` Jeffle Xu 2022-04-21 11:59 ` Gao Xiang 2022-04-21 11:59 ` Gao Xiang 2022-04-20 8:52 ` [PATCH v9 00/21] fscache, erofs: fscache-based on-demand read semantics JiaZhu 2022-04-20 8:52 ` JiaZhu 2022-04-21 13:24 ` [PATCH v9 01/21] cachefiles: extract write routine David Howells 2022-04-21 13:24 ` David Howells 2022-04-21 13:57 ` [PATCH v9 02/21] cachefiles: notify user daemon when looking up cookie David Howells 2022-04-21 13:57 ` David Howells 2022-04-21 14:47 ` JeffleXu 2022-04-21 14:47 ` JeffleXu 2022-04-21 14:02 ` [PATCH v9 03/21] cachefiles: unbind cachefiles gracefully in on-demand mode David Howells 2022-04-21 14:02 ` David Howells 2022-04-22 2:44 ` JeffleXu 2022-04-22 2:44 ` JeffleXu 2022-04-21 14:05 ` [PATCH v9 04/21] cachefiles: notify user daemon when withdrawing cookie David Howells 2022-04-21 14:05 ` David Howells 2022-04-21 14:57 ` JeffleXu 2022-04-21 14:57 ` JeffleXu 2022-04-21 14:14 ` [PATCH v9 05/21] cachefiles: implement on-demand read David Howells 2022-04-21 14:14 ` David Howells 2022-04-21 15:00 ` JeffleXu 2022-04-21 15:00 ` JeffleXu 2022-04-21 14:17 ` [PATCH v9 06/21] cachefiles: enable on-demand read mode David Howells 2022-04-21 14:17 ` David Howells 2022-04-21 15:11 ` JeffleXu 2022-04-21 15:11 ` JeffleXu 2022-04-21 14:19 ` [PATCH v9 07/21] cachefiles: add tracepoints for " David Howells 2022-04-21 14:19 ` David Howells 2022-04-21 14:47 ` [PATCH v9 08/21] cachefiles: document " David Howells 2022-04-21 14:47 ` David Howells 2022-04-22 3:10 ` JeffleXu 2022-04-22 3:10 ` JeffleXu 2022-04-21 14:54 ` EMFILE/ENFILE mitigation needed in erofs? David Howells 2022-04-21 14:54 ` David Howells 2022-04-21 16:14 ` JeffleXu 2022-04-21 16:14 ` JeffleXu 2022-04-21 17:57 ` David Howells 2022-04-21 17:57 ` David Howells 2022-04-21 18:16 ` Gao Xiang 2022-04-21 18:16 ` Gao Xiang
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=20220415123614.54024-18-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=fannaihao@baidu.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=tianzichen@kuaishou.com \ --cc=torvalds@linux-foundation.org \ --cc=willy@infradead.org \ --cc=xiang@kernel.org \ --cc=zhangjiachen.jaycee@bytedance.com \ /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.