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,
yinxin.x@bytedance.com, zhangjiachen.jaycee@bytedance.com,
zhujia.zj@bytedance.com
Subject: [PATCH v11 17/22] erofs: implement fscache-based metadata read
Date: Mon, 9 May 2022 15:40:23 +0800 [thread overview]
Message-ID: <20220509074028.74954-18-jefflexu@linux.alibaba.com> (raw)
In-Reply-To: <20220509074028.74954-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>
Reviewed-by: Gao Xiang <hsiangkao@linux.alibaba.com>
---
fs/erofs/data.c | 19 +++++++++++++++----
fs/erofs/fscache.c | 25 +++++++++++++++++++++++++
2 files changed, 40 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 ac02af8cce3e..23d7e862eed8 100644
--- a/fs/erofs/fscache.c
+++ b/fs/erofs/fscache.c
@@ -59,7 +59,32 @@ 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)
+ 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,
};
int erofs_fscache_register_cookie(struct super_block *sb,
--
2.27.0
next prev parent reply other threads:[~2022-05-09 7:51 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-09 7:40 [PATCH v11 00/22] fscache,erofs: fscache-based on-demand read semantics Jeffle Xu
2022-05-09 7:40 ` [PATCH v11 01/22] cachefiles: extract write routine Jeffle Xu
2022-05-09 7:40 ` [PATCH v11 02/22] cachefiles: notify the user daemon when looking up cookie Jeffle Xu
2022-05-10 12:50 ` David Howells
2022-05-09 7:40 ` [PATCH v11 03/22] cachefiles: unbind cachefiles gracefully in on-demand mode Jeffle Xu
2022-05-10 12:53 ` David Howells
2022-05-09 7:40 ` [PATCH v11 04/22] cachefiles: notify the user daemon when withdrawing cookie Jeffle Xu
2022-05-09 7:40 ` [PATCH v11 05/22] cachefiles: implement on-demand read Jeffle Xu
2022-05-09 7:40 ` [PATCH v11 06/22] cachefiles: enable on-demand read mode Jeffle Xu
2022-05-10 12:56 ` David Howells
2022-05-10 13:29 ` Gao Xiang
2022-05-09 7:40 ` [PATCH v11 07/22] cachefiles: add tracepoints for " Jeffle Xu
2022-05-09 7:40 ` [PATCH v11 08/22] cachefiles: document " Jeffle Xu
2022-05-10 13:01 ` David Howells
2022-05-09 7:40 ` [PATCH v11 09/22] erofs: make erofs_map_blocks() generally available Jeffle Xu
2022-05-09 7:40 ` [PATCH v11 10/22] erofs: add fscache mode check helper Jeffle Xu
2022-05-09 7:40 ` [PATCH v11 11/22] erofs: register fscache volume Jeffle Xu
2022-05-09 7:40 ` [PATCH v11 12/22] erofs: add fscache context helper functions Jeffle Xu
2022-05-09 7:40 ` [PATCH v11 13/22] erofs: add anonymous inode caching metadata for data blobs Jeffle Xu
2022-05-09 7:40 ` [PATCH v11 14/22] erofs: add erofs_fscache_read_folios() helper Jeffle Xu
2022-05-09 7:40 ` [PATCH v11 15/22] erofs: register fscache context for primary data blob Jeffle Xu
2022-05-09 7:40 ` [PATCH v11 16/22] erofs: register fscache context for extra data blobs Jeffle Xu
2022-05-09 7:40 ` Jeffle Xu [this message]
2022-05-09 7:40 ` [PATCH v11 18/22] erofs: implement fscache-based data read for non-inline layout Jeffle Xu
2022-05-09 7:40 ` [PATCH v11 19/22] erofs: implement fscache-based data read for inline layout Jeffle Xu
2022-05-09 7:40 ` [PATCH v11 20/22] erofs: implement fscache-based data readahead Jeffle Xu
2022-05-09 7:40 ` [PATCH v11 21/22] erofs: add 'fsid' mount option Jeffle Xu
2022-05-09 7:40 ` [PATCH v11 22/22] erofs: change to use asynchronous io for fscache readpage/readahead Jeffle Xu
2022-05-10 6:48 ` [PATCH v11 00/22] fscache, erofs: fscache-based on-demand read semantics 严松
2022-05-10 14:14 ` [PATCH v11 00/22] fscache,erofs: " Chao Yu
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=20220509074028.74954-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=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=yinxin.x@bytedance.com \
--cc=zhangjiachen.jaycee@bytedance.com \
--cc=zhujia.zj@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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox