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 v6 18/22] erofs: implement fscache-based data read for inline layout
Date: Fri, 25 Mar 2022 20:22:19 +0800 [thread overview]
Message-ID: <20220325122223.102958-19-jefflexu@linux.alibaba.com> (raw)
In-Reply-To: <20220325122223.102958-1-jefflexu@linux.alibaba.com>
This patch implements the data plane of reading data from bootstrap blob
file over fscache for inline layout.
For the heading non-inline part, the data plane for non-inline layout is
resued, while only the tail packing part needs special handling.
Signed-off-by: Jeffle Xu <jefflexu@linux.alibaba.com>
---
fs/erofs/fscache.c | 45 +++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 43 insertions(+), 2 deletions(-)
diff --git a/fs/erofs/fscache.c b/fs/erofs/fscache.c
index 4a9a4e60c15d..d75958470645 100644
--- a/fs/erofs/fscache.c
+++ b/fs/erofs/fscache.c
@@ -74,8 +74,9 @@ static int erofs_fscache_readpage_noinline(struct folio *folio,
{
struct fscache_cookie *cookie = map->m_fscache->cookie;
/*
- * 1) For FLAT_PLAIN layout, the output map.m_la shall be equal to o_la,
- * and the output map.m_pa is exactly the physical address of o_la.
+ * 1) For FLAT_PLAIN and FLAT_INLINE (the heading non tail packing part)
+ * layout, the output map.m_la shall be equal to o_la, and the output
+ * map.m_pa is exactly the physical address of o_la.
* 2) For CHUNK_BASED layout, the output map.m_la is rounded down to the
* nearest chunk boundary, and the output map.m_pa is actually the
* physical address of this chunk boundary. So we need to recalculate
@@ -86,6 +87,42 @@ static int erofs_fscache_readpage_noinline(struct folio *folio,
return erofs_fscache_read_folio(cookie, folio, start);
}
+static int erofs_fscache_readpage_inline(struct folio *folio,
+ struct erofs_map_blocks *map)
+{
+ struct inode *inode = folio_file_mapping(folio)->host;
+ struct super_block *sb = inode->i_sb;
+ struct erofs_buf buf = __EROFS_BUF_INITIALIZER;
+ erofs_blk_t blknr;
+ size_t offset, len;
+ void *src, *dst;
+
+ /*
+ * For inline (tail packing) layout, the offset may be non-zero, which
+ * can be calculated from corresponding physical address directly.
+ * Currently only flat layout supports inline (FLAT_INLINE), and the
+ * output map.m_pa is exactly the physical address of o_la in this case.
+ */
+ offset = erofs_blkoff(map->m_pa);
+ blknr = erofs_blknr(map->m_pa);
+ len = map->m_llen;
+
+ src = erofs_read_metabuf(&buf, sb, blknr, EROFS_KMAP);
+ if (IS_ERR(src))
+ return PTR_ERR(src);
+
+ DBG_BUGON(folio_size(folio) != PAGE_SIZE);
+
+ dst = kmap(folio_page(folio, 0));
+ memcpy(dst, src + offset, len);
+ memset(dst + len, 0, PAGE_SIZE - len);
+ kunmap(folio_page(folio, 0));
+
+ erofs_put_metabuf(&buf);
+
+ return 0;
+}
+
static int erofs_fscache_do_readpage(struct folio *folio)
{
struct inode *inode = folio_file_mapping(folio)->host;
@@ -116,8 +153,12 @@ static int erofs_fscache_do_readpage(struct folio *folio)
if (ret)
return ret;
+ if (map.m_flags & EROFS_MAP_META)
+ return erofs_fscache_readpage_inline(folio, &map);
+
switch (vi->datalayout) {
case EROFS_INODE_FLAT_PLAIN:
+ case EROFS_INODE_FLAT_INLINE:
case EROFS_INODE_CHUNK_BASED:
return erofs_fscache_readpage_noinline(folio, &map);
default:
--
2.27.0
next prev parent reply other threads:[~2022-03-25 12:23 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-25 12:22 [PATCH v6 00/22] fscache,erofs: fscache-based on-demand read semantics Jeffle Xu
2022-03-25 12:22 ` [PATCH v6 01/22] fscache: export fscache_end_operation() Jeffle Xu
2022-03-25 12:22 ` [PATCH v6 02/22] cachefiles: extract write routine Jeffle Xu
2022-03-25 12:22 ` [PATCH v6 03/22] cachefiles: notify user daemon with anon_fd when looking up cookie Jeffle Xu
2022-03-25 20:52 ` kernel test robot
2022-03-25 23:25 ` kernel test robot
2022-03-29 6:14 ` [Linux-cachefs] " JeffleXu
2022-03-25 12:22 ` [PATCH v6 04/22] cachefiles: notify user daemon when withdrawing cookie Jeffle Xu
2022-03-25 12:22 ` [PATCH v6 05/22] cachefiles: implement on-demand read Jeffle Xu
2022-03-25 12:22 ` [PATCH v6 06/22] cachefiles: enable on-demand read mode Jeffle Xu
2022-03-25 12:22 ` [PATCH v6 07/22] cachefiles: document " Jeffle Xu
2022-03-25 12:22 ` [PATCH v6 08/22] erofs: use meta buffers for erofs_read_superblock() Jeffle Xu
2022-03-25 12:22 ` [PATCH v6 09/22] erofs: make erofs_map_blocks() generally available Jeffle Xu
2022-03-25 12:22 ` [PATCH v6 10/22] erofs: add mode checking helper Jeffle Xu
2022-03-28 2:42 ` Gao Xiang
2022-03-28 2:46 ` JeffleXu
2022-03-25 12:22 ` [PATCH v6 11/22] erofs: register global fscache volume Jeffle Xu
2022-03-25 12:22 ` [PATCH v6 12/22] erofs: add cookie context helper functions Jeffle Xu
2022-03-25 13:41 ` Gao Xiang
2022-03-28 3:11 ` JeffleXu
2022-03-25 12:22 ` [PATCH v6 13/22] erofs: add anonymous inode managing page cache of blob file Jeffle Xu
2022-03-25 13:46 ` [Linux-cachefs] " Gao Xiang
2022-03-25 12:22 ` [PATCH v6 14/22] erofs: add erofs_fscache_read_folios() helper Jeffle Xu
2022-03-28 2:49 ` [Linux-cachefs] " Gao Xiang
2022-03-25 12:22 ` [PATCH v6 15/22] erofs: register cookie context for bootstrap blob Jeffle Xu
2022-03-28 3:04 ` Gao Xiang
2022-03-28 3:15 ` JeffleXu
2022-03-25 12:22 ` [PATCH v6 16/22] erofs: implement fscache-based metadata read Jeffle Xu
2022-03-25 12:22 ` [PATCH v6 17/22] erofs: implement fscache-based data read for non-inline layout Jeffle Xu
2022-03-28 3:14 ` Gao Xiang
2022-03-25 12:22 ` Jeffle Xu [this message]
2022-03-25 12:22 ` [PATCH v6 19/22] erofs: register cookie context for data blobs Jeffle Xu
2022-03-28 9:48 ` Gao Xiang
2022-03-25 12:22 ` [PATCH v6 20/22] erofs: implement fscache-based data read " Jeffle Xu
2022-03-28 9:50 ` Gao Xiang
2022-03-25 12:22 ` [PATCH v6 21/22] erofs: implement fscache-based data readahead Jeffle Xu
2022-03-28 10:55 ` Gao Xiang
2022-03-25 12:22 ` [PATCH v6 22/22] erofs: add 'tag' mount option 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=20220325122223.102958-19-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
all inboxes | Powered by JetHome®