[PATCH v3 16/22] erofs: implement fscache-based data read for inline layout

From: Jeffle Xu
Date: Wed Feb 09 2022 - 01:13:13 EST


This patch implements the data plane of reading data from bootstrap blob
file over fscache for inline layout.

Signed-off-by: Jeffle Xu <jefflexu@xxxxxxxxxxxxxxxxx>
---
fs/erofs/fscache.c | 37 +++++++++++++++++++++++++++++++++++++
1 file changed, 37 insertions(+)

diff --git a/fs/erofs/fscache.c b/fs/erofs/fscache.c
index 82fdde054b0b..fcd686f4dc9f 100644
--- a/fs/erofs/fscache.c
+++ b/fs/erofs/fscache.c
@@ -95,6 +95,41 @@ static int erofs_fscache_readpage_noinline(struct page *page,
return erofs_fscache_read_page(cookie, page, start);
}

+static int erofs_fscache_readpage_inline(struct page *page,
+ struct erofs_fscache_map *fsmap)
+{
+ struct inode *inode = page->mapping->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, while
+ * the offset 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(fsmap->m_pa);
+ blknr = erofs_blknr(fsmap->m_pa);
+ len = fsmap->m_llen;
+
+ src = erofs_read_metabuf(&buf, sb, blknr, EROFS_KMAP);
+ if (IS_ERR(src))
+ return PTR_ERR(src);
+
+ dst = kmap(page);
+ memcpy(dst, src + offset, len);
+ memset(dst + len, 0, PAGE_SIZE - len);
+ kunmap(page);
+
+ erofs_put_metabuf(&buf);
+
+ return 0;
+}
+
static int erofs_fscache_do_readpage(struct page *page)
{
struct inode *inode = page->mapping->host;
@@ -128,6 +163,8 @@ static int erofs_fscache_do_readpage(struct page *page)
case EROFS_INODE_FLAT_PLAIN:
case EROFS_INODE_CHUNK_BASED:
return erofs_fscache_readpage_noinline(page, &fsmap);
+ case EROFS_INODE_FLAT_INLINE:
+ return erofs_fscache_readpage_inline(page, &fsmap);
default:
DBG_BUGON(1);
return -EOPNOTSUPP;
--
2.27.0