From: gaoxiang25@huawei.com (Gao Xiang) Subject: [PATCH v6 14/24] erofs: introduce superblock registration Date: Fri, 2 Aug 2019 20:53:37 +0800 Message-ID: <20190802125347.166018-15-gaoxiang25@huawei.com> (raw) In-Reply-To: <20190802125347.166018-1-gaoxiang25@huawei.com> In order to introducing shrinker solution for erofs, let's manage all mounted erofs instances at first. Signed-off-by: Gao Xiang <gaoxiang25 at huawei.com> --- fs/erofs/Makefile | 2 +- fs/erofs/internal.h | 13 +++++++++++++ fs/erofs/super.c | 9 +++++++++ fs/erofs/utils.c | 32 ++++++++++++++++++++++++++++++++ 4 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 fs/erofs/utils.c diff --git a/fs/erofs/Makefile b/fs/erofs/Makefile index 481a966caf06..930770be124f 100644 --- a/fs/erofs/Makefile +++ b/fs/erofs/Makefile @@ -5,7 +5,7 @@ EROFS_VERSION = "1.0" ccflags-y += -DEROFS_VERSION=\"$(EROFS_VERSION)\" obj-$(CONFIG_EROFS_FS) += erofs.o -erofs-objs := super.o inode.o data.o namei.o dir.o +erofs-objs := super.o inode.o data.o namei.o dir.o utils.o erofs-$(CONFIG_EROFS_FS_XATTR) += xattr.o erofs-$(CONFIG_EROFS_FS_ZIP) += zmap.o diff --git a/fs/erofs/internal.h b/fs/erofs/internal.h index d3a703017233..082fa4727c80 100644 --- a/fs/erofs/internal.h +++ b/fs/erofs/internal.h @@ -61,6 +61,10 @@ typedef u64 erofs_off_t; typedef u32 erofs_blk_t; struct erofs_sb_info { +#ifdef CONFIG_EROFS_FS_ZIP + /* list for all registered superblocks, mainly for shrinker */ + struct list_head list; +#endif /* CONFIG_EROFS_FS_ZIP */ u32 blocks; u32 meta_blkaddr; #ifdef CONFIG_EROFS_FS_XATTR @@ -401,5 +405,14 @@ int erofs_namei(struct inode *dir, struct qstr *name, /* dir.c */ extern const struct file_operations erofs_dir_fops; +/* utils.c */ +#ifdef CONFIG_EROFS_FS_ZIP +void erofs_shrinker_register(struct super_block *sb); +void erofs_shrinker_unregister(struct super_block *sb); +#else +static inline void erofs_shrinker_register(struct super_block *sb) {} +static inline void erofs_shrinker_unregister(struct super_block *sb) {} +#endif /* !CONFIG_EROFS_FS_ZIP */ + #endif /* __EROFS_INTERNAL_H */ diff --git a/fs/erofs/super.c b/fs/erofs/super.c index 561ae6f7fe13..2eca3b25db75 100644 --- a/fs/erofs/super.c +++ b/fs/erofs/super.c @@ -354,6 +354,8 @@ static int erofs_fill_super(struct super_block *sb, void *data, int silent) if (unlikely(!sb->s_root)) return -ENOMEM; + erofs_shrinker_register(sb); + if (!silent) infoln("mounted on %s with opts: %s.", sb->s_id, (char *)data); return 0; @@ -385,6 +387,12 @@ static void erofs_kill_sb(struct super_block *sb) sb->s_fs_info = NULL; } +/* called when ->s_root is non-NULL */ +static void erofs_put_super(struct super_block *sb) +{ + erofs_shrinker_unregister(sb); +} + static struct file_system_type erofs_fs_type = { .owner = THIS_MODULE, .name = "erofs", @@ -496,6 +504,7 @@ static int erofs_remount(struct super_block *sb, int *flags, char *data) } const struct super_operations erofs_sops = { + .put_super = erofs_put_super, .alloc_inode = alloc_inode, .free_inode = free_inode, .statfs = erofs_statfs, diff --git a/fs/erofs/utils.c b/fs/erofs/utils.c new file mode 100644 index 000000000000..791b2df1f761 --- /dev/null +++ b/fs/erofs/utils.c @@ -0,0 +1,32 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * linux/fs/erofs/utils.c + * + * Copyright (C) 2018 HUAWEI, Inc. + * http://www.huawei.com/ + * Created by Gao Xiang <gaoxiang25 at huawei.com> + */ +#include "internal.h" + +#ifdef CONFIG_EROFS_FS_ZIP +/* protects the mounted 'erofs_sb_list' */ +static DEFINE_SPINLOCK(erofs_sb_list_lock); +static LIST_HEAD(erofs_sb_list); + +void erofs_shrinker_register(struct super_block *sb) +{ + struct erofs_sb_info *sbi = EROFS_SB(sb); + + spin_lock(&erofs_sb_list_lock); + list_add(&sbi->list, &erofs_sb_list); + spin_unlock(&erofs_sb_list_lock); +} + +void erofs_shrinker_unregister(struct super_block *sb) +{ + spin_lock(&erofs_sb_list_lock); + list_del(&EROFS_SB(sb)->list); + spin_unlock(&erofs_sb_list_lock); +} +#endif /* !CONFIG_EROFS_FS_ZIP */ + -- 2.17.1
next prev parent reply index Thread overview: 159+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-08-02 12:53 [PATCH v6 00/24] erofs: promote erofs from staging Gao Xiang 2019-08-02 12:53 ` [PATCH v6 01/24] erofs: add on-disk layout Gao Xiang 2019-08-29 9:59 ` Christoph Hellwig 2019-08-29 10:32 ` Gao Xiang 2019-08-29 10:36 ` Christoph Hellwig 2019-08-29 10:58 ` Gao Xiang 2019-08-29 15:58 ` Joe Perches 2019-08-29 17:26 ` Gao Xiang 2019-08-30 12:07 ` David Sterba 2019-08-30 12:18 ` Gao Xiang via Linux-erofs 2019-09-02 8:43 ` Pavel Machek 2019-09-02 14:07 ` David Sterba 2019-09-03 11:27 ` Pavel Machek 2019-08-29 15:41 ` Gao Xiang 2019-09-01 7:54 ` Gao Xiang via Linux-erofs 2019-09-02 12:45 ` Christoph Hellwig 2019-09-02 13:02 ` Gao Xiang 2019-09-02 8:40 ` Pavel Machek 2019-09-02 10:35 ` Gao Xiang 2019-08-02 12:53 ` [PATCH v6 02/24] erofs: add erofs in-memory stuffs Gao Xiang 2019-08-02 12:53 ` [PATCH v6 03/24] erofs: add super block operations Gao Xiang 2019-08-29 10:15 ` Christoph Hellwig 2019-08-29 10:50 ` Gao Xiang 2019-08-30 16:39 ` Christoph Hellwig 2019-08-30 17:15 ` Gao Xiang 2019-08-31 0:54 ` Gao Xiang 2019-08-31 6:34 ` Amir Goldstein 2019-08-31 6:48 ` Gao Xiang 2019-09-01 8:54 ` Gao Xiang via Linux-erofs 2019-09-02 12:51 ` Christoph Hellwig 2019-09-02 14:43 ` Gao Xiang 2019-09-02 15:19 ` Christoph Hellwig 2019-09-02 15:24 ` Gao Xiang 2019-08-02 12:53 ` [PATCH v6 04/24] erofs: add raw address_space operations Gao Xiang 2019-08-29 10:17 ` Christoph Hellwig 2019-08-29 11:46 ` Gao Xiang 2019-08-30 16:40 ` Christoph Hellwig 2019-08-30 17:23 ` Gao Xiang 2019-08-02 12:53 ` [PATCH v6 05/24] erofs: add inode operations Gao Xiang 2019-08-29 10:24 ` Christoph Hellwig 2019-08-29 11:59 ` Gao Xiang 2019-08-30 16:42 ` Christoph Hellwig 2019-08-30 18:46 ` Gao Xiang 2019-09-01 9:34 ` Gao Xiang via Linux-erofs 2019-09-02 12:53 ` Christoph Hellwig 2019-09-02 13:43 ` David Sterba 2019-09-02 13:55 ` Gao Xiang 2019-08-02 12:53 ` [PATCH v6 06/24] erofs: support special inode Gao Xiang 2019-08-29 10:25 ` Christoph Hellwig 2019-09-01 9:39 ` Gao Xiang via Linux-erofs 2019-08-02 12:53 ` [PATCH v6 07/24] erofs: add directory operations Gao Xiang 2019-08-02 12:53 ` [PATCH v6 08/24] erofs: add namei functions Gao Xiang 2019-08-29 10:28 ` Christoph Hellwig 2019-08-29 11:28 ` Gao Xiang 2019-08-02 12:53 ` [PATCH v6 09/24] erofs: support tracepoint Gao Xiang 2019-08-02 12:53 ` [PATCH v6 10/24] erofs: update Kconfig and Makefile Gao Xiang 2019-08-02 12:53 ` [PATCH v6 11/24] erofs: introduce xattr & posixacl support Gao Xiang 2019-08-02 12:53 ` [PATCH v6 12/24] erofs: introduce tagged pointer Gao Xiang 2019-08-02 12:53 ` [PATCH v6 13/24] erofs: add compression indexes support Gao Xiang 2019-08-02 12:53 ` Gao Xiang [this message] 2019-08-02 12:53 ` [PATCH v6 15/24] erofs: introduce erofs shrinker Gao Xiang 2019-08-02 12:53 ` [PATCH v6 16/24] erofs: introduce workstation for decompression Gao Xiang 2019-08-02 12:53 ` [PATCH v6 17/24] erofs: introduce per-CPU buffers implementation Gao Xiang 2019-08-02 12:53 ` [PATCH v6 18/24] erofs: introduce pagevec for decompression subsystem Gao Xiang 2019-08-02 12:53 ` [PATCH v6 19/24] erofs: add erofs_allocpage() Gao Xiang 2019-08-02 12:53 ` [PATCH v6 20/24] erofs: introduce generic decompression backend Gao Xiang 2019-08-02 12:53 ` [PATCH v6 21/24] erofs: introduce LZ4 decompression inplace Gao Xiang 2019-08-02 12:53 ` [PATCH v6 22/24] erofs: introduce the decompression frontend Gao Xiang 2019-08-02 12:53 ` [PATCH v6 23/24] erofs: introduce cached decompression Gao Xiang 2019-08-02 12:53 ` [PATCH v6 24/24] erofs: add document Gao Xiang 2019-09-01 5:51 ` [PATCH 00/21] erofs: patchset addressing Christoph's comments Gao Xiang via Linux-erofs 2019-09-01 5:51 ` [PATCH 01/21] erofs: remove all the byte offset comments Gao Xiang via Linux-erofs 2019-09-02 12:05 ` Christoph Hellwig 2019-09-01 5:51 ` [PATCH 02/21] erofs: on-disk format should have explicitly assigned numbers Gao Xiang via Linux-erofs 2019-09-02 12:05 ` Christoph Hellwig 2019-09-01 5:51 ` [PATCH 03/21] erofs: some macros are much more readable as a function Gao Xiang via Linux-erofs 2019-09-02 12:06 ` Christoph Hellwig 2019-09-01 5:51 ` [PATCH 04/21] erofs: kill __packed for on-disk structures Gao Xiang via Linux-erofs 2019-09-02 12:06 ` Christoph Hellwig 2019-09-01 5:51 ` [PATCH 05/21] erofs: update erofs_inode_is_data_compressed helper Gao Xiang via Linux-erofs 2019-09-02 12:07 ` Christoph Hellwig 2019-09-01 5:51 ` [PATCH 06/21] erofs: kill erofs_{init,exit}_inode_cache Gao Xiang via Linux-erofs 2019-09-02 12:09 ` Christoph Hellwig 2019-09-01 5:51 ` [PATCH 07/21] erofs: use erofs_inode naming Gao Xiang via Linux-erofs 2019-09-02 12:10 ` Christoph Hellwig 2019-09-02 12:13 ` Gao Xiang 2019-09-02 12:47 ` Christoph Hellwig 2019-09-02 13:33 ` Gao Xiang 2019-09-01 5:51 ` [PATCH 08/21] erofs: update comments in inode.c Gao Xiang via Linux-erofs 2019-09-01 5:51 ` [PATCH 09/21] erofs: update erofs symlink stuffs Gao Xiang via Linux-erofs 2019-09-02 12:11 ` Christoph Hellwig 2019-09-01 5:51 ` [PATCH 10/21] erofs: kill is_inode_layout_compression() Gao Xiang via Linux-erofs 2019-09-02 12:11 ` Christoph Hellwig 2019-09-01 5:51 ` [PATCH 11/21] erofs: use dsb instead of layout for ondisk super_block Gao Xiang via Linux-erofs 2019-09-02 12:12 ` Christoph Hellwig 2019-09-02 12:15 ` Gao Xiang 2019-09-01 5:51 ` [PATCH 12/21] erofs: kill verbose debug info in erofs_fill_super Gao Xiang via Linux-erofs 2019-09-02 12:14 ` Christoph Hellwig 2019-09-02 12:18 ` Gao Xiang 2019-09-01 5:51 ` [PATCH 13/21] erofs: simplify erofs_grab_bio() since bio_alloc() never fail Gao Xiang via Linux-erofs 2019-09-02 12:20 ` Christoph Hellwig 2019-09-01 5:51 ` [PATCH 14/21] erofs: kill prio and nofail of erofs_get_meta_page() Gao Xiang via Linux-erofs 2019-09-02 12:21 ` Christoph Hellwig 2019-09-01 5:51 ` [PATCH 15/21] erofs: kill __submit_bio() Gao Xiang via Linux-erofs 2019-09-01 5:51 ` [PATCH 16/21] erofs: kill magic underscores Gao Xiang via Linux-erofs 2019-09-02 12:26 ` Christoph Hellwig 2019-09-02 12:39 ` Gao Xiang 2019-09-02 12:54 ` Christoph Hellwig 2019-09-02 13:38 ` Gao Xiang 2019-09-01 5:51 ` [PATCH 17/21] erofs: use a switch statement when dealing with the file modes Gao Xiang via Linux-erofs 2019-09-02 12:27 ` Christoph Hellwig 2019-09-01 5:51 ` [PATCH 18/21] erofs: add "erofs_" prefix for common and short functions Gao Xiang via Linux-erofs 2019-09-02 12:28 ` Christoph Hellwig 2019-09-01 5:51 ` [PATCH 19/21] erofs: kill all erofs specific fault injection Gao Xiang via Linux-erofs 2019-09-02 12:28 ` Christoph Hellwig 2019-09-01 5:51 ` [PATCH 20/21] erofs: kill use_vmap module parameter Gao Xiang via Linux-erofs 2019-09-02 12:31 ` Christoph Hellwig 2019-09-02 12:43 ` Gao Xiang 2019-09-01 5:51 ` [PATCH 21/21] erofs: save one level of indentation Gao Xiang via Linux-erofs 2019-09-02 12:31 ` Christoph Hellwig 2019-09-02 12:46 ` [PATCH 00/21] erofs: patchset addressing Christoph's comments Christoph Hellwig 2019-09-02 14:24 ` Gao Xiang 2019-09-02 15:23 ` Christoph Hellwig 2019-09-02 15:50 ` Gao Xiang 2019-09-03 6:58 ` Christoph Hellwig 2019-09-03 8:17 ` Gao Xiang 2019-09-03 15:37 ` Christoph Hellwig 2019-09-03 15:43 ` Gao Xiang via Linux-erofs 2019-09-04 2:08 ` [PATCH v2 00/25] " Gao Xiang 2019-09-04 2:08 ` [PATCH v2 01/25] erofs: remove all the byte offset comments Gao Xiang 2019-09-04 2:08 ` [PATCH v2 02/25] erofs: on-disk format should have explicitly assigned numbers Gao Xiang 2019-09-04 2:08 ` [PATCH v2 03/25] erofs: some macros are much more readable as a function Gao Xiang 2019-09-04 2:08 ` [PATCH v2 04/25] erofs: kill __packed for on-disk structures Gao Xiang 2019-09-04 2:08 ` [PATCH v2 05/25] erofs: update erofs_inode_is_data_compressed helper Gao Xiang 2019-09-04 2:08 ` [PATCH v2 06/25] erofs: use feature_incompat rather than requirements Gao Xiang 2019-09-04 2:08 ` [PATCH v2 07/25] erofs: better naming for erofs inode related stuffs Gao Xiang 2019-09-04 2:08 ` [PATCH v2 08/25] erofs: kill erofs_{init,exit}_inode_cache Gao Xiang 2019-09-04 2:08 ` [PATCH v2 09/25] erofs: use erofs_inode naming Gao Xiang 2019-09-04 2:08 ` [PATCH v2 10/25] erofs: update erofs_fs.h comments Gao Xiang 2019-09-04 2:08 ` [PATCH v2 11/25] erofs: update comments in inode.c Gao Xiang 2019-09-04 2:08 ` [PATCH v2 12/25] erofs: better erofs symlink stuffs Gao Xiang 2019-09-04 2:09 ` [PATCH v2 13/25] erofs: use dsb instead of layout for ondisk super_block Gao Xiang 2019-09-04 2:09 ` [PATCH v2 14/25] erofs: kill verbose debug info in erofs_fill_super Gao Xiang 2019-09-04 2:09 ` [PATCH v2 15/25] erofs: localize erofs_grab_bio() Gao Xiang 2019-09-04 2:09 ` [PATCH v2 16/25] erofs: kill prio and nofail of erofs_get_meta_page() Gao Xiang 2019-09-04 2:09 ` [PATCH v2 17/25] erofs: kill __submit_bio() Gao Xiang 2019-09-04 2:09 ` [PATCH v2 18/25] erofs: add "erofs_" prefix for common and short functions Gao Xiang 2019-09-04 2:09 ` [PATCH v2 19/25] erofs: kill all erofs specific fault injection Gao Xiang 2019-09-04 2:09 ` [PATCH v2 20/25] erofs: kill use_vmap module parameter Gao Xiang 2019-09-04 2:09 ` [PATCH v2 21/25] erofs: save one level of indentation Gao Xiang 2019-09-04 2:09 ` [PATCH v2 22/25] erofs: rename errln/infoln/debugln to erofs_{err, info, dbg} Gao Xiang 2019-09-04 2:09 ` [PATCH v2 23/25] erofs: use read_mapping_page instead of sb_bread Gao Xiang 2019-09-04 2:09 ` [PATCH v2 24/25] erofs: always use iget5_locked Gao Xiang 2019-09-04 2:09 ` [PATCH v2 25/25] erofs: use read_cache_page_gfp for erofs_get_meta_page Gao Xiang 2019-09-04 3:27 ` [PATCH v2 00/25] erofs: patchset addressing Christoph's comments Chao Yu 2019-09-05 1:03 ` Gao Xiang via Linux-erofs 2019-09-05 11:30 ` Christoph Hellwig 2019-09-04 5:16 ` Christoph Hellwig 2019-09-04 6:08 ` Gao Xiang via Linux-erofs
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=20190802125347.166018-15-gaoxiang25@huawei.com \ --to=gaoxiang25@huawei.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
Linux-EROFS Archive on lore.kernel.org Archives are clonable: git clone --mirror https://lore.kernel.org/linux-erofs/0 linux-erofs/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 linux-erofs linux-erofs/ https://lore.kernel.org/linux-erofs \ linux-erofs@lists.ozlabs.org linux-erofs@ozlabs.org public-inbox-index linux-erofs Example config snippet for mirrors Newsgroup available over NNTP: nntp://nntp.lore.kernel.org/org.ozlabs.lists.linux-erofs AGPL code for this site: git clone https://public-inbox.org/public-inbox.git