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
Subject: [PATCH v8 17/20] erofs: implement fscache-based data read for non-inline layout
Date: Wed, 6 Apr 2022 15:56:09 +0800 [thread overview]
Message-ID: <20220406075612.60298-18-jefflexu@linux.alibaba.com> (raw)
In-Reply-To: <20220406075612.60298-1-jefflexu@linux.alibaba.com>
Implement the data plane of reading data from data blobs over fscache
for non-inline layout.
Signed-off-by: Jeffle Xu <jefflexu@linux.alibaba.com>
---
fs/erofs/fscache.c | 52 +++++++++++++++++++++++++++++++++++++++++++++
fs/erofs/inode.c | 5 +++++
fs/erofs/internal.h | 2 ++
3 files changed, 59 insertions(+)
diff --git a/fs/erofs/fscache.c b/fs/erofs/fscache.c
index 158cc273f8fb..65de1c754e80 100644
--- a/fs/erofs/fscache.c
+++ b/fs/erofs/fscache.c
@@ -60,10 +60,62 @@ static int erofs_fscache_meta_readpage(struct file *data, struct page *page)
return ret;
}
+static int erofs_fscache_readpage(struct file *file, struct page *page)
+{
+ struct folio *folio = page_folio(page);
+ struct inode *inode = folio_file_mapping(folio)->host;
+ struct super_block *sb = inode->i_sb;
+ struct erofs_map_blocks map;
+ struct erofs_map_dev mdev;
+ erofs_off_t pos;
+ loff_t pstart;
+ int ret = 0;
+
+ DBG_BUGON(folio_size(folio) != EROFS_BLKSIZ);
+
+ pos = folio_pos(folio);
+ map.m_la = pos;
+
+ ret = erofs_map_blocks(inode, &map, EROFS_GET_BLOCKS_RAW);
+ if (ret)
+ goto out_unlock;
+
+ if (!(map.m_flags & EROFS_MAP_MAPPED)) {
+ folio_zero_range(folio, 0, folio_size(folio));
+ goto out_uptodate;
+ }
+
+ /* no-inline readpage */
+ mdev = (struct erofs_map_dev) {
+ .m_deviceid = map.m_deviceid,
+ .m_pa = map.m_pa,
+ };
+
+ ret = erofs_map_dev(sb, &mdev);
+ if (ret)
+ goto out_unlock;
+
+ pstart = mdev.m_pa + (pos - map.m_la);
+ ret = erofs_fscache_read_folios(mdev.m_fscache->cookie,
+ folio_file_mapping(folio), folio_pos(folio),
+ folio_size(folio), pstart);
+
+out_uptodate:
+ if (!ret)
+ folio_mark_uptodate(folio);
+out_unlock:
+ folio_unlock(folio);
+ return ret;
+}
+
static const struct address_space_operations erofs_fscache_meta_aops = {
.readpage = erofs_fscache_meta_readpage,
};
+const struct address_space_operations erofs_fscache_access_aops = {
+ .readpage = erofs_fscache_readpage,
+};
+
/*
* Get the page cache of data blob at the index offset.
* Return: up to date page on success, ERR_PTR() on failure.
diff --git a/fs/erofs/inode.c b/fs/erofs/inode.c
index e8b37ba5e9ad..88b51b5fb53f 100644
--- a/fs/erofs/inode.c
+++ b/fs/erofs/inode.c
@@ -296,7 +296,12 @@ static int erofs_fill_inode(struct inode *inode, int isdir)
err = z_erofs_fill_inode(inode);
goto out_unlock;
}
+
inode->i_mapping->a_ops = &erofs_raw_access_aops;
+#ifdef CONFIG_EROFS_FS_ONDEMAND
+ if (erofs_is_fscache_mode(inode->i_sb))
+ inode->i_mapping->a_ops = &erofs_fscache_access_aops;
+#endif
out_unlock:
erofs_put_metabuf(&buf);
diff --git a/fs/erofs/internal.h b/fs/erofs/internal.h
index e186051f0640..336d19647c96 100644
--- a/fs/erofs/internal.h
+++ b/fs/erofs/internal.h
@@ -642,6 +642,8 @@ int erofs_fscache_register_cookie(struct super_block *sb,
void erofs_fscache_unregister_cookie(struct erofs_fscache **fscache);
struct folio *erofs_fscache_get_folio(struct super_block *sb, pgoff_t index);
+
+extern const struct address_space_operations erofs_fscache_access_aops;
#else
static inline int erofs_fscache_register_fs(struct super_block *sb) { return 0; }
static inline void erofs_fscache_unregister_fs(struct super_block *sb) {}
--
2.27.0
next prev parent reply other threads:[~2022-04-06 12:14 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-06 7:55 [PATCH v8 00/20] fscache,erofs: fscache-based on-demand read semantics Jeffle Xu
2022-04-06 7:55 ` [PATCH v8 01/20] cachefiles: unmark inode in use in error path Jeffle Xu
2022-04-06 7:55 ` [PATCH v8 02/20] cachefiles: extract write routine Jeffle Xu
2022-04-11 12:13 ` David Howells
2022-04-11 12:29 ` JeffleXu
2022-04-06 7:55 ` [PATCH v8 03/20] cachefiles: notify user daemon with anon_fd when looking up cookie Jeffle Xu
2022-04-11 12:28 ` David Howells
2022-04-11 12:36 ` JeffleXu
2022-04-11 12:32 ` David Howells
2022-04-11 12:36 ` JeffleXu
2022-04-06 7:55 ` [PATCH v8 04/20] cachefiles: notify user daemon when withdrawing cookie Jeffle Xu
2022-04-11 12:35 ` David Howells
2022-04-11 12:48 ` JeffleXu
2022-04-11 13:42 ` David Howells
2022-04-12 3:35 ` JeffleXu
2022-04-06 7:55 ` [PATCH v8 05/20] cachefiles: implement on-demand read Jeffle Xu
2022-04-11 12:44 ` David Howells
2022-04-11 12:50 ` JeffleXu
2022-04-06 7:55 ` [PATCH v8 06/20] cachefiles: enable on-demand read mode Jeffle Xu
2022-04-06 7:55 ` [PATCH v8 07/20] cachefiles: document " Jeffle Xu
2022-04-11 13:38 ` David Howells
2022-04-12 3:17 ` JeffleXu
2022-04-06 7:56 ` [PATCH v8 08/20] erofs: make erofs_map_blocks() generally available Jeffle Xu
2022-04-07 2:44 ` Gao Xiang
2022-04-06 7:56 ` [PATCH v8 09/20] erofs: add mode checking helper Jeffle Xu
2022-04-07 2:46 ` Gao Xiang
2022-04-06 7:56 ` [PATCH v8 10/20] erofs: register fscache volume Jeffle Xu
2022-04-07 2:50 ` Gao Xiang
2022-04-06 7:56 ` [PATCH v8 11/20] erofs: add fscache context helper functions Jeffle Xu
2022-04-07 3:25 ` Gao Xiang
2022-04-06 7:56 ` [PATCH v8 12/20] erofs: add anonymous inode managing page cache for data blob Jeffle Xu
2022-04-07 5:31 ` Gao Xiang
2022-04-08 2:14 ` JeffleXu
2022-04-06 7:56 ` [PATCH v8 13/20] erofs: add erofs_fscache_read_folios() helper Jeffle Xu
2022-04-07 14:05 ` Gao Xiang
2022-04-06 7:56 ` [PATCH v8 14/20] erofs: register fscache context for primary data blob Jeffle Xu
2022-04-07 14:09 ` Gao Xiang
2022-04-06 7:56 ` [PATCH v8 15/20] erofs: register fscache context for extra data blobs Jeffle Xu
2022-04-07 14:15 ` Gao Xiang
2022-04-08 2:11 ` JeffleXu
2022-04-06 7:56 ` [PATCH v8 16/20] erofs: implement fscache-based metadata read Jeffle Xu
2022-04-07 14:19 ` Gao Xiang
2022-04-06 7:56 ` Jeffle Xu [this message]
2022-04-07 14:24 ` [PATCH v8 17/20] erofs: implement fscache-based data read for non-inline layout Gao Xiang
2022-04-06 7:56 ` [PATCH v8 18/20] erofs: implement fscache-based data read for inline layout Jeffle Xu
2022-04-07 14:31 ` Gao Xiang
2022-04-06 7:56 ` [PATCH v8 19/20] erofs: implement fscache-based data readahead Jeffle Xu
2022-04-07 14:36 ` Gao Xiang
2022-04-06 7:56 ` [PATCH v8 20/20] erofs: add 'fsid' mount option Jeffle Xu
2022-04-07 14:39 ` Gao Xiang
2022-04-10 12:51 ` [PATCH v8 00/20] fscache,erofs: fscache-based on-demand read semantics Gao Xiang
2022-04-13 12:27 ` 田子晨
2022-04-14 8:10 ` Jiachen Zhang
2022-04-14 9:29 ` Gao Xiang
2022-04-11 13:43 ` David Howells
2022-04-12 3:18 ` 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=20220406075612.60298-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 \
/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