From: Hongbo Li <lihongbo22@huawei.com> hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/release-management/issues/ID5W1P -------------------------------- Initialize the mfs module. Signed-off-by: Huang Xiaojia <huangxiaojia2@huawei.com> Signed-off-by: Hongbo Li <lihongbo22@huawei.com> --- fs/Kconfig | 1 + fs/Makefile | 1 + fs/mfs/Kconfig | 12 +++++++ fs/mfs/Makefile | 4 +++ fs/mfs/internal.h | 25 +++++++++++++ fs/mfs/super.c | 91 +++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 134 insertions(+) create mode 100644 fs/mfs/Kconfig create mode 100644 fs/mfs/Makefile create mode 100644 fs/mfs/internal.h create mode 100644 fs/mfs/super.c diff --git a/fs/Kconfig b/fs/Kconfig index 92bcdc29e6a8..6657ada03d06 100644 --- a/fs/Kconfig +++ b/fs/Kconfig @@ -370,6 +370,7 @@ source "fs/sysv/Kconfig" source "fs/ufs/Kconfig" source "fs/erofs/Kconfig" source "fs/vboxsf/Kconfig" +source "fs/mfs/Kconfig" endif # MISC_FILESYSTEMS diff --git a/fs/Makefile b/fs/Makefile index 81428bad22f0..fa1e3d067839 100644 --- a/fs/Makefile +++ b/fs/Makefile @@ -136,3 +136,4 @@ obj-$(CONFIG_EROFS_FS) += erofs/ obj-$(CONFIG_VBOXSF_FS) += vboxsf/ obj-$(CONFIG_ZONEFS_FS) += zonefs/ obj-$(CONFIG_RESCTRL_FS) += resctrl/ +obj-$(CONFIG_MFS_FS) += mfs/ \ No newline at end of file diff --git a/fs/mfs/Kconfig b/fs/mfs/Kconfig new file mode 100644 index 000000000000..26c336a3056e --- /dev/null +++ b/fs/mfs/Kconfig @@ -0,0 +1,12 @@ +# SPDX-License-Identifier: GPL-2.0-only + +config MFS_FS + tristate "MFS filesystem support" + help + MFS provides a cache-programmable ability for users. + It is a stackable file system, and will post miss events + during reading data which is not in cache (memory or disk). + Based on these events, users can trigger the target io for each + application. + + If unsure, say N. diff --git a/fs/mfs/Makefile b/fs/mfs/Makefile new file mode 100644 index 000000000000..ff2cd4a514cc --- /dev/null +++ b/fs/mfs/Makefile @@ -0,0 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-only + +obj-$(CONFIG_MFS_FS) += mfs.o +mfs-objs := super.o diff --git a/fs/mfs/internal.h b/fs/mfs/internal.h new file mode 100644 index 000000000000..70969cd1c124 --- /dev/null +++ b/fs/mfs/internal.h @@ -0,0 +1,25 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* Copyright (C) 2025. Huawei Technologies Co., Ltd */ + +#ifndef _MFS_INTERNAL_H +#define _MFS_INTERNAL_H + +#include <linux/fs.h> +#include <linux/spinlock_types.h> + +#define MFS_NAME "mfs" + +struct mfs_inode { + struct inode *lower; + struct inode *cache; + struct mutex lock; + struct inode vfs_inode; +}; + +struct mfs_dentry_info { + spinlock_t lock; + struct path lower; + struct path cache; +}; + +#endif diff --git a/fs/mfs/super.c b/fs/mfs/super.c new file mode 100644 index 000000000000..607b47cdc31b --- /dev/null +++ b/fs/mfs/super.c @@ -0,0 +1,91 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* Copyright (C) 2025. Huawei Technologies Co., Ltd */ + +#include "internal.h" + +#include <linux/module.h> +#include <linux/fs_context.h> + +/* + * Used for alloc_inode + */ +static struct kmem_cache *mfs_inode_cachep; + +/* + * Used for dentry info + */ +static struct kmem_cache *mfs_dentry_cachep; + +static void mfs_init_once(void *obj) +{ + struct mfs_inode *i = obj; + + inode_init_once(&i->vfs_inode); +} + +static int mfs_init_fs_context(struct fs_context *fc) +{ + return 0; +} + +static void mfs_kill_sb(struct super_block *sb) +{ +} + +static struct file_system_type mfs_fs_type = { + .owner = THIS_MODULE, + .name = MFS_NAME, + .init_fs_context = mfs_init_fs_context, + .kill_sb = mfs_kill_sb, + .fs_flags = 0, +}; +MODULE_ALIAS_FS(MFS_NAME); + +static int __init init_mfs_fs(void) +{ + int err; + + mfs_inode_cachep = + kmem_cache_create("mfs_inode", + sizeof(struct mfs_inode), 0, + SLAB_RECLAIM_ACCOUNT, mfs_init_once); + if (!mfs_inode_cachep) + return -ENOMEM; + + mfs_dentry_cachep = + kmem_cache_create("mfs_dentry", + sizeof(struct mfs_dentry_info), 0, + SLAB_RECLAIM_ACCOUNT, NULL); + if (!mfs_dentry_cachep) { + err = -ENOMEM; + goto err_dentryp; + } + + err = register_filesystem(&mfs_fs_type); + if (err) + goto err_register; + + pr_info("MFS module loaded\n"); + return 0; +err_register: + kmem_cache_destroy(mfs_dentry_cachep); +err_dentryp: + kmem_cache_destroy(mfs_inode_cachep); + return err; +} + +static void __exit exit_mfs_fs(void) +{ + unregister_filesystem(&mfs_fs_type); + kmem_cache_destroy(mfs_dentry_cachep); + kmem_cache_destroy(mfs_inode_cachep); + pr_info("MFS module unload\n"); +} + +module_init(init_mfs_fs); +module_exit(exit_mfs_fs); + +MODULE_AUTHOR("Hongbo Li <lihongbo22@huawei.com>"); +MODULE_AUTHOR("Xiaojia Huang <huangxiaojia2@huawei.com>"); +MODULE_DESCRIPTION("MFS filesystem for Linux"); +MODULE_LICENSE("GPL"); -- 2.25.1

From: Hongbo Li <lihongbo22@huawei.com> hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/release-management/issues/ID5W1P -------------------------------- It is easy to add metadata operation in MFS. In MFS, metadata is from the lower layer, so we just need to pass the requests to the lower inode/dentry and adjust the reference. In remote mode, the cache layer may be empty, so we should create the target file when lookup. Signed-off-by: Huang Xiaojia <huangxiaojia2@huawei.com> Signed-off-by: Hongbo Li <lihongbo22@huawei.com> --- fs/mfs/inode.c | 218 ++++++++++++++++++++++++++++++++++++++++++++++ fs/mfs/internal.h | 21 +++++ 2 files changed, 239 insertions(+) diff --git a/fs/mfs/inode.c b/fs/mfs/inode.c index 32e2ce27761d..fd87814ed81b 100644 --- a/fs/mfs/inode.c +++ b/fs/mfs/inode.c @@ -17,6 +17,217 @@ static int mfs_inode_set(struct inode *inode, void *lower_target) return 0; } +static struct dentry *_mfs_get_inode(struct dentry *dentry, + struct super_block *sb, + struct path *lower_path, + struct path *cache_path) +{ + struct mfs_sb_info *sbi = MFS_SB(sb); + struct inode *inode, *lower_inode, *cache_inode; + struct dentry *ret; + + lower_inode = d_inode(lower_path->dentry); + cache_inode = d_inode(cache_path->dentry); + + /* lower file system cannot change */ + if (lower_inode->i_sb != sbi->lower.dentry->d_sb) { + ret = ERR_PTR(-EXDEV); + goto out; + } + + /* check consistency: mode and size */ + if ((lower_inode->i_mode & S_IFMT) != (cache_inode->i_mode & S_IFMT)) { + ret = ERR_PTR(-EUCLEAN); + goto out; + } + if (S_ISREG(lower_inode->i_mode) + && lower_inode->i_size != cache_inode->i_size) { + ret = ERR_PTR(-EUCLEAN); + goto out; + } + + /* allocate new inode for mfs */ + inode = mfs_iget(sb, lower_inode, cache_path); + if (IS_ERR(inode)) { + ret = ERR_PTR(PTR_ERR(inode)); + goto out; + } + ret = d_splice_alias(inode, dentry); +out: + return ret; +} + +static int _lookup_create(struct path *lpath, struct path *parent_cpath, + const char *name, struct path *cpath) +{ + struct dentry *ldentry, *parent_cdentry, *dentry; + struct inode *linode, *cdir; + int ret = 0, _ret; + + ldentry = lpath->dentry; + parent_cdentry = parent_cpath->dentry; + linode = d_inode(ldentry); + cdir = d_inode(parent_cpath->dentry); + + inode_lock_nested(cdir, I_MUTEX_PARENT); +retry: + dentry = lookup_one_len(name, parent_cdentry, strlen(name)); + if (IS_ERR(dentry)) { + ret = PTR_ERR(dentry); + goto out; + } + + cpath->mnt = mntget(parent_cpath->mnt); + cpath->dentry = dentry; + if (d_is_positive(dentry)) + goto out; + + if (d_is_dir(ldentry)) { + ret = vfs_mkdir(&nop_mnt_idmap, cdir, dentry, linode->i_mode); + if (ret) + goto new_err; + /* + * In the event that the filesystem does not use the @dentry + * but leaves it negative or unhashes it. + */ + if (unlikely(d_unhashed(dentry))) { + mntput(parent_cpath->mnt); + dput(dentry); + goto retry; + } + } else { + /* dir or file, symlink will be considerred the regular file */ + ret = vfs_create(&nop_mnt_idmap, cdir, dentry, linode->i_mode, true); + if (ret) + goto new_err; + ret = vfs_truncate(cpath, linode->i_size); + if (ret) + goto truncate_err; + } + goto out; + +truncate_err: + _ret = vfs_unlink(&nop_mnt_idmap, cdir, dentry, NULL); + if (_ret) + pr_err("cleanup failed for file:%s, err:%d\n", name, _ret); +new_err: + mntput(parent_cpath->mnt); + dput(dentry); +out: + inode_unlock(cdir); + return ret; +} + +struct dentry *mfs_lookup(struct inode *dir, struct dentry *dentry, + unsigned int flag) +{ + struct path parent_lpath, parent_cpath, lpath, cpath; + struct dentry *ret, *parent; + const char *name; + int err; + + parent = dget_parent(dentry); + mfs_get_path(parent, &parent_lpath, &parent_cpath); + err = mfs_alloc_dentry_info(dentry); + if (err) { + ret = ERR_PTR(err); + goto out; + } + /* lookup from lower layer */ + name = dentry->d_name.name; + err = vfs_path_lookup(parent_lpath.dentry, + parent_lpath.mnt, + name, 0, &lpath); + if (err) { + ret = ERR_PTR(err); + mfs_free_dentry_info(dentry); + goto out; + } + /* check from cache layer */ + err = vfs_path_lookup(parent_cpath.dentry, + parent_cpath.mnt, + name, 0, &cpath); + if (err) { + if (err != -ENOENT) { +cdentry_fail: + ret = ERR_PTR(err); + path_put(&lpath); + mfs_free_dentry_info(dentry); + goto out; + } + err = _lookup_create(&lpath, &parent_cpath, name, &cpath); + if (err) + goto cdentry_fail; + } + /* build the inode from lower layer */ + ret = _mfs_get_inode(dentry, dir->i_sb, &lpath, &cpath); + if (IS_ERR(ret)) { + path_put(&lpath); + path_put(&cpath); + mfs_free_dentry_info(dentry); + goto out; + } + mfs_install_path(dentry, &lpath, &cpath); +out: + mfs_put_path(&parent_lpath, &parent_cpath); + dput(parent); + return ret; +} + +static int mfs_getattr(struct mnt_idmap *idmap, const struct path *path, + struct kstat *stat, u32 request_mask, + unsigned int query_flags) +{ + struct mfs_inode *vi = MFS_I(d_inode(path->dentry)); + + generic_fillattr(idmap, request_mask, vi->lower, stat); + return 0; +} + +static const char *mfs_get_link(struct dentry *dentry, + struct inode *inode, + struct delayed_call *done) +{ + struct mfs_sb_info *sbi = MFS_SB(inode->i_sb); + struct path lpath, cpath; + struct dentry *ldentry; + const char *p; + + if (!dentry) + return ERR_PTR(-ECHILD); + + mfs_get_path(dentry, &lpath, &cpath); + ldentry = lpath.dentry; + p = vfs_get_link(ldentry, done); + mfs_put_path(&lpath, &cpath); + + if (IS_ERR(p) || p[0] != '/') + return p; + if (strlen(p) <= strlen(sbi->mtree)) + return ERR_PTR(-EXDEV); + if (strncmp(sbi->mtree, p, strlen(sbi->mtree)) != 0) + return ERR_PTR(-EXDEV); + p += strlen(sbi->mtree); + if (p[0] != '/') + return ERR_PTR(-EXDEV); + p += 1; + return p; +} + +const struct inode_operations mfs_dir_iops = { + .lookup = mfs_lookup, + .getattr = mfs_getattr, +}; + +const struct inode_operations mfs_symlink_iops = { + .getattr = mfs_getattr, + .get_link = mfs_get_link, +}; + +const struct inode_operations mfs_file_iops = { + .getattr = mfs_getattr, +}; + struct inode *mfs_iget(struct super_block *sb, struct inode *lower_inode, struct path *cache_path) { @@ -50,6 +261,13 @@ struct inode *mfs_iget(struct super_block *sb, struct inode *lower_inode, vi->lower = lower_inode; vi->cache = cache_inode; + if (S_ISDIR(lower_inode->i_mode)) + inode->i_op = &mfs_dir_iops; + else if (S_ISLNK(lower_inode->i_mode)) + inode->i_op = &mfs_symlink_iops; + else + inode->i_op = &mfs_file_iops; + fsstack_copy_attr_all(inode, lower_inode); fsstack_copy_inode_size(inode, lower_inode); unlock_new_inode(inode); diff --git a/fs/mfs/internal.h b/fs/mfs/internal.h index 67c3a7ad699b..cc44af558b26 100644 --- a/fs/mfs/internal.h +++ b/fs/mfs/internal.h @@ -52,6 +52,27 @@ static inline void pathcpy(struct path *dst, const struct path *src) dst->mnt = src->mnt; } +/* + * dent: mfs vfs dentry + */ +static inline void mfs_get_path(const struct dentry *dent, + struct path *lpath, + struct path *cpath) +{ + spin_lock(&MFS_D(dent)->lock); + pathcpy(lpath, &MFS_D(dent)->lower); + path_get(lpath); + pathcpy(cpath, &MFS_D(dent)->cache); + path_get(cpath); + spin_unlock(&MFS_D(dent)->lock); +} + +static inline void mfs_put_path(struct path *lpath, struct path *cpath) +{ + path_put(lpath); + path_put(cpath); +} + static inline void mfs_install_path(const struct dentry *dent, struct path *lpath, struct path *cpath) -- 2.25.1

From: Hongbo Li <lihongbo22@huawei.com> hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/release-management/issues/ID5W1P -------------------------------- When the read request miss in cache (memory or disk), MFS will post miss event to userspace. And we should use different way to check. For memory, we just need to check the target range whether in page cache or not. And for disk (remote mode), we should use SEEK_DATA and SEEK_HOLE to check the target range. In this patch, we introduce the basic structure for events that is @mfs_syncer. In remote mode, the events are synchronous, so all the io segments from the same reading range will wait on the same syncer object. Also the @mfs_cache_object is introduced to imply the cache object in cache layer. @mfs_cache_object is the controller for MFS's data. It builds the connection between MFS's data and the events. Signed-off-by: Huang Xiaojia <huangxiaojia2@huawei.com> Signed-off-by: Hongbo Li <lihongbo22@huawei.com> --- fs/mfs/Makefile | 2 +- fs/mfs/cache.c | 89 +++++++++++++++ fs/mfs/data.c | 229 ++++++++++++++++++++++++++++++++++++++- fs/mfs/inode.c | 8 ++ fs/mfs/internal.h | 36 ++++++ fs/mfs/super.c | 9 ++ include/uapi/linux/mfs.h | 6 + 7 files changed, 377 insertions(+), 2 deletions(-) create mode 100644 fs/mfs/cache.c diff --git a/fs/mfs/Makefile b/fs/mfs/Makefile index 546e620daf8d..a3fe71ba61e8 100644 --- a/fs/mfs/Makefile +++ b/fs/mfs/Makefile @@ -1,4 +1,4 @@ # SPDX-License-Identifier: GPL-2.0-only obj-$(CONFIG_MFS_FS) += mfs.o -mfs-objs := super.o inode.o data.o +mfs-objs := super.o inode.o data.o cache.o diff --git a/fs/mfs/cache.c b/fs/mfs/cache.c new file mode 100644 index 000000000000..30d5c0f986ee --- /dev/null +++ b/fs/mfs/cache.c @@ -0,0 +1,89 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* Copyright (C) 2025. Huawei Technologies Co., Ltd */ + +#include "internal.h" + +/* + * Used for cache object + */ +static struct kmem_cache *mfs_cobject_cachep; + +static int mfs_setup_object(struct mfs_cache_object *object, + struct inode *inode, + struct path *cache_path) +{ + struct inode *cache_inode = d_inode(cache_path->dentry); + struct file *cache_file; + int flags = O_RDONLY; + + if (need_sync_event(inode->i_sb)) + flags = O_RDWR; + cache_file = kernel_file_open(cache_path, flags | O_LARGEFILE, + cache_inode, current_cred()); + if (IS_ERR(cache_file)) + return PTR_ERR(cache_file); + /* + * object belongs to a mfs inode, + * this is a reverse pointer, no refcount needed. + */ + object->mfs_inode = inode; + object->cache_file = cache_file; + init_rwsem(&object->rwsem); + object->fd = -1; + object->anon_file = NULL; + return 0; +} + +void mfs_post_event_read(struct mfs_cache_object *object, + loff_t off, uint64_t len, + struct mfs_syncer *syncer, int op) +{ +} + +void mfs_cancel_syncer_events(struct mfs_cache_object *object, + struct mfs_syncer *syncer) +{ +} + +struct mfs_cache_object *mfs_alloc_object(struct inode *inode, + struct path *cache_path) +{ + struct mfs_cache_object *object; + int err; + + object = kmem_cache_alloc(mfs_cobject_cachep, GFP_KERNEL); + if (!object) + return ERR_PTR(-ENOMEM); + + err = mfs_setup_object(object, inode, cache_path); + if (err) { + kmem_cache_free(mfs_cobject_cachep, object); + return ERR_PTR(err); + } + + return object; +} + +void mfs_free_object(void *data) +{ + struct mfs_cache_object *object = (struct mfs_cache_object *)data; + + fput(object->cache_file); + kmem_cache_free(mfs_cobject_cachep, object); +} + +int mfs_cache_init(void) +{ + mfs_cobject_cachep = + kmem_cache_create("mfs_object", + sizeof(struct mfs_cache_object), 0, + SLAB_RECLAIM_ACCOUNT, NULL); + if (!mfs_cobject_cachep) + return -ENOMEM; + return 0; +} + +void mfs_cache_exit(void) +{ + kmem_cache_destroy(mfs_cobject_cachep); +} diff --git a/fs/mfs/data.c b/fs/mfs/data.c index f7fa8f4e7102..2cd28e0b0222 100644 --- a/fs/mfs/data.c +++ b/fs/mfs/data.c @@ -6,6 +6,7 @@ #include <linux/pagemap.h> #include <linux/uio.h> #include <linux/types.h> +#include <linux/completion.h> static struct mfs_file_info *mfs_file_info_alloc(struct file *lower, struct file *cache) { @@ -132,11 +133,179 @@ static int mfs_readdir(struct file *file, struct dir_context *ctx) return iterate_dir(lfile, ctx); } +enum range_status { + RANGE_DATA, + RANGE_HOLE, + RANGE_INVAL, +}; + +/* Continuous range with same status */ +struct range_t { + struct file *file; + loff_t off; + size_t max; + size_t len; + int status; +}; + +typedef int (*range_check) (struct range_t *r); + +struct range_ctx { + bool sync; /* handle the miss case in sync/async way */ + int op; + loff_t off; + size_t len; + struct file *file; + struct mfs_cache_object *object; + range_check checker; /* check method for range */ +}; + +static int range_check_disk(struct range_t *r) +{ + loff_t off, to, start = r->off, end = r->off + r->max; + struct file *file = r->file; + int err = 0; + + off = vfs_llseek(file, start, SEEK_DATA); + if (off < 0) { + if (off == (loff_t)-ENXIO) { + r->len = end - start; + r->status = RANGE_HOLE; + goto out; + } + err = (int)off; + goto out; + } + if (off >= end) { + r->len = end - start; + r->status = RANGE_HOLE; + goto out; + } + if (off > start) { + r->len = end - off; + r->status = RANGE_HOLE; + goto out; + } + to = vfs_llseek(file, start, SEEK_HOLE); + if (to < 0) { + err = (int)to; + goto out; + } + if (to < end) { + r->len = to - start; + r->status = RANGE_DATA; + goto out; + } + r->len = end - start; + r->status = RANGE_DATA; +out: + return err; +} + +static int range_check_mem(struct range_t *r) +{ + struct inode *inode = file_inode(r->file); + struct address_space *mapping = inode->i_mapping; + loff_t cur_off = r->off, end = r->off + r->max; + struct folio *folio; + + /* check from the first folio */ + folio = filemap_get_folio(mapping, cur_off >> PAGE_SHIFT); + if (IS_ERR(folio)) { + r->status = RANGE_HOLE; + cur_off += PAGE_SIZE; + } else { + r->status = RANGE_DATA; + cur_off += folio_size(folio); + folio_put(folio); + } + + while (cur_off < end) { + folio = filemap_get_folio(mapping, cur_off >> PAGE_SHIFT); + if (IS_ERR(folio)) { + if (r->status == RANGE_DATA) + break; + /* continuous hole */ + cur_off += PAGE_SIZE; + continue; + } + if (r->status == RANGE_HOLE) { + folio_put(folio); + break; + } + cur_off += folio_size(folio); + folio_put(folio); + } + + r->len = cur_off - r->off; + return 0; +} + +static int mfs_check_range(struct range_ctx *ctx) +{ + loff_t start = ctx->off, end = ctx->off + ctx->len; + struct file *file = ctx->file; + struct range_t r = { .file = file }; + size_t len = ctx->len; + struct mfs_syncer syncer; + int err = 0, err2 = 0; + + if (!ctx->len) + return 0; + + atomic_set(&syncer.notback, 1); + init_completion(&syncer.done); + INIT_LIST_HEAD(&syncer.head); + spin_lock_init(&syncer.list_lock); + atomic_set(&syncer.res, 0); + while (start < end) { + r.off = round_down(start, PAGE_SIZE); + r.max = len + (start - r.off); + r.len = 0; + r.status = RANGE_INVAL; + err = ctx->checker(&r); + if (err) + goto err; + switch (r.status) { + case RANGE_DATA: + start += r.len; + len -= r.len; + break; + case RANGE_HOLE: + start += r.len; + len -= r.len; + if (ctx->sync) + mfs_post_event_read(ctx->object, r.off, r.len, &syncer, ctx->op); + else + mfs_post_event_read(ctx->object, r.off, r.len, NULL, ctx->op); + break; + default: + pr_warn("invalid range status:%d\n", r.status); + WARN_ON_ONCE(1); + err = -EINVAL; + goto err; + } + } + +err: + if (atomic_dec_return(&syncer.notback) > 0) { + err2 = wait_for_completion_interruptible(&syncer.done); + if (err2) + mfs_cancel_syncer_events(ctx->object, &syncer); + else + err = atomic_read(&syncer.res); + } + return err ?: err2; +} + static ssize_t mfs_read_iter(struct kiocb *iocb, struct iov_iter *to) { struct file *cfile, *file = iocb->ki_filp; struct mfs_file_info *fi = file->private_data; + size_t isize = i_size_read(file_inode(file)); + struct range_ctx ctx; ssize_t rsize; + int err; if (!iov_iter_count(to)) return 0; @@ -146,6 +315,22 @@ static ssize_t mfs_read_iter(struct kiocb *iocb, struct iov_iter *to) return -EINVAL; (void)get_file(cfile); + ctx.file = cfile; + ctx.object = file_inode(file)->i_private; + ctx.off = iocb->ki_pos; + ctx.op = MFS_OP_READ; + ctx.len = min(isize - ctx.off, iov_iter_count(to)); + ctx.sync = false; + ctx.checker = range_check_mem; + if (need_sync_event(file_inode(file)->i_sb)) { + ctx.sync = true; + ctx.checker = range_check_disk; + } + err = mfs_check_range(&ctx); + if (err) { + fput(cfile); + return err; + } iocb->ki_filp = cfile; rsize = cfile->f_op->read_iter(iocb, to); @@ -181,9 +366,12 @@ static vm_fault_t mfs_filemap_fault(struct vm_fault *vmf) { struct file *cfile, *file = vmf->vma->vm_file; struct mfs_file_info *fi = file->private_data; + size_t isize = i_size_read(file_inode(file)); const struct vm_operations_struct *cvm_ops; struct vm_area_struct cvma, *vma, **vma_; + struct range_ctx ctx; vm_fault_t ret; + int err; vma = vmf->vma; memcpy(&cvma, vma, sizeof(struct vm_area_struct)); @@ -193,8 +381,26 @@ static vm_fault_t mfs_filemap_fault(struct vm_fault *vmf) if (unlikely(!cvm_ops->fault)) return VM_FAULT_SIGBUS; + if ((vmf->pgoff << PAGE_SHIFT) >= isize) + return VM_FAULT_SIGBUS; (void)get_file(cfile); + ctx.file = cfile; + ctx.object = file_inode(file)->i_private; + ctx.off = vmf->pgoff << PAGE_SHIFT; + ctx.len = min(isize - ctx.off, PAGE_SIZE); + ctx.op = MFS_OP_FAULT; + ctx.sync = false; + ctx.checker = range_check_mem; + if (need_sync_event(file_inode(file)->i_sb)) { + ctx.sync = true; + ctx.checker = range_check_disk; + } + err = mfs_check_range(&ctx); + if (err) { + fput(cfile); + return VM_FAULT_SIGBUS; + } /* * Dealing fault in mfs will call cachefile's fault eventually, @@ -216,17 +422,38 @@ vm_fault_t mfs_filemap_map_pages(struct vm_fault *vmf, { struct file *cfile, *file = vmf->vma->vm_file; struct mfs_file_info *fi = file->private_data; + size_t isize = i_size_read(file_inode(file)); const struct vm_operations_struct *cvm_ops; struct vm_area_struct cvma, *vma, **vma_; + struct range_ctx ctx; vm_fault_t ret; + int err; vma = vmf->vma; memcpy(&cvma, vma, sizeof(struct vm_area_struct)); cfile = fi->cache; cvm_ops = fi->cache_vm_ops; cvma.vm_file = cfile; + + if (unlikely(!cvm_ops->map_pages)) + return 0; + if ((start_pgoff << PAGE_SHIFT) >= isize) + return 0; + (void)get_file(cfile); - if (unlikely(!cvm_ops->map_pages)) { + ctx.file = cfile; + ctx.object = file_inode(file)->i_private; + ctx.off = start_pgoff << PAGE_SHIFT; + ctx.len = min(isize - ctx.off, (end_pgoff - start_pgoff) << PAGE_SHIFT); + ctx.op = MFS_OP_FAROUND; + ctx.sync = false; + ctx.checker = range_check_mem; + if (need_sync_event(file_inode(file)->i_sb)) { + ctx.sync = true; + ctx.checker = range_check_disk; + } + err = mfs_check_range(&ctx); + if (err) { fput(cfile); return 0; } diff --git a/fs/mfs/inode.c b/fs/mfs/inode.c index 3e4d24c517cb..3edd9bb3afa1 100644 --- a/fs/mfs/inode.c +++ b/fs/mfs/inode.c @@ -275,6 +275,14 @@ struct inode *mfs_iget(struct super_block *sb, struct inode *lower_inode, goto err_inode; } inode->i_mapping->a_ops = &mfs_aops; + if (S_ISREG(cache_inode->i_mode)) { + vi->vfs_inode.i_private = mfs_alloc_object(inode, cache_path); + if (IS_ERR(vi->vfs_inode.i_private)) { + err = PTR_ERR(vi->vfs_inode.i_private); + vi->vfs_inode.i_private = NULL; + goto err_inode; + } + } vi->lower = lower_inode; vi->cache = cache_inode; fsstack_copy_attr_all(inode, lower_inode); diff --git a/fs/mfs/internal.h b/fs/mfs/internal.h index ca4fc42d578b..295adc0794a3 100644 --- a/fs/mfs/internal.h +++ b/fs/mfs/internal.h @@ -9,12 +9,30 @@ #include <linux/mm.h> #include <linux/container_of.h> #include <linux/spinlock_types.h> +#include <linux/completion.h> #include <linux/mfs.h> #define MFS_NAME "mfs" #define MFS_OPEN_FLAGS (O_NOATIME) +struct mfs_cache_object { + struct file *cache_file; + struct inode *mfs_inode; + + struct rw_semaphore rwsem; + int fd; /* file handle */ + struct file *anon_file; /* related with fd */ +}; + +struct mfs_syncer { + atomic_t notback; + struct list_head head; + spinlock_t list_lock; + struct completion done; + atomic_t res; +}; + struct mfs_sb_info { int mode; char *mtree; @@ -130,9 +148,27 @@ static inline bool support_event(struct mfs_sb_info *sbi) return sbi->mode != MFS_MODE_NONE; } +static inline bool need_sync_event(struct super_block *sb) +{ + struct mfs_sb_info *sbi = MFS_SB(sb); + + return sbi->mode == MFS_MODE_REMOTE; +} + struct inode *mfs_iget(struct super_block *sb, struct inode *lower_inode, struct path *cache_path); int mfs_alloc_dentry_info(struct dentry *dentry); void mfs_free_dentry_info(struct dentry *dentry); +void mfs_post_event_read(struct mfs_cache_object *object, + loff_t off, uint64_t len, + struct mfs_syncer *syncer, int op); +void mfs_cancel_syncer_events(struct mfs_cache_object *object, + struct mfs_syncer *syncer); +struct mfs_cache_object *mfs_alloc_object(struct inode *inode, + struct path *cache_path); +void mfs_free_object(void *data); +int mfs_cache_init(void); +void mfs_cache_exit(void); + #endif diff --git a/fs/mfs/super.c b/fs/mfs/super.c index f6bc2739f350..1f715b93cb03 100644 --- a/fs/mfs/super.c +++ b/fs/mfs/super.c @@ -53,6 +53,8 @@ static void mfs_evict_inode(struct inode *inode) struct inode *cache_inode = vi->cache; truncate_inode_pages_final(&inode->i_data); + if (inode->i_private) + mfs_free_object(inode->i_private); clear_inode(inode); if (lower_inode) { vi->lower = NULL; @@ -420,6 +422,10 @@ static int __init init_mfs_fs(void) goto err_dentryp; } + err = mfs_cache_init(); + if (err) + goto err_cache; + err = register_filesystem(&mfs_fs_type); if (err) goto err_register; @@ -427,6 +433,8 @@ static int __init init_mfs_fs(void) pr_info("MFS module loaded\n"); return 0; err_register: + mfs_cache_exit(); +err_cache: kmem_cache_destroy(mfs_dentry_cachep); err_dentryp: kmem_cache_destroy(mfs_inode_cachep); @@ -436,6 +444,7 @@ static int __init init_mfs_fs(void) static void __exit exit_mfs_fs(void) { unregister_filesystem(&mfs_fs_type); + mfs_cache_exit(); kmem_cache_destroy(mfs_dentry_cachep); kmem_cache_destroy(mfs_inode_cachep); pr_info("MFS module unload\n"); diff --git a/include/uapi/linux/mfs.h b/include/uapi/linux/mfs.h index 81feff7b7fe0..78c4b57a83f5 100644 --- a/include/uapi/linux/mfs.h +++ b/include/uapi/linux/mfs.h @@ -6,6 +6,12 @@ #include <linux/types.h> #include <linux/ioctl.h> +enum mfs_opcode { + MFS_OP_READ = 0, + MFS_OP_FAULT, + MFS_OP_FAROUND, +}; + enum { MFS_MODE_NONE = 0, MFS_MODE_LOCAL, -- 2.25.1

From: Hongbo Li <lihongbo22@huawei.com> hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/release-management/issues/ID5W1P -------------------------------- Each MFS has a unique communication device which is named with /dev/mfs${minor}. User space can obtain the MISS event by polling and reading the device. Signed-off-by: Huang Xiaojia <huangxiaojia2@huawei.com> Signed-off-by: Hongbo Li <lihongbo22@huawei.com> --- fs/mfs/Makefile | 2 +- fs/mfs/cache.c | 80 ++++++++++++ fs/mfs/dev.c | 264 +++++++++++++++++++++++++++++++++++++++ fs/mfs/internal.h | 16 +++ fs/mfs/super.c | 30 ++++- include/uapi/linux/mfs.h | 6 + 6 files changed, 396 insertions(+), 2 deletions(-) create mode 100644 fs/mfs/dev.c diff --git a/fs/mfs/Makefile b/fs/mfs/Makefile index a3fe71ba61e8..68c090fb4bc3 100644 --- a/fs/mfs/Makefile +++ b/fs/mfs/Makefile @@ -1,4 +1,4 @@ # SPDX-License-Identifier: GPL-2.0-only obj-$(CONFIG_MFS_FS) += mfs.o -mfs-objs := super.o inode.o data.o cache.o +mfs-objs := super.o inode.o data.o dev.o cache.o diff --git a/fs/mfs/cache.c b/fs/mfs/cache.c index ffc6191bbe7b..da1ef8432e95 100644 --- a/fs/mfs/cache.c +++ b/fs/mfs/cache.c @@ -3,6 +3,7 @@ #include "internal.h" +#include <linux/anon_inodes.h> #include <linux/mfs.h> /* @@ -10,6 +11,9 @@ */ static struct kmem_cache *mfs_cobject_cachep; +static const struct file_operations mfs_fd_fops = { +}; + static int mfs_setup_object(struct mfs_cache_object *object, struct inode *inode, struct path *cache_path) @@ -36,6 +40,18 @@ static int mfs_setup_object(struct mfs_cache_object *object, return 0; } +struct mfs_event *mfs_pick_event(struct xa_state *xas, + unsigned long xa_max) +{ + struct mfs_event *event; + + xas_for_each_marked(xas, event, xa_max, MFS_EVENT_NEW) { + return event; + } + + return NULL; +} + void mfs_post_event_read(struct mfs_cache_object *object, loff_t off, uint64_t len, struct mfs_syncer *syncer, int op) @@ -169,6 +185,70 @@ void mfs_cancel_syncer_events(struct mfs_cache_object *object, } } +void mfs_cancel_all_events(struct mfs_sb_info *sbi) +{ + struct mfs_caches *caches = &sbi->caches; + struct xarray *xa = &caches->events; + struct mfs_syncer *syncer; + struct mfs_event *event; + unsigned long index; + + xa_lock(xa); + xa_for_each(xa, index, event) { + __xa_erase(xa, index); + xa_unlock(xa); + if (event->syncer) { + syncer = event->syncer; + if (atomic_dec_return(&syncer->notback) == 0) + complete(&syncer->done); + spin_lock(&syncer->list_lock); + list_del_init(&event->link); + spin_unlock(&syncer->list_lock); + } + iput(event->object->mfs_inode); + kfree(event); + xa_lock(xa); + } + caches->next_ev = 0; + caches->next_msg = 0; + xa_unlock(xa); +} + +int try_hook_fd(struct mfs_event *event) +{ + struct mfs_cache_object *object = event->object; + struct file *anon_file; + int fd; + + down_read(&object->rwsem); + if (object->fd > 0) { + up_read(&object->rwsem); + return object->fd; + } + up_read(&object->rwsem); + down_write(&object->rwsem); + fd = get_unused_fd_flags(O_WRONLY); + if (fd < 0) { + up_write(&object->rwsem); + return fd; + } + + anon_file = anon_inode_getfile("[mfs]", &mfs_fd_fops, object, O_WRONLY); + if (IS_ERR(anon_file)) { + put_unused_fd(fd); + up_write(&object->rwsem); + return PTR_ERR(anon_file); + } + anon_file->f_mode |= FMODE_PWRITE | FMODE_LSEEK; + object->fd = fd; + object->anon_file = anon_file; + /* lifecyle of fd/anon_file should later than mfs_inode */ + ihold(object->mfs_inode); + fd_install(fd, anon_file); + up_write(&object->rwsem); + return fd; +} + struct mfs_cache_object *mfs_alloc_object(struct inode *inode, struct path *cache_path) { diff --git a/fs/mfs/dev.c b/fs/mfs/dev.c new file mode 100644 index 000000000000..b9e512a11ee4 --- /dev/null +++ b/fs/mfs/dev.c @@ -0,0 +1,264 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* Copyright (C) 2025. Huawei Technologies Co., Ltd */ + +#include "internal.h" + +#include <linux/device.h> +#include <linux/idr.h> +#include <linux/poll.h> +#include <linux/list.h> +#include "../mount.h" + +static DEFINE_MUTEX(mfs_dev_lock); +static DEFINE_IDR(mfs_dev_minor); + +static int mfs_dev_major; +static const struct class mfs_dev_class = { + .name = "mfs", +}; +static struct device *mfs_dev; + +static inline void mfs_finish_event(struct mfs_event *event, struct xa_state *xas) +{ + struct mfs_syncer *syncer = event->syncer; + + if (unlikely(!xas || !event)) + return; + + if (syncer) { + if (xa_cmpxchg(xas->xa, xas->xa_index, event, NULL, 0) != event) + return; + + if (atomic_dec_and_test(&syncer->notback)) + complete(&syncer->done); + put_mfs_event(event); + } +} + +static int mfs_dev_open(struct inode *inode, struct file *file) +{ + struct mfs_caches *caches; + struct mfs_sb_info *sbi; + struct mount *mnt; + unsigned minor = iminor(inode); + + sbi = minor < U8_MAX ? idr_find(&mfs_dev_minor, minor) : NULL; + if (!sbi) + return -EOPNOTSUPP; + caches = &sbi->caches; + if (test_and_set_bit(MFS_CACHE_OPENED, &caches->flags)) + return -EBUSY; + smp_mb__after_atomic(); + + /* not mounted or cleaned by umounting */ + if (!test_bit(MFS_MOUNTED, &sbi->flags)) { + clear_bit(MFS_CACHE_OPENED, &caches->flags); + return -EBUSY; + } + mnt = list_first_entry(&sbi->sb->s_mounts, struct mount, mnt_instance); + /* during mounting or delete from s_mounts in umounting */ + if (list_empty(&sbi->sb->s_mounts)) { + clear_bit(MFS_CACHE_OPENED, &caches->flags); + return -EBUSY; + } + sbi->mnt = mntget(&mnt->mnt); + + file->private_data = sbi; + set_bit(MFS_CACHE_READY, &caches->flags); + return 0; +} + +static int mfs_dev_release(struct inode *inode, struct file *file) +{ + struct mfs_sb_info *sbi = file->private_data; + struct mfs_caches *caches = &sbi->caches; + + clear_bit(MFS_CACHE_READY, &caches->flags); + smp_mb__after_atomic(); + mfs_cancel_all_events(sbi); + mntput(sbi->mnt); + smp_mb__before_atomic(); + clear_bit(MFS_CACHE_OPENED, &caches->flags); + return 0; +} + +static ssize_t mfs_dev_read(struct file *file, char __user *buf, + size_t blen, loff_t *off) +{ + struct mfs_sb_info *sbi = file->private_data; + struct mfs_caches *caches = &sbi->caches; + XA_STATE(xas, &caches->events, caches->next_ev); + struct mfs_event *event; + struct mfs_msg *msg; + size_t n; + int ret = 0; + + xas_lock(&xas); + event = mfs_pick_event(&xas, ULONG_MAX); + if (!event && caches->next_ev > 0) { + xas_set(&xas, 0); + event = mfs_pick_event(&xas, caches->next_ev - 1); + } + if (!event) { + xas_unlock(&xas); + return 0; + } + xas_unlock(&xas); + + msg = &event->msg; + n = msg->len; + if (n > blen) + return -EMSGSIZE; + + ret = try_hook_fd(event); + if (ret < 0) + return ret; + + msg->fd = ret; + ret = 0; + xas_lock(&xas); + xas_clear_mark(&xas, MFS_EVENT_NEW); + caches->next_ev = xas.xa_index + 1; + if (event->syncer) + get_mfs_event(event); + else + xas_store(&xas, NULL); + xas_unlock(&xas); + + if (copy_to_user(buf, msg, n)) + ret = -EFAULT; + if (ret) + mfs_finish_event(event, &xas); + put_mfs_event(event); + return ret ? ret : n; +} + +static __poll_t mfs_dev_poll(struct file *file, + struct poll_table_struct *poll) +{ + struct mfs_sb_info *sbi = file->private_data; + struct mfs_caches *caches = &sbi->caches; + struct mfs_event *event; + XA_STATE(xas, &caches->events, 0); + __poll_t mask; + + poll_wait(file, &caches->pollwq, poll); + mask = 0; + + if (!xa_empty(&caches->events)) { + xas_lock(&xas); + xas_for_each_marked(&xas, event, ULONG_MAX, MFS_EVENT_NEW) { + mask |= EPOLLIN; + break; + } + xas_unlock(&xas); + } + + return mask; +} + +static long mfs_dev_ioctl(struct file *filp, + unsigned int cmd, unsigned long arg) +{ + struct mfs_ioc_fsinfo fsinfo; + unsigned minor = iminor(file_inode(filp)); + struct mfs_sb_info *sbi = minor < U8_MAX ? + idr_find(&mfs_dev_minor, minor) : NULL; + if (!sbi) + return -EOPNOTSUPP; + + if (cmd != MFS_IOC_FSINFO) + return -EINVAL; + if (!test_bit(MFS_MOUNTED, &sbi->flags)) + return -EBUSY; + + fsinfo.mode = sbi->mode; + if (copy_to_user((void __user *)arg, &fsinfo, + sizeof(struct mfs_ioc_fsinfo))) + return -EFAULT; + return 0; +} + +static const struct file_operations mfs_dev_fops = { + .owner = THIS_MODULE, + .open = mfs_dev_open, + .release = mfs_dev_release, + .read = mfs_dev_read, + .poll = mfs_dev_poll, + .unlocked_ioctl = mfs_dev_ioctl, +}; + +int mfs_fs_dev_init(struct super_block *sb) +{ + struct mfs_sb_info *sbi = MFS_SB(sb); + struct device *dev; + + mutex_lock(&mfs_dev_lock); + sbi->minor = idr_alloc(&mfs_dev_minor, sbi, 0, U8_MAX, GFP_KERNEL); + if (sbi->minor < 0) { + mutex_unlock(&mfs_dev_lock); + return sbi->minor; + } + + dev = device_create(&mfs_dev_class, NULL, + MKDEV(mfs_dev_major, sbi->minor), sbi, + "mfs%u", sbi->minor); + if (IS_ERR(dev)) { + idr_remove(&mfs_dev_minor, sbi->minor); + sbi->minor = -1; + mutex_unlock(&mfs_dev_lock); + return PTR_ERR(dev); + } + mutex_unlock(&mfs_dev_lock); + return 0; +} + +void mfs_fs_dev_exit(struct super_block *sb) +{ + struct mfs_sb_info *sbi = MFS_SB(sb); + + if (sbi->minor < 0) + return; + mutex_lock(&mfs_dev_lock); + device_destroy(&mfs_dev_class, MKDEV(mfs_dev_major, sbi->minor)); + idr_remove(&mfs_dev_minor, sbi->minor); + mutex_unlock(&mfs_dev_lock); + sbi->minor = -1; +} + +int mfs_dev_init(void) +{ + int ret; + + mfs_dev_major = register_chrdev(0, "mfs-ctl", &mfs_dev_fops); + if (mfs_dev_major < 0) + return mfs_dev_major; + + ret = class_register(&mfs_dev_class); + if (ret) + goto major_out; + + mfs_dev = device_create(&mfs_dev_class, NULL, + MKDEV(mfs_dev_major, U8_MAX), + NULL, "mfs-ctl"); + if (IS_ERR(mfs_dev)) { + ret = PTR_ERR(mfs_dev); + goto class_out; + } + return 0; + +class_out: + class_unregister(&mfs_dev_class); +major_out: + unregister_chrdev(mfs_dev_major, "mfs-ctl"); + return ret; +} + +void mfs_dev_exit(void) +{ + if (!IS_ERR_OR_NULL(mfs_dev)) + device_destroy(&mfs_dev_class, MKDEV(mfs_dev_major, U8_MAX)); + class_unregister(&mfs_dev_class); + if (mfs_dev_major > 0) + unregister_chrdev(mfs_dev_major, "mfs-ctl"); +} diff --git a/fs/mfs/internal.h b/fs/mfs/internal.h index d2e068665f43..1e6e1defd862 100644 --- a/fs/mfs/internal.h +++ b/fs/mfs/internal.h @@ -13,6 +13,7 @@ #include <linux/wait.h> #include <linux/completion.h> #include <linux/types.h> +#include <linux/mount.h> #include <linux/mfs.h> #define MFS_NAME "mfs" @@ -20,8 +21,12 @@ #define MFS_OPEN_FLAGS (O_NOATIME) #define MFS_EVENT_NEW XA_MARK_1 +/* mfs_sb_info flags */ +#define MFS_MOUNTED 0 + /* mfs_caches flags */ #define MFS_CACHE_READY 0 +#define MFS_CACHE_OPENED 1 struct mfs_cache_object { struct file *cache_file; @@ -65,6 +70,8 @@ struct mfs_sb_info { int minor; + unsigned long flags; + struct vfsmount *mnt; struct super_block *sb; struct mfs_caches caches; @@ -203,12 +210,21 @@ struct inode *mfs_iget(struct super_block *sb, struct inode *lower_inode, int mfs_alloc_dentry_info(struct dentry *dentry); void mfs_free_dentry_info(struct dentry *dentry); +int mfs_fs_dev_init(struct super_block *sb); +void mfs_fs_dev_exit(struct super_block *sb); +int mfs_dev_init(void); +void mfs_dev_exit(void); + +struct mfs_event *mfs_pick_event(struct xa_state *xas, + unsigned long xa_max); void mfs_post_event_read(struct mfs_cache_object *object, loff_t off, uint64_t len, struct mfs_syncer *syncer, int op); void mfs_destroy_events(struct super_block *sb); void mfs_cancel_syncer_events(struct mfs_cache_object *object, struct mfs_syncer *syncer); +void mfs_cancel_all_events(struct mfs_sb_info *sbi); +int try_hook_fd(struct mfs_event *event); struct mfs_cache_object *mfs_alloc_object(struct inode *inode, struct path *cache_path); void mfs_free_object(void *data); diff --git a/fs/mfs/super.c b/fs/mfs/super.c index a8023a66cd8d..172d95b7d607 100644 --- a/fs/mfs/super.c +++ b/fs/mfs/super.c @@ -10,6 +10,8 @@ #include <linux/namei.h> #include <linux/seq_file.h> #include <linux/statfs.h> +#include <linux/delay.h> +#include <linux/string.h> /* * Used for alloc_inode @@ -301,6 +303,12 @@ static int mfs_fc_fill_super(struct super_block *sb, struct fs_context *fc) if (err) return err; + if (support_event(sbi)) { + err = mfs_fs_dev_init(sb); + if (err) + return err; + } + inode = mfs_iget(sb, d_inode(sbi->lower.dentry), &sbi->cache); if (IS_ERR(inode)) { err = PTR_ERR(inode); @@ -318,12 +326,15 @@ static int mfs_fc_fill_super(struct super_block *sb, struct fs_context *fc) goto out_dput; mfs_install_path(sb->s_root, &sbi->lower, &sbi->cache); sbi->sb = sb; + set_bit(MFS_MOUNTED, &sbi->flags); return 0; out_dput: dput(sb->s_root); out_iput: iput(inode); out_exit: + if (support_event(sbi)) + mfs_fs_dev_exit(sb); return err; } @@ -381,7 +392,17 @@ static int mfs_init_fs_context(struct fs_context *fc) static void mfs_kill_sb(struct super_block *sb) { struct mfs_sb_info *sbi = MFS_SB(sb); - + struct mfs_caches *caches = &sbi->caches; + + clear_bit(MFS_MOUNTED, &sbi->flags); + if (support_event(sbi)) { + while (test_bit(MFS_CACHE_OPENED, &caches->flags)) { + msleep(100); + printk_once(KERN_WARNING "Pending until close the /dev/mfs%u...\n", + sbi->minor); + } + mfs_fs_dev_exit(sb); + } kill_anon_super(sb); mfs_destroy_events(sb); if (sbi->mtree) { @@ -433,8 +454,14 @@ static int __init init_mfs_fs(void) if (err) goto err_register; + err = mfs_dev_init(); + if (err) + goto err_dev; + pr_info("MFS module loaded\n"); return 0; +err_dev: + unregister_filesystem(&mfs_fs_type); err_register: mfs_cache_exit(); err_cache: @@ -446,6 +473,7 @@ static int __init init_mfs_fs(void) static void __exit exit_mfs_fs(void) { + mfs_dev_exit(); unregister_filesystem(&mfs_fs_type); mfs_cache_exit(); kmem_cache_destroy(mfs_dentry_cachep); diff --git a/include/uapi/linux/mfs.h b/include/uapi/linux/mfs.h index 1bae08939b95..1e4e253dbdd4 100644 --- a/include/uapi/linux/mfs.h +++ b/include/uapi/linux/mfs.h @@ -18,6 +18,12 @@ enum { MFS_MODE_REMOTE, }; +struct mfs_ioc_fsinfo { + __u8 mode; /* 0: none, 1: local, 2: remote */ +}; + +#define MFS_IOC_FSINFO _IOR(0xbd, 1, struct mfs_ioc_fsinfo) + struct mfs_msg { __u8 version; __u8 opcode; -- 2.25.1

From: Hongbo Li <lihongbo22@huawei.com> hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/release-management/issues/ID5W1P -------------------------------- In order to debug mfs, we provide the some basic tracepoint in MFS, which are: - trace_mfs_post_event_read: trace events which are posted - trace_mfs_open: trace open operation - trace_mfs_release: trace close operation - trace_mfs_dev_read: trace events reading - trace_mfs_lookup: trace lookup operation Signed-off-by: Huang Xiaojia <huangxiaojia2@huawei.com> Signed-off-by: Hongbo Li <lihongbo22@huawei.com> --- fs/mfs/cache.c | 3 ++ fs/mfs/data.c | 4 ++ fs/mfs/dev.c | 3 ++ fs/mfs/inode.c | 3 ++ fs/mfs/super.c | 3 ++ include/trace/events/mfs.h | 105 +++++++++++++++++++++++++++++++++++++ 6 files changed, 121 insertions(+) create mode 100644 include/trace/events/mfs.h diff --git a/fs/mfs/cache.c b/fs/mfs/cache.c index 0466f6aefe6f..2178c78f4f1a 100644 --- a/fs/mfs/cache.c +++ b/fs/mfs/cache.c @@ -9,6 +9,8 @@ #include <linux/rwsem.h> #include <linux/pagemap.h> +#include <trace/events/mfs.h> + /* * Used for cache object */ @@ -278,6 +280,7 @@ void mfs_post_event_read(struct mfs_cache_object *object, /* 2. hold object's owner mfs_inode */ ihold(object->mfs_inode); + trace_mfs_post_event_read(object->mfs_inode, off, len, op); refcount_set(&event->ref, 1); event->object = object; event->msg.version = 0; diff --git a/fs/mfs/data.c b/fs/mfs/data.c index 9df523abf92e..6b4f61096f87 100644 --- a/fs/mfs/data.c +++ b/fs/mfs/data.c @@ -7,6 +7,8 @@ #include <linux/uio.h> #include <linux/completion.h> +#include <trace/events/mfs.h> + static struct mfs_file_info *mfs_file_info_alloc(struct file *lower, struct file *cache) { struct mfs_file_info *info = kzalloc(sizeof(struct mfs_file_info), GFP_KERNEL); @@ -36,6 +38,7 @@ static int mfs_open(struct inode *inode, struct file *file) struct mfs_file_info *file_info; int err = 0; + trace_mfs_open(inode, file); mfs_get_path(dentry, &lpath, &cpath); lfile = dentry_open(&lpath, flags, current_cred()); if (IS_ERR(lfile)) { @@ -71,6 +74,7 @@ static int mfs_open(struct inode *inode, struct file *file) static int mfs_release(struct inode *inode, struct file *file) { + trace_mfs_release(inode, file); mfs_file_info_free(file->private_data); return 0; } diff --git a/fs/mfs/dev.c b/fs/mfs/dev.c index b9e512a11ee4..15b55b257d2f 100644 --- a/fs/mfs/dev.c +++ b/fs/mfs/dev.c @@ -9,6 +9,8 @@ #include <linux/list.h> #include "../mount.h" +#include <trace/events/mfs.h> + static DEFINE_MUTEX(mfs_dev_lock); static DEFINE_IDR(mfs_dev_minor); @@ -130,6 +132,7 @@ static ssize_t mfs_dev_read(struct file *file, char __user *buf, if (ret) mfs_finish_event(event, &xas); put_mfs_event(event); + trace_mfs_dev_read(file, msg->opcode, msg->id, msg->fd); return ret ? ret : n; } diff --git a/fs/mfs/inode.c b/fs/mfs/inode.c index 3edd9bb3afa1..9894676a1da9 100644 --- a/fs/mfs/inode.c +++ b/fs/mfs/inode.c @@ -7,6 +7,8 @@ #include <linux/fs_stack.h> #include <linux/namei.h> +#include <trace/events/mfs.h> + static int mfs_inode_eq(struct inode *inode, void *lower_target) { return mfs_lower_inode(inode) == (struct inode *)lower_target; @@ -126,6 +128,7 @@ struct dentry *mfs_lookup(struct inode *dir, struct dentry *dentry, const char *name; int err; + trace_mfs_lookup(dir, dentry, flag); parent = dget_parent(dentry); mfs_get_path(parent, &parent_lpath, &parent_cpath); err = mfs_alloc_dentry_info(dentry); diff --git a/fs/mfs/super.c b/fs/mfs/super.c index 172d95b7d607..fa096f17e4a7 100644 --- a/fs/mfs/super.c +++ b/fs/mfs/super.c @@ -13,6 +13,9 @@ #include <linux/delay.h> #include <linux/string.h> +#define CREATE_TRACE_POINTS +#include <trace/events/mfs.h> + /* * Used for alloc_inode */ diff --git a/include/trace/events/mfs.h b/include/trace/events/mfs.h new file mode 100644 index 000000000000..5963888d0993 --- /dev/null +++ b/include/trace/events/mfs.h @@ -0,0 +1,105 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +#undef TRACE_SYSTEM +#define TRACE_SYSTEM mfs + +#if !defined(_TRACE_MFS_H) || defined(TRACE_HEADER_MULTI_READ) +#define _TRACE_MFS_H + +#include <linux/tracepoint.h> +#include <linux/fs.h> + +TRACE_EVENT(mfs_lookup, + TP_PROTO(struct inode *dir, struct dentry *dentry, unsigned int flag), + TP_ARGS(dir, dentry, flag), + TP_STRUCT__entry( + __field(dev_t, dev) + __field(ino_t, ino) + __string(name, dentry->d_name.name) + __field(unsigned int, flag) + ), + TP_fast_assign( + __entry->dev = dir->i_sb->s_dev; + __entry->ino = dir->i_ino; + __assign_str(name, dentry->d_name.name); + __entry->flag = flag; + ), + + TP_printk("dev=%d ino=%lu name=%s flag=%x", + MINOR(__entry->dev), __entry->ino, __get_str(name), __entry->flag) +); + +DECLARE_EVENT_CLASS(mfs_file_normal, + TP_PROTO(struct inode *inode, struct file *file), + TP_ARGS(inode, file), + TP_STRUCT__entry( + __field(dev_t, dev) + __field(ino_t, ino) + __field(mode_t, mode) + ), + TP_fast_assign( + __entry->dev = inode->i_sb->s_dev; + __entry->ino = inode->i_ino; + __entry->mode = file->f_mode; + ), + + TP_printk("dev=%d ino=%lu mode=%o", + MINOR(__entry->dev), __entry->ino, __entry->mode) +); + +DEFINE_EVENT(mfs_file_normal, mfs_open, + TP_PROTO(struct inode *inode, struct file *file), + TP_ARGS(inode, file) +); + +DEFINE_EVENT(mfs_file_normal, mfs_release, + TP_PROTO(struct inode *inode, struct file *file), + TP_ARGS(inode, file) +); + +TRACE_EVENT(mfs_post_event_read, + TP_PROTO(struct inode *inode, loff_t off, uint64_t len, int op), + TP_ARGS(inode, off, len, op), + TP_STRUCT__entry( + __field(dev_t, dev) + __field(ino_t, ino) + __field(loff_t, off) + __field(uint64_t, len) + __field(int, op) + ), + TP_fast_assign( + __entry->dev = inode->i_sb->s_dev; + __entry->ino = inode->i_ino; + __entry->off = off; + __entry->len = len; + __entry->op = op; + ), + + TP_printk("(miss) dev=%d ino=%lu off=%lld len=%llu op=%d", + MINOR(__entry->dev), __entry->ino, __entry->off, __entry->len, __entry->op) +); + +TRACE_EVENT(mfs_dev_read, + TP_PROTO(struct file *file, int op, uint32_t msgid, uint32_t fd), + TP_ARGS(file, op, msgid, fd), + TP_STRUCT__entry( + __field(dev_t, dev) + __field(ino_t, ino) + __field(int, op) + __field(uint32_t, msgid) + __field(uint32_t, fd) + ), + TP_fast_assign( + __entry->dev = file->f_inode->i_sb->s_dev; + __entry->ino = file->f_inode->i_ino; + __entry->op = op; + __entry->msgid = msgid; + __entry->fd = fd; + ), + + TP_printk("dev=%d ino=%lu op=%d msgid=%u fd=%u", + MINOR(__entry->dev), __entry->ino, __entry->op, __entry->msgid, __entry->fd) +); + +#endif /* _TRACE_MFS_H */ + +#include <trace/define_trace.h> -- 2.25.1

From: Hongbo Li <lihongbo22@huawei.com> hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/release-management/issues/ID5W1P -------------------------------- Add maintainer information for MFS file system. Signed-off-by: Huang Xiaojia <huangxiaojia2@huawei.com> Signed-off-by: Hongbo Li <lihongbo22@huawei.com> --- MAINTAINERS | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 33eeabab5088..927e9f6aa9ce 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -7762,6 +7762,16 @@ F: Documentation/filesystems/erofs.rst F: fs/erofs/ F: include/trace/events/erofs.h +MFS FILE SYSTEM +M: Hongbo Li <lihongbo22@huawei.com> +M: Xiaojia Huang <huangxiaojia2@huawei.com> +L: linux-fsdevel@vger.kernel.org +S: Maintained +F: Documentation/filesystems/mfs.rst +F: fs/mfs/ +F: include/trace/events/mfs.h +F: include/uapi/linux/mfs.h + ERRSEQ ERROR TRACKING INFRASTRUCTURE M: Jeff Layton <jlayton@kernel.org> S: Maintained -- 2.25.1

From: Hongbo Li <lihongbo22@huawei.com> hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/release-management/issues/ID5W1P ------------------ In remote mode, undo events are placed on the syncer list. The syncer object is a stack variable and will be released if the process is interrupted or the syncer is woken up during the closing of the device's file descriptor. When the daemon exits, it calls `dev_release` and wakes up all events. Once the syncer is marked as completed, accessing it will lead to UAF vulnerability. Therefore, the syncer must never be used after its events have been completed. Additionally, `mfs_cancel_syncer_events` is called when a user process terminates. There are scenarios where event completion may coincide with other cleanup tasks, which can result in invalid event references. To prevent this, the `xa_lock` is used to protect against the race condition. Fixes: 3236f3b541d1 ("mfs: Add communication devie and event acquisition operations") Signed-off-by: Hongbo Li <lihongbo22@huawei.com> --- fs/mfs/cache.c | 46 +++++++++++++++++++++++----------------------- fs/mfs/dev.c | 41 +++++++++++++---------------------------- 2 files changed, 36 insertions(+), 51 deletions(-) diff --git a/fs/mfs/cache.c b/fs/mfs/cache.c index 2178c78f4f1a..994638065f85 100644 --- a/fs/mfs/cache.c +++ b/fs/mfs/cache.c @@ -78,8 +78,6 @@ static long _ioc_done(struct mfs_cache_object *object, return -EINVAL; } xas_store(&xas, NULL); - xas_unlock(&xas); - syncer = event->syncer; if (done->ret) atomic_cmpxchg(&syncer->res, 0, -EIO); @@ -88,6 +86,8 @@ static long _ioc_done(struct mfs_cache_object *object, spin_unlock(&syncer->list_lock); if (atomic_dec_return(&syncer->notback) == 0) complete(&syncer->done); + xas_unlock(&xas); + put_mfs_event(event); return 0; } @@ -366,9 +366,7 @@ void mfs_destroy_events(struct super_block *sb) */ pr_warn("Event remains:%lu\n", index); __xa_erase(&caches->events, index); - xa_unlock(&caches->events); put_mfs_event(event); - xa_lock(&caches->events); } xa_unlock(&caches->events); xa_destroy(&caches->events); @@ -379,19 +377,18 @@ void mfs_cancel_syncer_events(struct mfs_cache_object *object, { struct mfs_sb_info *sbi = MFS_SB(object->mfs_inode->i_sb); struct mfs_caches *caches = &sbi->caches; - struct mfs_event *event; - struct list_head tmp; + struct xarray *xa = &caches->events; + struct mfs_event *event, *nevent; - INIT_LIST_HEAD(&tmp); + xa_lock(xa); spin_lock(&syncer->list_lock); - list_splice_init(&syncer->head, &tmp); - spin_unlock(&syncer->list_lock); - - list_for_each_entry(event, &tmp, link) { - xa_erase(&caches->events, event->msg.id); - iput(event->object->mfs_inode); - kfree(event); + list_for_each_entry_safe(event, nevent, &syncer->head, link) { + __xa_erase(&caches->events, event->msg.id); + list_del(&event->link); + put_mfs_event(event); } + spin_unlock(&syncer->list_lock); + xa_unlock(xa); } void mfs_cancel_all_events(struct mfs_sb_info *sbi) @@ -405,18 +402,21 @@ void mfs_cancel_all_events(struct mfs_sb_info *sbi) xa_lock(xa); xa_for_each(xa, index, event) { __xa_erase(xa, index); - xa_unlock(xa); - if (event->syncer) { - syncer = event->syncer; - if (atomic_dec_return(&syncer->notback) == 0) - complete(&syncer->done); + syncer = event->syncer; + /* + * Here should keep syncer (a stack variable), so we should + * wakeup the syncer list in the protect of xa lock. + */ + if (syncer) { spin_lock(&syncer->list_lock); - list_del_init(&event->link); + list_del(&event->link); spin_unlock(&syncer->list_lock); + if (atomic_dec_return(&syncer->notback) == 0) { + atomic_cmpxchg(&syncer->res, 0, -EIO); + complete(&syncer->done); + } } - iput(event->object->mfs_inode); - kfree(event); - xa_lock(xa); + put_mfs_event(event); } caches->next_ev = 0; caches->next_msg = 0; diff --git a/fs/mfs/dev.c b/fs/mfs/dev.c index 15b55b257d2f..e957be7f02a7 100644 --- a/fs/mfs/dev.c +++ b/fs/mfs/dev.c @@ -20,23 +20,6 @@ static const struct class mfs_dev_class = { }; static struct device *mfs_dev; -static inline void mfs_finish_event(struct mfs_event *event, struct xa_state *xas) -{ - struct mfs_syncer *syncer = event->syncer; - - if (unlikely(!xas || !event)) - return; - - if (syncer) { - if (xa_cmpxchg(xas->xa, xas->xa_index, event, NULL, 0) != event) - return; - - if (atomic_dec_and_test(&syncer->notback)) - complete(&syncer->done); - put_mfs_event(event); - } -} - static int mfs_dev_open(struct inode *inode, struct file *file) { struct mfs_caches *caches; @@ -105,32 +88,34 @@ static ssize_t mfs_dev_read(struct file *file, char __user *buf, xas_unlock(&xas); return 0; } + if (event->syncer) + get_mfs_event(event); xas_unlock(&xas); msg = &event->msg; n = msg->len; - if (n > blen) - return -EMSGSIZE; + if (n > blen) { + ret = -EMSGSIZE; + goto out; + } ret = try_hook_fd(event); if (ret < 0) - return ret; + goto out; msg->fd = ret; ret = 0; + if (copy_to_user(buf, msg, n)) { + ret = -EFAULT; + goto out; + } xas_lock(&xas); xas_clear_mark(&xas, MFS_EVENT_NEW); caches->next_ev = xas.xa_index + 1; - if (event->syncer) - get_mfs_event(event); - else + if (!event->syncer) xas_store(&xas, NULL); xas_unlock(&xas); - - if (copy_to_user(buf, msg, n)) - ret = -EFAULT; - if (ret) - mfs_finish_event(event, &xas); +out: put_mfs_event(event); trace_mfs_dev_read(file, msg->opcode, msg->id, msg->fd); return ret ? ret : n; -- 2.25.1

From: Hongbo Li <lihongbo22@huawei.com> hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/release-management/issues/ID5W1P ------------------ Fix sparse warning for mfs_dops, mfs_sops and _acquire_set_path. Fixes: 53932975cf07 ("mfs: implement the mount procedure") Signed-off-by: Hongbo Li <lihongbo22@huawei.com> --- fs/mfs/super.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/mfs/super.c b/fs/mfs/super.c index fa096f17e4a7..37dd5ea0bc9d 100644 --- a/fs/mfs/super.c +++ b/fs/mfs/super.c @@ -101,7 +101,7 @@ static void mfs_d_release(struct dentry *dentry) mfs_free_dentry_info(dentry); } -const struct dentry_operations mfs_dops = { +static const struct dentry_operations mfs_dops = { .d_release = mfs_d_release, }; @@ -138,7 +138,7 @@ static int mfs_show_options(struct seq_file *seq, struct dentry *root) return 0; } -const struct super_operations mfs_sops = { +static const struct super_operations mfs_sops = { .alloc_inode = mfs_alloc_inode, .free_inode = mfs_free_inode, .drop_inode = generic_delete_inode, @@ -183,7 +183,7 @@ static char *remove_trailing(char *s, char c) return s; } -char *_acquire_set_path(char *inputpath, struct path *target) +static char *_acquire_set_path(char *inputpath, struct path *target) { char *p, *realp, *path; char *res; -- 2.25.1

From: HuangXiaojia <huangxiaojia2@huawei.com> hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/release-management/issues/ID5W1P ------------------ In mfs_lookup, d_splice_alias is called before mfs_install_path, making dentry of mfs connected to a tree without setting path. When mfs_get_path is called in mfs_open or mfs_lookup, the path could be null pointer. Fixes: 7a24ca94cb48 ("mfs: Add basic data operation for MFS") Signed-off-by: HuangXiaojia <huangxiaojia2@huawei.com> --- fs/mfs/inode.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/fs/mfs/inode.c b/fs/mfs/inode.c index cbbce30db3f6..e45a5da7a67c 100644 --- a/fs/mfs/inode.c +++ b/fs/mfs/inode.c @@ -19,14 +19,12 @@ static int mfs_inode_set(struct inode *inode, void *lower_target) return 0; } -static struct dentry *_mfs_get_inode(struct dentry *dentry, - struct super_block *sb, +static struct inode *_mfs_get_inode(struct super_block *sb, struct path *lower_path, struct path *cache_path) { struct mfs_sb_info *sbi = MFS_SB(sb); - struct inode *inode, *lower_inode, *cache_inode; - struct dentry *ret; + struct inode *ret, *lower_inode, *cache_inode; lower_inode = d_inode(lower_path->dentry); cache_inode = d_inode(cache_path->dentry); @@ -49,12 +47,7 @@ static struct dentry *_mfs_get_inode(struct dentry *dentry, } /* allocate new inode for mfs */ - inode = mfs_iget(sb, lower_inode, cache_path); - if (IS_ERR(inode)) { - ret = ERR_PTR(PTR_ERR(inode)); - goto out; - } - ret = d_splice_alias(inode, dentry); + ret = mfs_iget(sb, lower_inode, cache_path); out: return ret; } @@ -125,6 +118,7 @@ static struct dentry *mfs_lookup(struct inode *dir, struct dentry *dentry, { struct path parent_lpath, parent_cpath, lpath, cpath; struct dentry *ret, *parent; + struct inode *inode; const char *name; int err; @@ -163,14 +157,21 @@ static struct dentry *mfs_lookup(struct inode *dir, struct dentry *dentry, goto cdentry_fail; } /* build the inode from lower layer */ - ret = _mfs_get_inode(dentry, dir->i_sb, &lpath, &cpath); - if (IS_ERR(ret)) { + inode = _mfs_get_inode(dir->i_sb, &lpath, &cpath); + if (IS_ERR(inode)) { path_put(&lpath); path_put(&cpath); mfs_free_dentry_info(dentry); + ret = ERR_PTR(PTR_ERR(inode)); goto out; } mfs_install_path(dentry, &lpath, &cpath); + ret = d_splice_alias(inode, dentry); + if (IS_ERR(ret)) { + path_put(&lpath); + path_put(&cpath); + mfs_free_dentry_info(dentry); + } out: mfs_put_path(&parent_lpath, &parent_cpath); dput(parent); -- 2.25.1

From: Hongbo Li <lihongbo22@huawei.com> hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/release-management/issues/ID5W1P ------------------ In the previous logic, when the umount path will reback -EBUSY if the target device is opened. But it is difficult to control the critical section due to the mount_lock is unable to be accessed. And some testcase will cause the following exeception: ```c mntput_no_expire+0x3a3/0x3c0 mntput+0x28/0x60 mfs_dev_release+0x3e/0x60 [mfs] __fput+0x10f/0x450 ____fput+0x12/0x20 task_work_run+0x9f/0x110 do_exit+0x2d3/0x780 do_group_exit+0x35/0xd0 get_signal+0x9aa/0x9b0 arch_do_signal_or_restart+0x2d/0x180 syscall_exit_to_user_mode+0x207/0x220 do_syscall_64+0x62/0x100 entry_SYSCALL_64_after_hwframe+0x78/0xe2 ``` To solve this issue, we choose to pending when the device is opening. Fixes: 3236f3b541d1 ("mfs: Add communication devie and event acquisition operations") Signed-off-by: Hongbo Li <lihongbo22@huawei.com> --- fs/mfs/dev.c | 10 ---------- fs/mfs/internal.h | 2 -- fs/mfs/super.c | 7 +++++-- 3 files changed, 5 insertions(+), 14 deletions(-) diff --git a/fs/mfs/dev.c b/fs/mfs/dev.c index e957be7f02a7..902f73b1c25c 100644 --- a/fs/mfs/dev.c +++ b/fs/mfs/dev.c @@ -7,7 +7,6 @@ #include <linux/idr.h> #include <linux/poll.h> #include <linux/list.h> -#include "../mount.h" #include <trace/events/mfs.h> @@ -24,7 +23,6 @@ static int mfs_dev_open(struct inode *inode, struct file *file) { struct mfs_caches *caches; struct mfs_sb_info *sbi; - struct mount *mnt; unsigned minor = iminor(inode); sbi = minor < U8_MAX ? idr_find(&mfs_dev_minor, minor) : NULL; @@ -40,13 +38,6 @@ static int mfs_dev_open(struct inode *inode, struct file *file) clear_bit(MFS_CACHE_OPENED, &caches->flags); return -EBUSY; } - mnt = list_first_entry(&sbi->sb->s_mounts, struct mount, mnt_instance); - /* during mounting or delete from s_mounts in umounting */ - if (list_empty(&sbi->sb->s_mounts)) { - clear_bit(MFS_CACHE_OPENED, &caches->flags); - return -EBUSY; - } - sbi->mnt = mntget(&mnt->mnt); file->private_data = sbi; set_bit(MFS_CACHE_READY, &caches->flags); @@ -61,7 +52,6 @@ static int mfs_dev_release(struct inode *inode, struct file *file) clear_bit(MFS_CACHE_READY, &caches->flags); smp_mb__after_atomic(); mfs_cancel_all_events(sbi); - mntput(sbi->mnt); smp_mb__before_atomic(); clear_bit(MFS_CACHE_OPENED, &caches->flags); return 0; diff --git a/fs/mfs/internal.h b/fs/mfs/internal.h index 1e6e1defd862..66c6c0a38c68 100644 --- a/fs/mfs/internal.h +++ b/fs/mfs/internal.h @@ -13,7 +13,6 @@ #include <linux/wait.h> #include <linux/completion.h> #include <linux/types.h> -#include <linux/mount.h> #include <linux/mfs.h> #define MFS_NAME "mfs" @@ -71,7 +70,6 @@ struct mfs_sb_info { int minor; unsigned long flags; - struct vfsmount *mnt; struct super_block *sb; struct mfs_caches caches; diff --git a/fs/mfs/super.c b/fs/mfs/super.c index 614dab54e270..91b1b13b0657 100644 --- a/fs/mfs/super.c +++ b/fs/mfs/super.c @@ -400,9 +400,12 @@ static void mfs_kill_sb(struct super_block *sb) clear_bit(MFS_MOUNTED, &sbi->flags); if (support_event(sbi)) { while (test_bit(MFS_CACHE_OPENED, &caches->flags)) { + static DEFINE_RATELIMIT_STATE(busy_open, 30 * HZ, 1); + msleep(100); - printk_once(KERN_WARNING "Pending until close the /dev/mfs%u...\n", - sbi->minor); + if (!__ratelimit(&busy_open)) + continue; + pr_warn("Pending until close the /dev/mfs%u...\n", sbi->minor); } mfs_fs_dev_exit(sb); } -- 2.25.1

hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/release-management/issues/ID5W1P --------------------------------------- mfs user space tool demostrates how to poll mfs device, read the events, parse the events, process the events according to user mode and trigger the ioctls Signed-off-by: Huang Xiaojia <huangxiaojia2@huawei.com> --- tools/mfs/.gitignore | 2 + tools/mfs/Makefile | 13 +++ tools/mfs/mfsd.c | 186 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 201 insertions(+) create mode 100644 tools/mfs/.gitignore create mode 100644 tools/mfs/Makefile create mode 100644 tools/mfs/mfsd.c diff --git a/tools/mfs/.gitignore b/tools/mfs/.gitignore new file mode 100644 index 000000000000..55428a223113 --- /dev/null +++ b/tools/mfs/.gitignore @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: GPL-2.0-only +mfsd diff --git a/tools/mfs/Makefile b/tools/mfs/Makefile new file mode 100644 index 000000000000..a6e3e970b63e --- /dev/null +++ b/tools/mfs/Makefile @@ -0,0 +1,13 @@ +# SPDX-License-Identifier: GPL-2.0 +# Makefile for mfs demo + +CFLAGS = -Wall -Wextra + +PROGS := mfsd + +all: $(PROGS) +%: %.c + $(CC) $(CFLAGS) -o $@ $^ + +clean: + $(RM) $(PROGS) diff --git a/tools/mfs/mfsd.c b/tools/mfs/mfsd.c new file mode 100644 index 000000000000..865b765c31ed --- /dev/null +++ b/tools/mfs/mfsd.c @@ -0,0 +1,186 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * User-space demo of mfs + * + * Example use: + * ./mfsd [mfs_mountpoint] + * mfsd.c demostrates how to poll mfs device, read the events, + * parse the events, process the events according to user mode + * and trigger the ioctls mfs supported. + * + * See Documentation/filesystems/mfs.rst + */ + +#define _GNU_SOURCE +#include <errno.h> +#include <unistd.h> +#include <fcntl.h> +#include <stdlib.h> +#include <stdio.h> +#include <poll.h> +#include <string.h> +#include <sys/ioctl.h> +#include <sys/statfs.h> + +#include "../../include/uapi/linux/mfs.h" +#include "../../include/uapi/linux/magic.h" + +#define pr_err(fmt, ...) fprintf(stderr, fmt, ##__VA_ARGS__) + +static int mfs_mode = -1; + +static int process_local_read(struct mfs_msg *msg) +{ + struct mfs_read *read = (struct mfs_read *)msg->data; + struct mfs_ioc_ra ra; + int fd = msg->fd; + int ret; + + ra.off = read->off; + ra.len = read->len; + + ret = ioctl(fd, MFS_IOC_RA, &ra); + if (ret) + perror("ioctl MFS_IOC_RA failed"); + + return ret; +} + +static int process_remote_read(struct mfs_msg *msg) +{ + struct mfs_ioc_rpath *rpath; + struct mfs_ioc_done done; + int fd = msg->fd; + int ret; + + rpath = malloc(sizeof(struct mfs_ioc_rpath) + 1024); + + if (!rpath) { + pr_err("malloc for path failed\n"); + return -1; + } + rpath->max = 1024; + ret = ioctl(fd, MFS_IOC_RPATH, (unsigned long)rpath); + if (ret) { + free(rpath); + perror("ioctl failed"); + return -1; + } + free(rpath); + + done.id = msg->id; + done.ret = 0; + ret = ioctl(fd, MFS_IOC_DONE, (unsigned long)&done); + if (ret) + perror("failed to ioctl MFS_IOC_DONE"); + + return ret; +} + +static int process_read(struct mfs_msg *msg) +{ + int ret; + + if (mfs_mode == MFS_MODE_REMOTE) + ret = process_remote_read(msg); + else if (mfs_mode == MFS_MODE_LOCAL) + ret = process_local_read(msg); + else + ret = -EINVAL; + return ret; +} + +static int process_req(int fd) +{ + char buf[1024]; + struct mfs_msg *msg; + int ret; + + memset(buf, 0, sizeof(buf)); + ret = read(fd, buf, sizeof(buf)); + if (ret <= 0) { + if (ret < 0) + pr_err("read failed, ret:%d\n", ret); + return -1; + } + + msg = (void *)buf; + if (ret != msg->len) { + pr_err("invalid message length, read:%d, need:%d\n", ret, msg->len); + return -1; + } + if (msg->opcode == MFS_OP_READ || msg->opcode == MFS_OP_FAULT || + msg->opcode == MFS_OP_FAROUND) { + return process_read(msg); + } + pr_err("invalid opcode:%d\n", msg->opcode); + return -1; +} + +static void ioctl_mfs_mode(int fd) +{ + struct mfs_ioc_fsinfo fsinfo = {0}; + int ret; + + ret = ioctl(fd, MFS_IOC_FSINFO, (unsigned long)&fsinfo); + if (ret < 0) { + perror("failed to ioctl mfs_ioc_fsinfo"); + close(fd); + exit(-1); + } + + mfs_mode = fsinfo.mode; +} + +int main(int argc, char *argv[]) +{ + struct pollfd pfd; + struct statfs buf; + char *mountpoint; + char devname[10]; + int fd, ret; + + if (argc != 2) { + printf("./mfsd ${mfs_mountpoint}\n"); + return -1; + } + mountpoint = argv[1]; + + ret = statfs(mountpoint, &buf); + if (ret) { + pr_err("statfs %s failed\n", mountpoint); + return -1; + } + if (buf.f_type != MFS_SUPER_MAGIC) { + pr_err("fstype(%lx) is invalid, please check the mountpoint\n", buf.f_type); + return -1; + } + + sprintf(devname, "/dev/mfs%ld", buf.f_spare[0]); + fd = open(devname, O_RDWR); + if (fd < 0) { + pr_err("open %s failed\n", devname); + return -1; + } + + ioctl_mfs_mode(fd); + pfd.fd = fd; + pfd.events = POLLIN; + + while (1) { + ret = poll(&pfd, 1, -1); + if (ret < 0) { + pr_err("poll failed\n"); + return -1; + } + + if (ret == 0 || !(pfd.revents & POLLIN)) { + pr_err("poll event error, ret:%d, revents:%x\n", ret, pfd.revents); + continue; + } + + if (process_req(fd) == -1) + pr_err("process req failed, errcode:%d\n", errno); + } + return 0; +} -- 2.25.1