All of lore.kernel.org
 help / color / mirror / Atom feed
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, 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,
	yinxin.x@bytedance.com
Subject: [PATCH v11 18/22] erofs: implement fscache-based data read for non-inline layout
Date: Mon,  9 May 2022 15:40:24 +0800	[thread overview]
Message-ID: <20220509074028.74954-19-jefflexu@linux.alibaba.com> (raw)
In-Reply-To: <20220509074028.74954-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>
Reviewed-by: Gao Xiang <hsiangkao@linux.alibaba.com>
---
 fs/erofs/fscache.c  | 51 +++++++++++++++++++++++++++++++++++++++++++++
 fs/erofs/inode.c    |  4 ++++
 fs/erofs/internal.h |  2 ++
 3 files changed, 57 insertions(+)

diff --git a/fs/erofs/fscache.c b/fs/erofs/fscache.c
index 23d7e862eed8..b3af72af7c88 100644
--- a/fs/erofs/fscache.c
+++ b/fs/erofs/fscache.c
@@ -83,10 +83,61 @@ 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_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;
+
+	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;
+	}
+
+	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_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,
+};
+
 int erofs_fscache_register_cookie(struct super_block *sb,
 				  struct erofs_fscache **fscache,
 				  char *name, bool need_inode)
diff --git a/fs/erofs/inode.c b/fs/erofs/inode.c
index e8b37ba5e9ad..8d3f56c6469b 100644
--- a/fs/erofs/inode.c
+++ b/fs/erofs/inode.c
@@ -297,6 +297,10 @@ static int erofs_fill_inode(struct inode *inode, int isdir)
 		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 fa488af8dfcf..c8f6ac910976 100644
--- a/fs/erofs/internal.h
+++ b/fs/erofs/internal.h
@@ -639,6 +639,8 @@ int erofs_fscache_register_cookie(struct super_block *sb,
 				  struct erofs_fscache **fscache,
 				  char *name, bool need_inode);
 void erofs_fscache_unregister_cookie(struct erofs_fscache **fscache);
+
+extern const struct address_space_operations erofs_fscache_access_aops;
 #else
 static inline int erofs_fscache_register_fs(struct super_block *sb)
 {
-- 
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: 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 18/22] erofs: implement fscache-based data read for non-inline layout
Date: Mon,  9 May 2022 15:40:24 +0800	[thread overview]
Message-ID: <20220509074028.74954-19-jefflexu@linux.alibaba.com> (raw)
In-Reply-To: <20220509074028.74954-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>
Reviewed-by: Gao Xiang <hsiangkao@linux.alibaba.com>
---
 fs/erofs/fscache.c  | 51 +++++++++++++++++++++++++++++++++++++++++++++
 fs/erofs/inode.c    |  4 ++++
 fs/erofs/internal.h |  2 ++
 3 files changed, 57 insertions(+)

diff --git a/fs/erofs/fscache.c b/fs/erofs/fscache.c
index 23d7e862eed8..b3af72af7c88 100644
--- a/fs/erofs/fscache.c
+++ b/fs/erofs/fscache.c
@@ -83,10 +83,61 @@ 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_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;
+
+	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;
+	}
+
+	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_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,
+};
+
 int erofs_fscache_register_cookie(struct super_block *sb,
 				  struct erofs_fscache **fscache,
 				  char *name, bool need_inode)
diff --git a/fs/erofs/inode.c b/fs/erofs/inode.c
index e8b37ba5e9ad..8d3f56c6469b 100644
--- a/fs/erofs/inode.c
+++ b/fs/erofs/inode.c
@@ -297,6 +297,10 @@ static int erofs_fill_inode(struct inode *inode, int isdir)
 		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 fa488af8dfcf..c8f6ac910976 100644
--- a/fs/erofs/internal.h
+++ b/fs/erofs/internal.h
@@ -639,6 +639,8 @@ int erofs_fscache_register_cookie(struct super_block *sb,
 				  struct erofs_fscache **fscache,
 				  char *name, bool need_inode);
 void erofs_fscache_unregister_cookie(struct erofs_fscache **fscache);
+
+extern const struct address_space_operations erofs_fscache_access_aops;
 #else
 static inline int erofs_fscache_register_fs(struct super_block *sb)
 {
-- 
2.27.0


  parent reply	other threads:[~2022-05-09  7:41 UTC|newest]

Thread overview: 60+ 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 00/22] fscache,erofs: " Jeffle Xu
2022-05-09  7:40 ` [PATCH v11 01/22] cachefiles: extract write routine Jeffle Xu
2022-05-09  7:40   ` Jeffle Xu
2022-05-09  7:40 ` [PATCH v11 02/22] cachefiles: notify the user daemon when looking up cookie Jeffle Xu
2022-05-09  7:40   ` Jeffle Xu
2022-05-09  7:40 ` [PATCH v11 03/22] cachefiles: unbind cachefiles gracefully in on-demand mode Jeffle Xu
2022-05-09  7:40   ` Jeffle Xu
2022-05-09  7:40 ` [PATCH v11 04/22] cachefiles: notify the user daemon when withdrawing cookie Jeffle Xu
2022-05-09  7:40   ` Jeffle Xu
2022-05-09  7:40 ` [PATCH v11 05/22] cachefiles: implement on-demand read Jeffle Xu
2022-05-09  7:40   ` Jeffle Xu
2022-05-09  7:40 ` [PATCH v11 06/22] cachefiles: enable on-demand read mode Jeffle Xu
2022-05-09  7:40   ` Jeffle Xu
2022-05-09  7:40 ` [PATCH v11 07/22] cachefiles: add tracepoints for " Jeffle Xu
2022-05-09  7:40   ` Jeffle Xu
2022-05-09  7:40 ` [PATCH v11 08/22] cachefiles: document " Jeffle Xu
2022-05-09  7:40   ` Jeffle Xu
2022-05-09  7:40 ` [PATCH v11 09/22] erofs: make erofs_map_blocks() generally available Jeffle Xu
2022-05-09  7:40   ` Jeffle Xu
2022-05-09  7:40 ` [PATCH v11 10/22] erofs: add fscache mode check helper Jeffle Xu
2022-05-09  7:40   ` Jeffle Xu
2022-05-09  7:40 ` [PATCH v11 11/22] erofs: register fscache volume Jeffle Xu
2022-05-09  7:40   ` Jeffle Xu
2022-05-09  7:40 ` [PATCH v11 12/22] erofs: add fscache context helper functions Jeffle Xu
2022-05-09  7:40   ` 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   ` 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   ` 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   ` 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
2022-05-09  7:40 ` [PATCH v11 17/22] erofs: implement fscache-based metadata read Jeffle Xu
2022-05-09  7:40   ` 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   ` Jeffle Xu
2022-05-09  7:40 ` [PATCH v11 20/22] erofs: implement fscache-based data readahead Jeffle Xu
2022-05-09  7:40   ` Jeffle Xu
2022-05-09  7:40 ` [PATCH v11 21/22] erofs: add 'fsid' mount option Jeffle Xu
2022-05-09  7:40   ` 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-09  7:40   ` Jeffle Xu
2022-05-10  6:48 ` [PATCH v11 00/22] fscache, erofs: fscache-based on-demand read semantics 严松
2022-05-10  6:48   ` 严松 via Linux-erofs
2022-05-10 12:50 ` [PATCH v11 02/22] cachefiles: notify the user daemon when looking up cookie David Howells
2022-05-10 12:50   ` David Howells
2022-05-10 12:53 ` [PATCH v11 03/22] cachefiles: unbind cachefiles gracefully in on-demand mode David Howells
2022-05-10 12:53   ` David Howells
2022-05-10 12:56 ` [PATCH v11 06/22] cachefiles: enable on-demand read mode David Howells
2022-05-10 12:56   ` David Howells
2022-05-10 13:29   ` Gao Xiang
2022-05-10 13:29     ` Gao Xiang
2022-05-10 13:01 ` [PATCH v11 08/22] cachefiles: document " David Howells
2022-05-10 13:01   ` David Howells
2022-05-10 14:14 ` [PATCH v11 00/22] fscache,erofs: fscache-based on-demand read semantics Chao Yu
2022-05-10 14:14   ` 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-19-jefflexu@linux.alibaba.com \
    --to=jefflexu@linux.alibaba.com \
    --cc=chao@kernel.org \
    --cc=dhowells@redhat.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=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 \
    /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 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.