[PATCH 1/2] erofs: simplify instantiation of pseudo mount in fscache mode

Jingbo Xu
2023-02-03T03:47:33Z

Introduce a pseudo fs type dedicated to the pseudo mount of fscache
mode, so that the logic of real mount won't be messed up with that of
pseudo mount, making the implementation of fscache mode more
self-contained.

Signed-off-by: Jingbo Xu <jefflexu@linux.alibaba.com>
---
fs/erofs/fscache.c | 46 +++++++++++++++++++++++++++------------------
fs/erofs/internal.h | 6 ++++++
fs/erofs/super.c | 35 +++++++---------------------------
3 files changed, 41 insertions(+), 46 deletions(-)

diff --git a/fs/erofs/fscache.c b/fs/erofs/fscache.c
index af6ba52bbe8b..2eb42bbc56a4 100644
--- a/fs/erofs/fscache.c
+++ b/fs/erofs/fscache.c
@@ -6,12 +6,13 @@
#include <linux/fscache.h>
#include <linux/file.h>
#include <linux/anon_inodes.h>
+#include <linux/pseudo_fs.h>
#include "internal.h"

static DEFINE_MUTEX(erofs_domain_list_lock);
static DEFINE_MUTEX(erofs_domain_cookies_lock);
static LIST_HEAD(erofs_domain_list);
-static struct vfsmount *erofs_pseudo_mnt;
+static struct vfsmount *erofs_pseudo_mnt __read_mostly;

struct erofs_fscache_request {
struct erofs_fscache_request *primary;
@@ -471,10 +472,6 @@ static void erofs_fscache_domain_put(struct erofs_domain *domain)
mutex_lock(&erofs_domain_list_lock);
if (refcount_dec_and_test(&domain->ref)) {
list_del(&domain->list);
- if (list_empty(&erofs_domain_list)) {
- kern_unmount(erofs_pseudo_mnt);
- erofs_pseudo_mnt = NULL;
- }
mutex_unlock(&erofs_domain_list_lock);
fscache_relinquish_volume(domain->volume, NULL, false);
kfree(domain->domain_id);
@@ -526,15 +523,10 @@ static int erofs_fscache_init_domain(struct super_block *sb)
}

err = erofs_fscache_register_volume(sb);
- if (err)
- goto out;
-
- if (!erofs_pseudo_mnt) {
- erofs_pseudo_mnt = kern_mount(&erofs_fs_type);
- if (IS_ERR(erofs_pseudo_mnt)) {
- err = PTR_ERR(erofs_pseudo_mnt);
- goto out;
- }
+ if (err) {
+ kfree(domain->domain_id);
+ kfree(domain);
+ return err;
}

domain->volume = sbi->volume;
@@ -542,10 +534,6 @@ static int erofs_fscache_init_domain(struct super_block *sb)
list_add(&domain->list, &erofs_domain_list);
sbi->domain = domain;
return 0;
-out:
- kfree(domain->domain_id);
- kfree(domain);
- return err;
}

static int erofs_fscache_register_domain(struct super_block *sb)
@@ -780,3 +768,25 @@ void erofs_fscache_unregister_fs(struct super_block *sb)
sbi->volume = NULL;
sbi->domain = NULL;
}
+
+static int erofs_fc_anon_get_tree(struct fs_context *fc)
+{
+ return PTR_ERR_OR_ZERO(init_pseudo(fc, EROFS_SUPER_MAGIC));
+}
+
+int __init erofs_fscache_init(void)
+{
+ static struct file_system_type erofs_anon_fs = {
+ .name = "erofs_anonfs",
+ .init_fs_context = erofs_fc_anon_get_tree,
+ .kill_sb = kill_anon_super,
+ };
+
+ erofs_pseudo_mnt = kern_mount(&erofs_anon_fs);
+ return PTR_ERR_OR_ZERO(erofs_pseudo_mnt);
+}
+
+void erofs_fscache_exit(void)
+{
+ kern_unmount(erofs_pseudo_mnt);
+}
diff --git a/fs/erofs/internal.h b/fs/erofs/internal.h
index c3ac6d613eb1..6080e382ed7e 100644
--- a/fs/erofs/internal.h
+++ b/fs/erofs/internal.h
@@ -634,6 +634,9 @@ static inline int z_erofs_load_lzma_config(struct super_block *sb,

/* fscache.c */
#ifdef CONFIG_EROFS_FS_ONDEMAND
+int __init erofs_fscache_init(void);
+void erofs_fscache_exit(void);
+
int erofs_fscache_register_fs(struct super_block *sb);
void erofs_fscache_unregister_fs(struct super_block *sb);

@@ -645,6 +648,9 @@ void erofs_fscache_unregister_cookie(struct erofs_fscache *fscache);
extern const struct address_space_operations erofs_fscache_access_aops;
extern const struct file_operations erofs_fscache_share_file_fops;
#else
+static inline int erofs_fscache_init(void) { return 0; }
+static inline void erofs_fscache_exit(void) {}
+
static inline int erofs_fscache_register_fs(struct super_block *sb)
{
return -EOPNOTSUPP;
diff --git a/fs/erofs/super.c b/fs/erofs/super.c
index 81aa63f34047..b06d29beed4e 100644
--- a/fs/erofs/super.c
+++ b/fs/erofs/super.c
@@ -712,13 +712,6 @@ static const struct export_operations erofs_export_ops = {
.get_parent = erofs_get_parent,
};

-static int erofs_fc_fill_pseudo_super(struct super_block *sb, struct fs_context *fc)
-{
- static const struct tree_descr empty_descr = {""};
-
- return simple_fill_super(sb, EROFS_SUPER_MAGIC, &empty_descr);
-}
-
static int erofs_fc_fill_super(struct super_block *sb, struct fs_context *fc)
{
struct inode *inode;
@@ -822,11 +815,6 @@ static int erofs_fc_fill_super(struct super_block *sb, struct fs_context *fc)
return 0;
}

-static int erofs_fc_anon_get_tree(struct fs_context *fc)
-{
- return get_tree_nodev(fc, erofs_fc_fill_pseudo_super);
-}
-
static int erofs_fc_get_tree(struct fs_context *fc)
{
struct erofs_fs_context *ctx = fc->fs_private;
@@ -899,20 +887,10 @@ static const struct fs_context_operations erofs_context_ops = {
.free = erofs_fc_free,
};

-static const struct fs_context_operations erofs_anon_context_ops = {
- .get_tree = erofs_fc_anon_get_tree,
-};
-
static int erofs_init_fs_context(struct fs_context *fc)
{
struct erofs_fs_context *ctx;

- /* pseudo mount for anon inodes */
- if (fc->sb_flags & SB_KERNMOUNT) {
- fc->ops = &erofs_anon_context_ops;
- return 0;
- }
-
ctx = kzalloc(sizeof(*ctx), GFP_KERNEL);
if (!ctx)
return -ENOMEM;
@@ -940,12 +918,6 @@ static void erofs_kill_sb(struct super_block *sb)

WARN_ON(sb->s_magic != EROFS_SUPER_MAGIC);

- /* pseudo mount for anon inodes */
- if (sb->s_flags & SB_KERNMOUNT) {
- kill_anon_super(sb);
- return;
- }
-
if (erofs_is_fscache_mode(sb))
kill_anon_super(sb);
else
@@ -1021,6 +993,10 @@ static int __init erofs_module_init(void)
if (err)
goto zip_err;

+ err = erofs_fscache_init();
+ if (err)
+ goto fscache_err;
+
err = erofs_init_sysfs();
if (err)
goto sysfs_err;
@@ -1034,6 +1010,8 @@ static int __init erofs_module_init(void)
fs_err:
erofs_exit_sysfs();
sysfs_err:
+ erofs_fscache_exit();
+fscache_err:
z_erofs_exit_zip_subsystem();
zip_err:
z_erofs_lzma_exit();
@@ -1053,6 +1031,7 @@ static void __exit erofs_module_exit(void)
rcu_barrier();

erofs_exit_sysfs();
+ erofs_fscache_exit();
z_erofs_exit_zip_subsystem();
z_erofs_lzma_exit();
erofs_exit_shrinker();
--
2.19.1.6.gb485710b