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 11/22] erofs: register fscache volume Date: Mon, 9 May 2022 15:40:17 +0800 [thread overview] Message-ID: <20220509074028.74954-12-jefflexu@linux.alibaba.com> (raw) In-Reply-To: <20220509074028.74954-1-jefflexu@linux.alibaba.com> A new fscache based mode is going to be introduced for erofs, in which case on-demand read semantics is implemented through fscache. As the first step, register fscache volume for each erofs filesystem. That means, data blobs can not be shared among erofs filesystems. In the following iteration, we are going to introduce the domain semantics, in which case several erofs filesystems can belong to one domain, and data blobs can be shared among these erofs filesystems of one domain. Signed-off-by: Jeffle Xu <jefflexu@linux.alibaba.com> Reviewed-by: Gao Xiang <hsiangkao@linux.alibaba.com> --- fs/erofs/Kconfig | 10 ++++++++++ fs/erofs/Makefile | 1 + fs/erofs/fscache.c | 37 +++++++++++++++++++++++++++++++++++++ fs/erofs/internal.h | 16 ++++++++++++++++ fs/erofs/super.c | 5 +++++ 5 files changed, 69 insertions(+) create mode 100644 fs/erofs/fscache.c diff --git a/fs/erofs/Kconfig b/fs/erofs/Kconfig index f57255ab88ed..85490370e0ca 100644 --- a/fs/erofs/Kconfig +++ b/fs/erofs/Kconfig @@ -98,3 +98,13 @@ config EROFS_FS_ZIP_LZMA systems will be readable without selecting this option. If unsure, say N. + +config EROFS_FS_ONDEMAND + bool "EROFS fscache-based on-demand read support" + depends on CACHEFILES_ONDEMAND && (EROFS_FS=m && FSCACHE || EROFS_FS=y && FSCACHE=y) + default n + help + This permits EROFS to use fscache-backed data blobs with on-demand + read support. + + If unsure, say N. diff --git a/fs/erofs/Makefile b/fs/erofs/Makefile index 8a3317e38e5a..99bbc597a3e9 100644 --- a/fs/erofs/Makefile +++ b/fs/erofs/Makefile @@ -5,3 +5,4 @@ erofs-objs := super.o inode.o data.o namei.o dir.o utils.o pcpubuf.o sysfs.o erofs-$(CONFIG_EROFS_FS_XATTR) += xattr.o erofs-$(CONFIG_EROFS_FS_ZIP) += decompressor.o zmap.o zdata.o erofs-$(CONFIG_EROFS_FS_ZIP_LZMA) += decompressor_lzma.o +erofs-$(CONFIG_EROFS_FS_ONDEMAND) += fscache.o diff --git a/fs/erofs/fscache.c b/fs/erofs/fscache.c new file mode 100644 index 000000000000..7a6d0239ebb1 --- /dev/null +++ b/fs/erofs/fscache.c @@ -0,0 +1,37 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * Copyright (C) 2022, Alibaba Cloud + */ +#include <linux/fscache.h> +#include "internal.h" + +int erofs_fscache_register_fs(struct super_block *sb) +{ + struct erofs_sb_info *sbi = EROFS_SB(sb); + struct fscache_volume *volume; + char *name; + int ret = 0; + + name = kasprintf(GFP_KERNEL, "erofs,%s", sbi->opt.fsid); + if (!name) + return -ENOMEM; + + volume = fscache_acquire_volume(name, NULL, NULL, 0); + if (IS_ERR_OR_NULL(volume)) { + erofs_err(sb, "failed to register volume for %s", name); + ret = volume ? PTR_ERR(volume) : -EOPNOTSUPP; + volume = NULL; + } + + sbi->volume = volume; + kfree(name); + return ret; +} + +void erofs_fscache_unregister_fs(struct super_block *sb) +{ + struct erofs_sb_info *sbi = EROFS_SB(sb); + + fscache_relinquish_volume(sbi->volume, NULL, false); + sbi->volume = NULL; +} diff --git a/fs/erofs/internal.h b/fs/erofs/internal.h index 05a97533b1e9..e4f6a13f161f 100644 --- a/fs/erofs/internal.h +++ b/fs/erofs/internal.h @@ -74,6 +74,7 @@ struct erofs_mount_opts { unsigned int max_sync_decompress_pages; #endif unsigned int mount_opt; + char *fsid; }; struct erofs_dev_context { @@ -146,6 +147,9 @@ struct erofs_sb_info { /* sysfs support */ struct kobject s_kobj; /* /sys/fs/erofs/<devname> */ struct completion s_kobj_unregister; + + /* fscache support */ + struct fscache_volume *volume; }; #define EROFS_SB(sb) ((struct erofs_sb_info *)(sb)->s_fs_info) @@ -618,6 +622,18 @@ static inline int z_erofs_load_lzma_config(struct super_block *sb, } #endif /* !CONFIG_EROFS_FS_ZIP */ +/* fscache.c */ +#ifdef CONFIG_EROFS_FS_ONDEMAND +int erofs_fscache_register_fs(struct super_block *sb); +void erofs_fscache_unregister_fs(struct super_block *sb); +#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) {} +#endif + #define EFSCORRUPTED EUCLEAN /* Filesystem is corrupted */ #endif /* __EROFS_INTERNAL_H */ diff --git a/fs/erofs/super.c b/fs/erofs/super.c index 724d5ff0d78c..fd8daa447237 100644 --- a/fs/erofs/super.c +++ b/fs/erofs/super.c @@ -602,6 +602,10 @@ static int erofs_fc_fill_super(struct super_block *sb, struct fs_context *fc) if (erofs_is_fscache_mode(sb)) { sb->s_blocksize = EROFS_BLKSIZ; sb->s_blocksize_bits = LOG_BLOCK_SIZE; + + err = erofs_fscache_register_fs(sb); + if (err) + return err; } else { if (!sb_set_blocksize(sb, EROFS_BLKSIZ)) { erofs_err(sb, "failed to set erofs blksize"); @@ -768,6 +772,7 @@ static void erofs_kill_sb(struct super_block *sb) erofs_free_dev_context(sbi->devs); fs_put_dax(sbi->dax_dev); + erofs_fscache_unregister_fs(sb); kfree(sbi); sb->s_fs_info = NULL; } -- 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 11/22] erofs: register fscache volume Date: Mon, 9 May 2022 15:40:17 +0800 [thread overview] Message-ID: <20220509074028.74954-12-jefflexu@linux.alibaba.com> (raw) In-Reply-To: <20220509074028.74954-1-jefflexu@linux.alibaba.com> A new fscache based mode is going to be introduced for erofs, in which case on-demand read semantics is implemented through fscache. As the first step, register fscache volume for each erofs filesystem. That means, data blobs can not be shared among erofs filesystems. In the following iteration, we are going to introduce the domain semantics, in which case several erofs filesystems can belong to one domain, and data blobs can be shared among these erofs filesystems of one domain. Signed-off-by: Jeffle Xu <jefflexu@linux.alibaba.com> Reviewed-by: Gao Xiang <hsiangkao@linux.alibaba.com> --- fs/erofs/Kconfig | 10 ++++++++++ fs/erofs/Makefile | 1 + fs/erofs/fscache.c | 37 +++++++++++++++++++++++++++++++++++++ fs/erofs/internal.h | 16 ++++++++++++++++ fs/erofs/super.c | 5 +++++ 5 files changed, 69 insertions(+) create mode 100644 fs/erofs/fscache.c diff --git a/fs/erofs/Kconfig b/fs/erofs/Kconfig index f57255ab88ed..85490370e0ca 100644 --- a/fs/erofs/Kconfig +++ b/fs/erofs/Kconfig @@ -98,3 +98,13 @@ config EROFS_FS_ZIP_LZMA systems will be readable without selecting this option. If unsure, say N. + +config EROFS_FS_ONDEMAND + bool "EROFS fscache-based on-demand read support" + depends on CACHEFILES_ONDEMAND && (EROFS_FS=m && FSCACHE || EROFS_FS=y && FSCACHE=y) + default n + help + This permits EROFS to use fscache-backed data blobs with on-demand + read support. + + If unsure, say N. diff --git a/fs/erofs/Makefile b/fs/erofs/Makefile index 8a3317e38e5a..99bbc597a3e9 100644 --- a/fs/erofs/Makefile +++ b/fs/erofs/Makefile @@ -5,3 +5,4 @@ erofs-objs := super.o inode.o data.o namei.o dir.o utils.o pcpubuf.o sysfs.o erofs-$(CONFIG_EROFS_FS_XATTR) += xattr.o erofs-$(CONFIG_EROFS_FS_ZIP) += decompressor.o zmap.o zdata.o erofs-$(CONFIG_EROFS_FS_ZIP_LZMA) += decompressor_lzma.o +erofs-$(CONFIG_EROFS_FS_ONDEMAND) += fscache.o diff --git a/fs/erofs/fscache.c b/fs/erofs/fscache.c new file mode 100644 index 000000000000..7a6d0239ebb1 --- /dev/null +++ b/fs/erofs/fscache.c @@ -0,0 +1,37 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * Copyright (C) 2022, Alibaba Cloud + */ +#include <linux/fscache.h> +#include "internal.h" + +int erofs_fscache_register_fs(struct super_block *sb) +{ + struct erofs_sb_info *sbi = EROFS_SB(sb); + struct fscache_volume *volume; + char *name; + int ret = 0; + + name = kasprintf(GFP_KERNEL, "erofs,%s", sbi->opt.fsid); + if (!name) + return -ENOMEM; + + volume = fscache_acquire_volume(name, NULL, NULL, 0); + if (IS_ERR_OR_NULL(volume)) { + erofs_err(sb, "failed to register volume for %s", name); + ret = volume ? PTR_ERR(volume) : -EOPNOTSUPP; + volume = NULL; + } + + sbi->volume = volume; + kfree(name); + return ret; +} + +void erofs_fscache_unregister_fs(struct super_block *sb) +{ + struct erofs_sb_info *sbi = EROFS_SB(sb); + + fscache_relinquish_volume(sbi->volume, NULL, false); + sbi->volume = NULL; +} diff --git a/fs/erofs/internal.h b/fs/erofs/internal.h index 05a97533b1e9..e4f6a13f161f 100644 --- a/fs/erofs/internal.h +++ b/fs/erofs/internal.h @@ -74,6 +74,7 @@ struct erofs_mount_opts { unsigned int max_sync_decompress_pages; #endif unsigned int mount_opt; + char *fsid; }; struct erofs_dev_context { @@ -146,6 +147,9 @@ struct erofs_sb_info { /* sysfs support */ struct kobject s_kobj; /* /sys/fs/erofs/<devname> */ struct completion s_kobj_unregister; + + /* fscache support */ + struct fscache_volume *volume; }; #define EROFS_SB(sb) ((struct erofs_sb_info *)(sb)->s_fs_info) @@ -618,6 +622,18 @@ static inline int z_erofs_load_lzma_config(struct super_block *sb, } #endif /* !CONFIG_EROFS_FS_ZIP */ +/* fscache.c */ +#ifdef CONFIG_EROFS_FS_ONDEMAND +int erofs_fscache_register_fs(struct super_block *sb); +void erofs_fscache_unregister_fs(struct super_block *sb); +#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) {} +#endif + #define EFSCORRUPTED EUCLEAN /* Filesystem is corrupted */ #endif /* __EROFS_INTERNAL_H */ diff --git a/fs/erofs/super.c b/fs/erofs/super.c index 724d5ff0d78c..fd8daa447237 100644 --- a/fs/erofs/super.c +++ b/fs/erofs/super.c @@ -602,6 +602,10 @@ static int erofs_fc_fill_super(struct super_block *sb, struct fs_context *fc) if (erofs_is_fscache_mode(sb)) { sb->s_blocksize = EROFS_BLKSIZ; sb->s_blocksize_bits = LOG_BLOCK_SIZE; + + err = erofs_fscache_register_fs(sb); + if (err) + return err; } else { if (!sb_set_blocksize(sb, EROFS_BLKSIZ)) { erofs_err(sb, "failed to set erofs blksize"); @@ -768,6 +772,7 @@ static void erofs_kill_sb(struct super_block *sb) erofs_free_dev_context(sbi->devs); fs_put_dax(sbi->dax_dev); + erofs_fscache_unregister_fs(sb); kfree(sbi); sb->s_fs_info = NULL; } -- 2.27.0
next prev 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 ` Jeffle Xu [this message] 2022-05-09 7:40 ` [PATCH v11 11/22] erofs: register fscache volume 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 ` [PATCH v11 18/22] erofs: implement fscache-based data read for non-inline layout Jeffle Xu 2022-05-09 7:40 ` 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-12-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: linkBe 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.