* [PATCH RFC v4 1/4] erofs: move `struct erofs_anon_fs_type` to super.c
2024-09-02 11:06 [PATCH RFC v4 0/4] erofs: introduce page cache share feature Hongzhen Luo
@ 2024-09-02 11:06 ` Hongzhen Luo
2024-09-02 11:06 ` [PATCH RFC v4 2/4] erofs: introduce page cache share feature Hongzhen Luo
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Hongzhen Luo @ 2024-09-02 11:06 UTC (permalink / raw)
To: linux-erofs; +Cc: lihongbo22, linux-kernel, Hongzhen Luo
Move the `struct erofs_anon_fs_type` to the super.c and
expose it in preparation for the upcoming page cache share
feature.
Signed-off-by: Hongzhen Luo <hongzhen@linux.alibaba.com>
---
v4: There are no changes compared to v3.
v3: https://lore.kernel.org/all/20240828111959.3677011-2-hongzhen@linux.alibaba.com/
v2: The patch set v2 does not move the `struct erofs_anon_fs_type` to super.c.
v1: https://lore.kernel.org/all/20240722065355.1396365-2-hongzhen@linux.alibaba.com/
---
fs/erofs/fscache.c | 13 -------------
fs/erofs/internal.h | 2 ++
fs/erofs/super.c | 21 +++++++++++++++++++++
3 files changed, 23 insertions(+), 13 deletions(-)
diff --git a/fs/erofs/fscache.c b/fs/erofs/fscache.c
index fda16eedafb5..826b2893acb2 100644
--- a/fs/erofs/fscache.c
+++ b/fs/erofs/fscache.c
@@ -3,7 +3,6 @@
* Copyright (C) 2022, Alibaba Cloud
* Copyright (C) 2022, Bytedance Inc. All rights reserved.
*/
-#include <linux/pseudo_fs.h>
#include <linux/fscache.h>
#include "internal.h"
@@ -13,18 +12,6 @@ static LIST_HEAD(erofs_domain_list);
static LIST_HEAD(erofs_domain_cookies_list);
static struct vfsmount *erofs_pseudo_mnt;
-static int erofs_anon_init_fs_context(struct fs_context *fc)
-{
- return init_pseudo(fc, EROFS_SUPER_MAGIC) ? 0 : -ENOMEM;
-}
-
-static struct file_system_type erofs_anon_fs_type = {
- .owner = THIS_MODULE,
- .name = "pseudo_erofs",
- .init_fs_context = erofs_anon_init_fs_context,
- .kill_sb = kill_anon_super,
-};
-
struct erofs_fscache_io {
struct netfs_cache_resources cres;
struct iov_iter iter;
diff --git a/fs/erofs/internal.h b/fs/erofs/internal.h
index 45dc15ebd870..3d6bb1b36378 100644
--- a/fs/erofs/internal.h
+++ b/fs/erofs/internal.h
@@ -387,6 +387,8 @@ extern const struct file_operations erofs_dir_fops;
extern const struct iomap_ops z_erofs_iomap_report_ops;
+extern struct file_system_type erofs_anon_fs_type;
+
/* flags for erofs_fscache_register_cookie() */
#define EROFS_REG_COOKIE_SHARE 0x0001
#define EROFS_REG_COOKIE_NEED_NOEXIST 0x0002
diff --git a/fs/erofs/super.c b/fs/erofs/super.c
index 6cb5c8916174..afca576144ca 100644
--- a/fs/erofs/super.c
+++ b/fs/erofs/super.c
@@ -10,6 +10,7 @@
#include <linux/fs_context.h>
#include <linux/fs_parser.h>
#include <linux/exportfs.h>
+#include <linux/pseudo_fs.h>
#include "xattr.h"
#define CREATE_TRACE_POINTS
@@ -834,6 +835,26 @@ static struct file_system_type erofs_fs_type = {
};
MODULE_ALIAS_FS("erofs");
+static const struct super_operations erofs_anon_sops = {
+ .statfs = simple_statfs,
+};
+
+static int erofs_anon_init_fs_context(struct fs_context *fc)
+{
+ struct pseudo_fs_context *ctx = init_pseudo(fc, EROFS_SUPER_MAGIC);
+
+ if (ctx)
+ ctx->ops = &erofs_anon_sops;
+ return ctx ? 0 : -ENOMEM;
+}
+
+struct file_system_type erofs_anon_fs_type = {
+ .owner = THIS_MODULE,
+ .name = "pseudo_erofs",
+ .init_fs_context = erofs_anon_init_fs_context,
+ .kill_sb = kill_anon_super,
+};
+
static int __init erofs_module_init(void)
{
int err;
--
2.43.5
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH RFC v4 2/4] erofs: introduce page cache share feature
2024-09-02 11:06 [PATCH RFC v4 0/4] erofs: introduce page cache share feature Hongzhen Luo
2024-09-02 11:06 ` [PATCH RFC v4 1/4] erofs: move `struct erofs_anon_fs_type` to super.c Hongzhen Luo
@ 2024-09-02 11:06 ` Hongzhen Luo
2024-09-02 11:06 ` [PATCH RFC v4 3/4] erofs: apply the " Hongzhen Luo
2024-09-02 11:06 ` [PATCH RFC v4 4/4] erofs: introduce .fadvise for page cache share Hongzhen Luo
3 siblings, 0 replies; 5+ messages in thread
From: Hongzhen Luo @ 2024-09-02 11:06 UTC (permalink / raw)
To: linux-erofs; +Cc: lihongbo22, linux-kernel, Hongzhen Luo
Currently, reading files with different paths (or names) but the same
content will consume multiple copies of the page cache, even if the
content of these page caches is the same. For example, reading identical
files (e.g., *.so files) from two different minor versions of container
images will cost multiple copies of the same page cache, since different
containers have different mount points. Therefore, sharing the page cache
for files with the same content can save memory.
This introduces the page cache share feature in erofs. During the mkfs
phase, the file content is hashed and the hash value is stored in the
`trusted.erofs.fingerprint` extended attribute. Inodes of files with the
same `trusted.erofs.fingerprint` are mapped to the same anonymous inode
(indicated by the `ano_inode` field). When a read request occurs, the
anonymous inode serves as a "container" whose page cache is shared. The
actual operations involving the iomap are carried out by the original
inode which is mapped to the anonymous inode.
Below is the memory usage for reading all files in two different minor
versions of container images:
+-------------------+------------------+-------------+---------------+
| Image | Page Cache Share | Memory (MB) | Memory |
| | | | Reduction (%) |
+-------------------+------------------+-------------+---------------+
| | No | 241 | - |
| redis +------------------+-------------+---------------+
| 7.2.4 & 7.2.5 | Yes | 163 | 33% |
+-------------------+------------------+-------------+---------------+
| | No | 872 | - |
| postgres +------------------+-------------+---------------+
| 16.1 & 16.2 | Yes | 630 | 28% |
+-------------------+------------------+-------------+---------------+
| | No | 2771 | - |
| tensorflow +------------------+-------------+---------------+
| 1.11.0 & 2.11.1 | Yes | 2340 | 16% |
+-------------------+------------------+-------------+---------------+
| | No | 926 | - |
| mysql +------------------+-------------+---------------+
| 8.0.11 & 8.0.12 | Yes | 735 | 21% |
+-------------------+------------------+-------------+---------------+
| | No | 390 | - |
| nginx +------------------+-------------+---------------+
| 7.2.4 & 7.2.5 | Yes | 219 | 44% |
+-------------------+------------------+-------------+---------------+
| tomcat | No | 924 | - |
| 10.1.25 & 10.1.26 +------------------+-------------+---------------+
| | Yes | 474 | 49% |
+-------------------+------------------+-------------+---------------+
Additionally, the table below shows the runtime memory usage of the
container:
+-------------------+------------------+-------------+---------------+
| Image | Page Cache Share | Memory (MB) | Memory |
| | | | Reduction (%) |
+-------------------+------------------+-------------+---------------+
| | No | 35 | - |
| redis +------------------+-------------+---------------+
| 7.2.4 & 7.2.5 | Yes | 28 | 20% |
+-------------------+------------------+-------------+---------------+
| | No | 149 | - |
| postgres +------------------+-------------+---------------+
| 16.1 & 16.2 | Yes | 95 | 37% |
+-------------------+------------------+-------------+---------------+
| | No | 1028 | - |
| tensorflow +------------------+-------------+---------------+
| 1.11.0 & 2.11.1 | Yes | 930 | 10% |
+-------------------+------------------+-------------+---------------+
| | No | 155 | - |
| mysql +------------------+-------------+---------------+
| 8.0.11 & 8.0.12 | Yes | 132 | 15% |
+-------------------+------------------+-------------+---------------+
| | No | 25 | - |
| nginx +------------------+-------------+---------------+
| 7.2.4 & 7.2.5 | Yes | 20 | 20% |
+-------------------+------------------+-------------+---------------+
| tomcat | No | 186 | - |
| 10.1.25 & 10.1.26 +------------------+-------------+---------------+
| | Yes | 98 | 48% |
+-------------------+------------------+-------------+---------------+
Signed-off-by: Hongzhen Luo <hongzhen@linux.alibaba.com>
---
v4: There are no changes compared to v3.
v3: https://lore.kernel.org/all/20240828111959.3677011-3-hongzhen@linux.alibaba.com/
v2: https://lore.kernel.org/all/20240731080704.678259-2-hongzhen@linux.alibaba.com/
v1: https://lore.kernel.org/all/20240722065355.1396365-4-hongzhen@linux.alibaba.com/
---
fs/erofs/Kconfig | 10 +++
fs/erofs/Makefile | 1 +
fs/erofs/internal.h | 4 +
fs/erofs/pagecache_share.c | 171 +++++++++++++++++++++++++++++++++++++
fs/erofs/pagecache_share.h | 20 +++++
5 files changed, 206 insertions(+)
create mode 100644 fs/erofs/pagecache_share.c
create mode 100644 fs/erofs/pagecache_share.h
diff --git a/fs/erofs/Kconfig b/fs/erofs/Kconfig
index 7dcdce660cac..756a74de623c 100644
--- a/fs/erofs/Kconfig
+++ b/fs/erofs/Kconfig
@@ -158,3 +158,13 @@ config EROFS_FS_PCPU_KTHREAD_HIPRI
at higher priority.
If unsure, say N.
+
+config EROFS_FS_PAGE_CACHE_SHARE
+ bool "EROFS page cache share support"
+ depends on EROFS_FS
+ default n
+ help
+ This permits EROFS to share page cache for files with same
+ fingerprints.
+
+ If unsure, say N.
diff --git a/fs/erofs/Makefile b/fs/erofs/Makefile
index 097d672e6b14..f14a2ac0e561 100644
--- a/fs/erofs/Makefile
+++ b/fs/erofs/Makefile
@@ -8,3 +8,4 @@ erofs-$(CONFIG_EROFS_FS_ZIP_LZMA) += decompressor_lzma.o
erofs-$(CONFIG_EROFS_FS_ZIP_DEFLATE) += decompressor_deflate.o
erofs-$(CONFIG_EROFS_FS_ZIP_ZSTD) += decompressor_zstd.o
erofs-$(CONFIG_EROFS_FS_ONDEMAND) += fscache.o
+erofs-$(CONFIG_EROFS_FS_PAGE_CACHE_SHARE) += pagecache_share.o
diff --git a/fs/erofs/internal.h b/fs/erofs/internal.h
index 3d6bb1b36378..358377825927 100644
--- a/fs/erofs/internal.h
+++ b/fs/erofs/internal.h
@@ -288,6 +288,9 @@ struct erofs_inode {
};
#endif /* CONFIG_EROFS_FS_ZIP */
};
+#ifdef CONFIG_EROFS_FS_PAGE_CACHE_SHARE
+ struct inode *ano_inode;
+#endif
/* the corresponding vfs inode */
struct inode vfs_inode;
};
@@ -384,6 +387,7 @@ extern const struct inode_operations erofs_dir_iops;
extern const struct file_operations erofs_file_fops;
extern const struct file_operations erofs_dir_fops;
+extern const struct file_operations erofs_pcs_file_fops;
extern const struct iomap_ops z_erofs_iomap_report_ops;
diff --git a/fs/erofs/pagecache_share.c b/fs/erofs/pagecache_share.c
new file mode 100644
index 000000000000..2d2a74547b67
--- /dev/null
+++ b/fs/erofs/pagecache_share.c
@@ -0,0 +1,171 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright (C) 2024, Alibaba Cloud
+ */
+#include <linux/xxhash.h>
+#include <linux/refcount.h>
+#include "pagecache_share.h"
+#include "internal.h"
+#include "xattr.h"
+
+#define PCS_FPRT_IDX 4
+#define PCS_FPRT_NAME "erofs.fingerprint"
+#define PCS_FPRT_MAXLEN (sizeof(size_t) + 1024)
+
+static DEFINE_MUTEX(pseudo_mnt_lock);
+static refcount_t pseudo_mnt_count;
+static struct vfsmount *erofs_pcs_mnt;
+
+int erofs_pcs_init_mnt(void)
+{
+ mutex_lock(&pseudo_mnt_lock);
+ if (!erofs_pcs_mnt) {
+ struct vfsmount *tmp = kern_mount(&erofs_anon_fs_type);
+ if (IS_ERR(tmp))
+ return PTR_ERR(tmp);
+ erofs_pcs_mnt = tmp;
+ refcount_set(&pseudo_mnt_count, 1);
+ } else
+ refcount_add(1, &pseudo_mnt_count);
+ mutex_unlock(&pseudo_mnt_lock);
+ return 0;
+}
+
+void erofs_pcs_free_mnt(void)
+{
+ mutex_lock(&pseudo_mnt_lock);
+ if (refcount_dec_and_test(&pseudo_mnt_count)) {
+ kern_unmount(erofs_pcs_mnt);
+ erofs_pcs_mnt = NULL;
+ }
+ mutex_unlock(&pseudo_mnt_lock);
+}
+
+static int erofs_pcs_eq(struct inode *inode, void *data)
+{
+ return inode->i_private && memcmp(inode->i_private, data,
+ sizeof(size_t) + *(size_t *)data) == 0 ? 1 : 0;
+}
+
+static int erofs_pcs_set_fprt(struct inode *inode, void *data)
+{
+ /* fprt length and content */
+ inode->i_private = kmalloc(*(size_t *)data + sizeof(size_t),
+ GFP_KERNEL);
+ memcpy(inode->i_private, data, sizeof(size_t) + *(size_t *)data);
+ return 0;
+}
+
+void erofs_pcs_fill_inode(struct inode *inode)
+{
+ struct erofs_inode *vi = EROFS_I(inode);
+ char fprt[PCS_FPRT_MAXLEN];
+ struct inode *ano_inode;
+ unsigned long fprt_hash;
+ size_t fprt_len;
+
+ vi->ano_inode = NULL;
+ fprt_len = erofs_getxattr(inode, PCS_FPRT_IDX, PCS_FPRT_NAME,
+ fprt + sizeof(size_t), PCS_FPRT_MAXLEN);
+ if (fprt_len > 0 && fprt_len <= PCS_FPRT_MAXLEN) {
+ *(size_t *)fprt = fprt_len;
+ fprt_hash = xxh32(fprt + sizeof(size_t), fprt_len, 0);
+ ano_inode = iget5_locked(erofs_pcs_mnt->mnt_sb, fprt_hash,
+ erofs_pcs_eq, erofs_pcs_set_fprt, fprt);
+ vi->ano_inode = ano_inode;
+ if (ano_inode->i_state & I_NEW) {
+ if (erofs_inode_is_data_compressed(vi->datalayout))
+ ano_inode->i_mapping->a_ops = &z_erofs_aops;
+ else
+ ano_inode->i_mapping->a_ops =
+ &erofs_raw_access_aops;
+ ano_inode->i_size = inode->i_size;
+ unlock_new_inode(ano_inode);
+ }
+ }
+}
+
+static struct file *erofs_pcs_alloc_file(struct file *file,
+ struct inode *ano_inode)
+{
+ struct file *ano_file;
+
+ ano_file = alloc_file_pseudo(ano_inode, erofs_pcs_mnt, "[erofs_pcs_f]",
+ O_RDONLY, &erofs_file_fops);
+ file_ra_state_init(&ano_file->f_ra, file->f_mapping);
+ ano_file->private_data = EROFS_I(file_inode(file));
+ return ano_file;
+}
+
+static int erofs_pcs_file_open(struct inode *inode, struct file *file)
+{
+ struct file *ano_file;
+ struct inode *ano_inode;
+ struct erofs_inode *vi = EROFS_I(inode);
+
+ ano_inode = vi->ano_inode;
+ if (!ano_inode)
+ return -EINVAL;
+ ano_file = erofs_pcs_alloc_file(file, ano_inode);
+ ihold(ano_inode);
+ file->private_data = (void *)ano_file;
+ return 0;
+}
+
+static int erofs_pcs_file_release(struct inode *inode, struct file *file)
+{
+ if (!file->private_data)
+ return -EINVAL;
+ fput((struct file *)file->private_data);
+ file->private_data = NULL;
+ return 0;
+}
+
+static ssize_t erofs_pcs_file_read_iter(struct kiocb *iocb,
+ struct iov_iter *to)
+{
+ struct inode *inode = file_inode(iocb->ki_filp);
+ struct file *file, *ano_file;
+ struct kiocb ano_iocb;
+ ssize_t res;
+
+ if (!iov_iter_count(to))
+ return 0;
+#ifdef CONFIG_FS_DAX
+ if (IS_DAX(inode))
+ return erofs_file_fops.read_iter(iocb, to);
+#endif
+ if (iocb->ki_flags & IOCB_DIRECT)
+ return erofs_file_fops.read_iter(iocb, to);
+
+ memcpy(&ano_iocb, iocb, sizeof(struct kiocb));
+ file = iocb->ki_filp;
+ ano_file = file->private_data;
+ if (!ano_file)
+ return -EINVAL;
+ ano_iocb.ki_filp = ano_file;
+ res = filemap_read(&ano_iocb, to, 0);
+ memcpy(iocb, &ano_iocb, sizeof(struct kiocb));
+ iocb->ki_filp = file;
+ file_accessed(file);
+ return res;
+}
+
+static int erofs_pcs_mmap(struct file *file, struct vm_area_struct *vma)
+{
+ struct file *ano_file = file->private_data;
+
+ vma_set_file(vma, ano_file);
+ vma->vm_ops = &generic_file_vm_ops;
+ return 0;
+}
+
+const struct file_operations erofs_pcs_file_fops = {
+ .open = erofs_pcs_file_open,
+ .llseek = generic_file_llseek,
+ .read_iter = erofs_pcs_file_read_iter,
+ .mmap = erofs_pcs_mmap,
+ .release = erofs_pcs_file_release,
+ .get_unmapped_area = thp_get_unmapped_area,
+ .splice_read = filemap_splice_read,
+};
diff --git a/fs/erofs/pagecache_share.h b/fs/erofs/pagecache_share.h
new file mode 100644
index 000000000000..b8111291cf79
--- /dev/null
+++ b/fs/erofs/pagecache_share.h
@@ -0,0 +1,20 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+/*
+ * Copyright (C) 2024, Alibaba Cloud
+ */
+#ifndef __EROFS_PAGECACHE_SHARE_H
+#define __EROFS_PAGECACHE_SHARE_H
+
+#include <linux/fs.h>
+#include <linux/mount.h>
+#include <linux/rwlock.h>
+#include <linux/mutex.h>
+#include "internal.h"
+
+int erofs_pcs_init_mnt(void);
+void erofs_pcs_free_mnt(void);
+void erofs_pcs_fill_inode(struct inode *inode);
+
+extern const struct vm_operations_struct generic_file_vm_ops;
+
+#endif
--
2.43.5
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH RFC v4 3/4] erofs: apply the page cache share feature
2024-09-02 11:06 [PATCH RFC v4 0/4] erofs: introduce page cache share feature Hongzhen Luo
2024-09-02 11:06 ` [PATCH RFC v4 1/4] erofs: move `struct erofs_anon_fs_type` to super.c Hongzhen Luo
2024-09-02 11:06 ` [PATCH RFC v4 2/4] erofs: introduce page cache share feature Hongzhen Luo
@ 2024-09-02 11:06 ` Hongzhen Luo
2024-09-02 11:06 ` [PATCH RFC v4 4/4] erofs: introduce .fadvise for page cache share Hongzhen Luo
3 siblings, 0 replies; 5+ messages in thread
From: Hongzhen Luo @ 2024-09-02 11:06 UTC (permalink / raw)
To: linux-erofs; +Cc: lihongbo22, linux-kernel, Hongzhen Luo
This modifies relevant functions to apply the page cache
share feature.
Signed-off-by: Hongzhen Luo <hongzhen@linux.alibaba.com>
---
v4: There are no changes compared to v3.
v3: https://lore.kernel.org/all/20240828111959.3677011-4-hongzhen@linux.alibaba.com/
v2: https://lore.kernel.org/all/20240731080704.678259-3-hongzhen@linux.alibaba.com/
v1: https://lore.kernel.org/all/20240722065355.1396365-5-hongzhen@linux.alibaba.com/
---
fs/erofs/data.c | 34 +++++++++++++++++++++++++++++++++-
fs/erofs/inode.c | 12 ++++++++++++
fs/erofs/super.c | 29 +++++++++++++++++++++++++++++
fs/erofs/zdata.c | 32 ++++++++++++++++++++++++++++++++
4 files changed, 106 insertions(+), 1 deletion(-)
diff --git a/fs/erofs/data.c b/fs/erofs/data.c
index 1b7eba38ba1e..ef27b934115f 100644
--- a/fs/erofs/data.c
+++ b/fs/erofs/data.c
@@ -347,12 +347,44 @@ int erofs_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
*/
static int erofs_read_folio(struct file *file, struct folio *folio)
{
+#ifdef CONFIG_EROFS_FS_PAGE_CACHE_SHARE
+ struct erofs_inode *vi = NULL;
+ int ret;
+
+ if (file && file->private_data) {
+ vi = file->private_data;
+ if (vi->ano_inode == file_inode(file))
+ folio->mapping->host = &vi->vfs_inode;
+ else
+ vi = NULL;
+ }
+ ret = iomap_read_folio(folio, &erofs_iomap_ops);
+ if (vi)
+ folio->mapping->host = file_inode(file);
+ return ret;
+#else
return iomap_read_folio(folio, &erofs_iomap_ops);
+#endif
}
-
static void erofs_readahead(struct readahead_control *rac)
{
+#ifdef CONFIG_EROFS_FS_PAGE_CACHE_SHARE
+ struct erofs_inode *vi = NULL;
+ struct file *file = rac->file;
+
+ if (file && file->private_data) {
+ vi = file->private_data;
+ if (vi->ano_inode == file_inode(file))
+ rac->mapping->host = &vi->vfs_inode;
+ else
+ vi = NULL;
+ }
+ iomap_readahead(rac, &erofs_iomap_ops);
+ if (vi)
+ rac->mapping->host = file_inode(file);
+#else
return iomap_readahead(rac, &erofs_iomap_ops);
+#endif
}
static sector_t erofs_bmap(struct address_space *mapping, sector_t block)
diff --git a/fs/erofs/inode.c b/fs/erofs/inode.c
index 419432be3223..3f2db0ad7959 100644
--- a/fs/erofs/inode.c
+++ b/fs/erofs/inode.c
@@ -5,6 +5,7 @@
* Copyright (C) 2021, Alibaba Cloud
*/
#include "xattr.h"
+#include "pagecache_share.h"
#include <trace/events/erofs.h>
@@ -229,10 +230,21 @@ static int erofs_fill_inode(struct inode *inode)
switch (inode->i_mode & S_IFMT) {
case S_IFREG:
inode->i_op = &erofs_generic_iops;
+#ifdef CONFIG_EROFS_FS_PAGE_CACHE_SHARE
+ erofs_pcs_fill_inode(inode);
+ if (vi->ano_inode)
+ inode->i_fop = &erofs_pcs_file_fops;
+ else if (erofs_inode_is_data_compressed(vi->datalayout))
+ inode->i_fop = &generic_ro_fops;
+ else
+ inode->i_fop = &erofs_file_fops;
+#else
if (erofs_inode_is_data_compressed(vi->datalayout))
inode->i_fop = &generic_ro_fops;
else
inode->i_fop = &erofs_file_fops;
+#endif
+
break;
case S_IFDIR:
inode->i_op = &erofs_dir_iops;
diff --git a/fs/erofs/super.c b/fs/erofs/super.c
index afca576144ca..113e305080fa 100644
--- a/fs/erofs/super.c
+++ b/fs/erofs/super.c
@@ -12,6 +12,7 @@
#include <linux/exportfs.h>
#include <linux/pseudo_fs.h>
#include "xattr.h"
+#include "pagecache_share.h"
#define CREATE_TRACE_POINTS
#include <trace/events/erofs.h>
@@ -103,6 +104,12 @@ static void erofs_free_inode(struct inode *inode)
{
struct erofs_inode *vi = EROFS_I(inode);
+#ifdef CONFIG_EROFS_FS_PAGE_CACHE_SHARE
+ if (S_ISREG(inode->i_mode) && vi->ano_inode) {
+ iput(vi->ano_inode);
+ vi->ano_inode = NULL;
+ }
+#endif
if (inode->i_op == &erofs_fast_symlink_iops)
kfree(inode->i_link);
kfree(vi->xattr_shared_xattrs);
@@ -687,6 +694,12 @@ static int erofs_fc_fill_super(struct super_block *sb, struct fs_context *fc)
if (err)
return err;
+#ifdef CONFIG_EROFS_FS_PAGE_CACHE_SHARE
+ err = erofs_pcs_init_mnt();
+ if (err)
+ return err;
+#endif
+
erofs_info(sb, "mounted with root inode @ nid %llu.", sbi->root_nid);
return 0;
}
@@ -797,6 +810,9 @@ static void erofs_kill_sb(struct super_block *sb)
else
kill_block_super(sb);
+#ifdef CONFIG_EROFS_FS_PAGE_CACHE_SHARE
+ erofs_pcs_free_mnt();
+#endif
erofs_free_dev_context(sbi->devs);
fs_put_dax(sbi->dax_dev, NULL);
erofs_fscache_unregister_fs(sb);
@@ -835,8 +851,21 @@ static struct file_system_type erofs_fs_type = {
};
MODULE_ALIAS_FS("erofs");
+#ifdef CONFIG_EROFS_FS_PAGE_CACHE_SHARE
+static void erofs_free_anon_inode(struct inode *inode)
+{
+ if (inode->i_private) {
+ kfree(inode->i_private);
+ inode->i_private = NULL;
+ }
+}
+#endif
+
static const struct super_operations erofs_anon_sops = {
.statfs = simple_statfs,
+#ifdef CONFIG_EROFS_FS_PAGE_CACHE_SHARE
+ .free_inode = erofs_free_anon_inode,
+#endif
};
static int erofs_anon_init_fs_context(struct fs_context *fc)
diff --git a/fs/erofs/zdata.c b/fs/erofs/zdata.c
index 424f656cd765..cd3cabfef462 100644
--- a/fs/erofs/zdata.c
+++ b/fs/erofs/zdata.c
@@ -1802,6 +1802,17 @@ static void z_erofs_pcluster_readmore(struct z_erofs_decompress_frontend *f,
static int z_erofs_read_folio(struct file *file, struct folio *folio)
{
+#ifdef CONFIG_EROFS_FS_PAGE_CACHE_SHARE
+ struct erofs_inode *vi = NULL;
+
+ if (file && file->private_data) {
+ vi = file->private_data;
+ if (vi->ano_inode == file_inode(file))
+ folio->mapping->host = &vi->vfs_inode;
+ else
+ vi = NULL;
+ }
+#endif
struct inode *const inode = folio->mapping->host;
struct erofs_sb_info *const sbi = EROFS_I_SB(inode);
struct z_erofs_decompress_frontend f = DECOMPRESS_FRONTEND_INIT(inode);
@@ -1824,11 +1835,27 @@ static int z_erofs_read_folio(struct file *file, struct folio *folio)
erofs_put_metabuf(&f.map.buf);
erofs_release_pages(&f.pagepool);
+
+#ifdef CONFIG_EROFS_FS_PAGE_CACHE_SHARE
+ if (vi)
+ folio->mapping->host = file_inode(file);
+#endif
return err;
}
static void z_erofs_readahead(struct readahead_control *rac)
{
+#ifdef CONFIG_EROFS_FS_PAGE_CACHE_SHARE
+ struct erofs_inode *vi = NULL;
+
+ if (rac->file && rac->file->private_data) {
+ vi = rac->file->private_data;
+ if (vi->ano_inode == file_inode(rac->file))
+ rac->mapping->host = &vi->vfs_inode;
+ else
+ vi = NULL;
+ }
+#endif
struct inode *const inode = rac->mapping->host;
struct erofs_sb_info *const sbi = EROFS_I_SB(inode);
struct z_erofs_decompress_frontend f = DECOMPRESS_FRONTEND_INIT(inode);
@@ -1863,6 +1890,11 @@ static void z_erofs_readahead(struct readahead_control *rac)
z_erofs_runqueue(&f, z_erofs_is_sync_decompress(sbi, nr_folios), true);
erofs_put_metabuf(&f.map.buf);
erofs_release_pages(&f.pagepool);
+
+#ifdef CONFIG_EROFS_FS_PAGE_CACHE_SHARE
+ if (vi)
+ rac->mapping->host = file_inode(rac->file);
+#endif
}
const struct address_space_operations z_erofs_aops = {
--
2.43.5
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH RFC v4 4/4] erofs: introduce .fadvise for page cache share
2024-09-02 11:06 [PATCH RFC v4 0/4] erofs: introduce page cache share feature Hongzhen Luo
` (2 preceding siblings ...)
2024-09-02 11:06 ` [PATCH RFC v4 3/4] erofs: apply the " Hongzhen Luo
@ 2024-09-02 11:06 ` Hongzhen Luo
3 siblings, 0 replies; 5+ messages in thread
From: Hongzhen Luo @ 2024-09-02 11:06 UTC (permalink / raw)
To: linux-erofs; +Cc: lihongbo22, linux-kernel, Hongzhen Luo
When using .fadvice to release a file's page cache, it frees
those page caches that were firstly read by this file. To achieve
this, an interval tree is added in the inode of that file to track
the segments firstly read by that inode.
Signed-off-by: Hongzhen Luo <hongzhen@linux.alibaba.com>
---
fs/erofs/data.c | 38 +++++++++++++++++++--
fs/erofs/internal.h | 5 +++
fs/erofs/pagecache_share.c | 68 ++++++++++++++++++++++++++++++++++++++
fs/erofs/pagecache_share.h | 3 +-
fs/erofs/super.c | 9 +++++
5 files changed, 120 insertions(+), 3 deletions(-)
diff --git a/fs/erofs/data.c b/fs/erofs/data.c
index ef27b934115f..e4fcc8a6ce6d 100644
--- a/fs/erofs/data.c
+++ b/fs/erofs/data.c
@@ -7,6 +7,7 @@
#include "internal.h"
#include <linux/sched/mm.h>
#include <trace/events/erofs.h>
+#include "pagecache_share.h"
void erofs_unmap_metabuf(struct erofs_buf *buf)
{
@@ -349,6 +350,7 @@ static int erofs_read_folio(struct file *file, struct folio *folio)
{
#ifdef CONFIG_EROFS_FS_PAGE_CACHE_SHARE
struct erofs_inode *vi = NULL;
+ struct interval_tree_node *seg;
int ret;
if (file && file->private_data) {
@@ -359,8 +361,22 @@ static int erofs_read_folio(struct file *file, struct folio *folio)
vi = NULL;
}
ret = iomap_read_folio(folio, &erofs_iomap_ops);
- if (vi)
+ if (vi) {
folio->mapping->host = file_inode(file);
+ seg = erofs_pcs_alloc_seg();
+ if (!seg)
+ return -ENOMEM;
+ seg->start = folio_index(folio);
+ seg->last = seg->start + (folio_size(folio) >> PAGE_SHIFT);
+ if (seg->last > (vi->vfs_inode.i_size >> PAGE_SHIFT))
+ seg->last = vi->vfs_inode.i_size >> PAGE_SHIFT;
+ if (seg->last >= seg->start) {
+ mutex_lock(&vi->segs_mutex);
+ interval_tree_insert(seg, &vi->segs);
+ mutex_unlock(&vi->segs_mutex);
+ } else
+ erofs_pcs_free_seg(seg);
+ }
return ret;
#else
return iomap_read_folio(folio, &erofs_iomap_ops);
@@ -371,6 +387,8 @@ static void erofs_readahead(struct readahead_control *rac)
#ifdef CONFIG_EROFS_FS_PAGE_CACHE_SHARE
struct erofs_inode *vi = NULL;
struct file *file = rac->file;
+ struct interval_tree_node *seg;
+ erofs_off_t start, end;
if (file && file->private_data) {
vi = file->private_data;
@@ -378,10 +396,26 @@ static void erofs_readahead(struct readahead_control *rac)
rac->mapping->host = &vi->vfs_inode;
else
vi = NULL;
+ start = readahead_pos(rac);
+ end = start + readahead_length(rac);
+ if (end > vi->vfs_inode.i_size)
+ end = vi->vfs_inode.i_size;
}
iomap_readahead(rac, &erofs_iomap_ops);
- if (vi)
+ if (vi) {
rac->mapping->host = file_inode(file);
+ seg = erofs_pcs_alloc_seg();
+ if (!seg)
+ return;
+ seg->start = start >> PAGE_SHIFT;
+ seg->last = end >> PAGE_SHIFT;
+ if (seg->last >= seg->start) {
+ mutex_lock(&vi->segs_mutex);
+ interval_tree_insert(seg, &vi->segs);
+ mutex_unlock(&vi->segs_mutex);
+ } else
+ erofs_pcs_free_seg(seg);
+ }
#else
return iomap_readahead(rac, &erofs_iomap_ops);
#endif
diff --git a/fs/erofs/internal.h b/fs/erofs/internal.h
index 358377825927..59af8768fab8 100644
--- a/fs/erofs/internal.h
+++ b/fs/erofs/internal.h
@@ -18,6 +18,8 @@
#include <linux/slab.h>
#include <linux/vmalloc.h>
#include <linux/iomap.h>
+#include <linux/interval_tree.h>
+#include <linux/mutex.h>
#include "erofs_fs.h"
/* redefine pr_fmt "erofs: " */
@@ -290,6 +292,9 @@ struct erofs_inode {
};
#ifdef CONFIG_EROFS_FS_PAGE_CACHE_SHARE
struct inode *ano_inode;
+ /* segments attributed by this inode */
+ struct rb_root_cached segs;
+ struct mutex segs_mutex;
#endif
/* the corresponding vfs inode */
struct inode vfs_inode;
diff --git a/fs/erofs/pagecache_share.c b/fs/erofs/pagecache_share.c
index 2d2a74547b67..a97024904019 100644
--- a/fs/erofs/pagecache_share.c
+++ b/fs/erofs/pagecache_share.c
@@ -4,6 +4,9 @@
*/
#include <linux/xxhash.h>
#include <linux/refcount.h>
+#include <uapi/linux/fadvise.h>
+#include <linux/slab.h>
+#include <linux/pagemap.h>
#include "pagecache_share.h"
#include "internal.h"
#include "xattr.h"
@@ -15,6 +18,7 @@
static DEFINE_MUTEX(pseudo_mnt_lock);
static refcount_t pseudo_mnt_count;
static struct vfsmount *erofs_pcs_mnt;
+struct kmem_cache *erofs_pcs_segsp;
int erofs_pcs_init_mnt(void)
{
@@ -25,6 +29,11 @@ int erofs_pcs_init_mnt(void)
return PTR_ERR(tmp);
erofs_pcs_mnt = tmp;
refcount_set(&pseudo_mnt_count, 1);
+ erofs_pcs_segsp = kmem_cache_create("erofs_pcs_segs",
+ sizeof(struct interval_tree_node), 0,
+ SLAB_RECLAIM_ACCOUNT | SLAB_ACCOUNT, NULL);
+ if (!erofs_pcs_segsp)
+ return -ENOMEM;
} else
refcount_add(1, &pseudo_mnt_count);
mutex_unlock(&pseudo_mnt_lock);
@@ -37,10 +46,22 @@ void erofs_pcs_free_mnt(void)
if (refcount_dec_and_test(&pseudo_mnt_count)) {
kern_unmount(erofs_pcs_mnt);
erofs_pcs_mnt = NULL;
+ kmem_cache_destroy(erofs_pcs_segsp);
+ erofs_pcs_segsp = NULL;
}
mutex_unlock(&pseudo_mnt_lock);
}
+struct interval_tree_node *erofs_pcs_alloc_seg(void)
+{
+ return kmem_cache_alloc(erofs_pcs_segsp, GFP_KERNEL);
+}
+
+void erofs_pcs_free_seg(struct interval_tree_node *seg)
+{
+ kmem_cache_free(erofs_pcs_segsp, seg);
+}
+
static int erofs_pcs_eq(struct inode *inode, void *data)
{
return inode->i_private && memcmp(inode->i_private, data,
@@ -73,6 +94,8 @@ void erofs_pcs_fill_inode(struct inode *inode)
ano_inode = iget5_locked(erofs_pcs_mnt->mnt_sb, fprt_hash,
erofs_pcs_eq, erofs_pcs_set_fprt, fprt);
vi->ano_inode = ano_inode;
+ vi->segs = RB_ROOT_CACHED;
+ mutex_init(&vi->segs_mutex);
if (ano_inode->i_state & I_NEW) {
if (erofs_inode_is_data_compressed(vi->datalayout))
ano_inode->i_mapping->a_ops = &z_erofs_aops;
@@ -160,6 +183,50 @@ static int erofs_pcs_mmap(struct file *file, struct vm_area_struct *vma)
return 0;
}
+static int erofs_pcs_fadvise(struct file *file, loff_t offset, loff_t len, int advice)
+{
+ struct erofs_inode *vi = EROFS_I(file_inode(file));
+ struct interval_tree_node *seg, *next_seg, *new_seg;
+ struct file *ano_file = file->private_data;
+ erofs_off_t start, end;
+ int err = 0;
+ u64 l, r;
+
+ if (advice != POSIX_FADV_DONTNEED)
+ return generic_fadvise(ano_file, offset, len, advice);
+
+ start = offset >> PAGE_SHIFT;
+ /* len = 0 means EOF */
+ end = (!len ? LLONG_MAX : offset + len) >> PAGE_SHIFT;
+
+ mutex_lock(&vi->segs_mutex);
+ seg = interval_tree_iter_first(&vi->segs, start, end);
+ while (seg) {
+ next_seg = interval_tree_iter_next(seg, start, end);
+ l = max_t(u64, seg->start | 0ULL, start);
+ r = min_t(u64, seg->last | 0ULL, end);
+ if (l > r)
+ continue;
+ (void)invalidate_mapping_pages(ano_file->f_mapping, l, r);
+ if (seg->start < l) {
+ new_seg = erofs_pcs_alloc_seg();
+ new_seg->start = seg->start;
+ new_seg->last = l;
+ interval_tree_insert(new_seg, &vi->segs);
+ }
+ if (r < seg->last) {
+ new_seg = erofs_pcs_alloc_seg();
+ new_seg->start = r;
+ new_seg->last = seg->last;
+ interval_tree_insert(new_seg, &vi->segs);
+ }
+ interval_tree_remove(seg, &vi->segs);
+ seg = next_seg;
+ }
+ mutex_unlock(&vi->segs_mutex);
+ return err;
+}
+
const struct file_operations erofs_pcs_file_fops = {
.open = erofs_pcs_file_open,
.llseek = generic_file_llseek,
@@ -168,4 +235,5 @@ const struct file_operations erofs_pcs_file_fops = {
.release = erofs_pcs_file_release,
.get_unmapped_area = thp_get_unmapped_area,
.splice_read = filemap_splice_read,
+ .fadvise = erofs_pcs_fadvise,
};
diff --git a/fs/erofs/pagecache_share.h b/fs/erofs/pagecache_share.h
index b8111291cf79..e0aba20a6a0e 100644
--- a/fs/erofs/pagecache_share.h
+++ b/fs/erofs/pagecache_share.h
@@ -14,7 +14,8 @@
int erofs_pcs_init_mnt(void);
void erofs_pcs_free_mnt(void);
void erofs_pcs_fill_inode(struct inode *inode);
+struct interval_tree_node *erofs_pcs_alloc_seg(void);
+void erofs_pcs_free_seg(struct interval_tree_node *seg);
extern const struct vm_operations_struct generic_file_vm_ops;
-
#endif
diff --git a/fs/erofs/super.c b/fs/erofs/super.c
index 113e305080fa..da595e608702 100644
--- a/fs/erofs/super.c
+++ b/fs/erofs/super.c
@@ -105,10 +105,19 @@ static void erofs_free_inode(struct inode *inode)
struct erofs_inode *vi = EROFS_I(inode);
#ifdef CONFIG_EROFS_FS_PAGE_CACHE_SHARE
+ struct interval_tree_node *seg, *next_seg;
+
if (S_ISREG(inode->i_mode) && vi->ano_inode) {
iput(vi->ano_inode);
vi->ano_inode = NULL;
}
+ seg = interval_tree_iter_first(&vi->segs, 0, LLONG_MAX);
+ while (seg) {
+ next_seg = interval_tree_iter_next(seg, 0, LLONG_MAX);
+ interval_tree_remove(seg, &vi->segs);
+ erofs_pcs_free_seg(seg);
+ seg = next_seg;
+ }
#endif
if (inode->i_op == &erofs_fast_symlink_iops)
kfree(inode->i_link);
--
2.43.5
^ permalink raw reply [flat|nested] 5+ messages in thread