From: Gao Xiang <gaoxiang25@huawei.com> To: Alexander Viro <viro@zeniv.linux.org.uk>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Andrew Morton <akpm@linux-foundation.org>, Stephen Rothwell <sfr@canb.auug.org.au>, Theodore Ts'o <tytso@mit.edu>, David Sterba <dsterba@suse.cz>, Amir Goldstein <amir73il@gmail.com>, Christoph Hellwig <hch@infradead.org>, "Darrick J . Wong" <darrick.wong@oracle.com>, Dave Chinner <david@fromorbit.com>, Jaegeuk Kim <jaegeuk@kernel.org>, Jan Kara <jack@suse.cz>, Linus Torvalds <torvalds@linux-foundation.org> Cc: <linux-fsdevel@vger.kernel.org>, <devel@driverdev.osuosl.org>, LKML <linux-kernel@vger.kernel.org>, <linux-erofs@lists.ozlabs.org>, Chao Yu <yuchao0@huawei.com>, Miao Xie <miaoxie@huawei.com>, Li Guifu <bluce.liguifu@huawei.com>, Fang Wei <fangwei1@huawei.com>, Gao Xiang <gaoxiang25@huawei.com> Subject: [PATCH v5 14/24] erofs: introduce superblock registration Date: Tue, 30 Jul 2019 15:14:03 +0800 [thread overview] Message-ID: <20190730071413.11871-15-gaoxiang25@huawei.com> (raw) In-Reply-To: <20190730071413.11871-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@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 1949677f6ac4..0eef3ee43a76 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 @@ -399,5 +403,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@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
WARNING: multiple messages have this Message-ID (diff)
From: gaoxiang25@huawei.com (Gao Xiang) Subject: [PATCH v5 14/24] erofs: introduce superblock registration Date: Tue, 30 Jul 2019 15:14:03 +0800 [thread overview] Message-ID: <20190730071413.11871-15-gaoxiang25@huawei.com> (raw) In-Reply-To: <20190730071413.11871-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 1949677f6ac4..0eef3ee43a76 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 @@ -399,5 +403,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 other threads:[~2019-07-30 7:15 UTC|newest] Thread overview: 59+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-07-30 7:13 [PATCH v5 00/24] erofs: promote erofs from staging Gao Xiang 2019-07-30 7:13 ` Gao Xiang 2019-07-30 7:13 ` [PATCH v5 01/24] erofs: add on-disk layout Gao Xiang 2019-07-30 7:13 ` Gao Xiang 2019-07-30 7:13 ` [PATCH v5 02/24] erofs: add erofs in-memory stuffs Gao Xiang 2019-07-30 7:13 ` Gao Xiang 2019-07-30 7:13 ` [PATCH v5 03/24] erofs: add super block operations Gao Xiang 2019-07-30 7:13 ` Gao Xiang 2019-07-30 7:13 ` [PATCH v5 04/24] erofs: add raw address_space operations Gao Xiang 2019-07-30 7:13 ` Gao Xiang 2019-07-30 7:13 ` Gao Xiang 2019-07-30 7:13 ` [PATCH v5 05/24] erofs: add inode operations Gao Xiang 2019-07-30 7:13 ` Gao Xiang 2019-07-30 7:13 ` [PATCH v5 06/24] erofs: support special inode Gao Xiang 2019-07-30 7:13 ` Gao Xiang 2019-07-30 7:13 ` [PATCH v5 07/24] erofs: add directory operations Gao Xiang 2019-07-30 7:13 ` Gao Xiang 2019-07-30 7:13 ` [PATCH v5 08/24] erofs: add namei functions Gao Xiang 2019-07-30 7:13 ` Gao Xiang 2019-07-30 7:13 ` [PATCH v5 09/24] erofs: support tracepoint Gao Xiang 2019-07-30 7:13 ` Gao Xiang 2019-07-30 7:13 ` [PATCH v5 10/24] erofs: update Kconfig and Makefile Gao Xiang 2019-07-30 7:13 ` Gao Xiang 2019-07-30 7:14 ` [PATCH v5 11/24] erofs: introduce xattr & posixacl support Gao Xiang 2019-07-30 7:14 ` Gao Xiang 2019-07-30 7:14 ` [PATCH v5 12/24] erofs: introduce tagged pointer Gao Xiang 2019-07-30 7:14 ` Gao Xiang 2019-07-31 13:01 ` Jan Kara 2019-07-31 13:01 ` Jan Kara 2019-07-31 13:20 ` Gao Xiang 2019-07-31 13:20 ` Gao Xiang 2019-07-31 13:30 ` Gao Xiang 2019-07-31 13:30 ` Gao Xiang 2019-07-31 13:52 ` Gao Xiang 2019-07-31 13:52 ` Gao Xiang 2019-07-30 7:14 ` [PATCH v5 13/24] erofs: add compression indexes support Gao Xiang 2019-07-30 7:14 ` Gao Xiang 2019-07-30 7:14 ` Gao Xiang [this message] 2019-07-30 7:14 ` [PATCH v5 14/24] erofs: introduce superblock registration Gao Xiang 2019-07-30 7:14 ` [PATCH v5 15/24] erofs: introduce erofs shrinker Gao Xiang 2019-07-30 7:14 ` Gao Xiang 2019-07-30 7:14 ` [PATCH v5 16/24] erofs: introduce workstation for decompression Gao Xiang 2019-07-30 7:14 ` Gao Xiang 2019-07-30 7:14 ` [PATCH v5 17/24] erofs: introduce per-CPU buffers implementation Gao Xiang 2019-07-30 7:14 ` Gao Xiang 2019-07-30 7:14 ` [PATCH v5 18/24] erofs: introduce pagevec for decompression subsystem Gao Xiang 2019-07-30 7:14 ` Gao Xiang 2019-07-30 7:14 ` [PATCH v5 19/24] erofs: add erofs_allocpage() Gao Xiang 2019-07-30 7:14 ` Gao Xiang 2019-07-30 7:14 ` [PATCH v5 20/24] erofs: introduce generic decompression backend Gao Xiang 2019-07-30 7:14 ` Gao Xiang 2019-07-30 7:14 ` [PATCH v5 21/24] erofs: introduce LZ4 decompression inplace Gao Xiang 2019-07-30 7:14 ` Gao Xiang 2019-07-30 7:14 ` [PATCH v5 22/24] erofs: introduce the decompression frontend Gao Xiang 2019-07-30 7:14 ` Gao Xiang 2019-07-30 7:14 ` [PATCH v5 23/24] erofs: introduce cached decompression Gao Xiang 2019-07-30 7:14 ` Gao Xiang 2019-07-30 7:14 ` [PATCH v5 24/24] erofs: add document Gao Xiang 2019-07-30 7:14 ` Gao Xiang
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=20190730071413.11871-15-gaoxiang25@huawei.com \ --to=gaoxiang25@huawei.com \ --cc=akpm@linux-foundation.org \ --cc=amir73il@gmail.com \ --cc=bluce.liguifu@huawei.com \ --cc=darrick.wong@oracle.com \ --cc=david@fromorbit.com \ --cc=devel@driverdev.osuosl.org \ --cc=dsterba@suse.cz \ --cc=fangwei1@huawei.com \ --cc=gregkh@linuxfoundation.org \ --cc=hch@infradead.org \ --cc=jack@suse.cz \ --cc=jaegeuk@kernel.org \ --cc=linux-erofs@lists.ozlabs.org \ --cc=linux-fsdevel@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=miaoxie@huawei.com \ --cc=sfr@canb.auug.org.au \ --cc=torvalds@linux-foundation.org \ --cc=tytso@mit.edu \ --cc=viro@zeniv.linux.org.uk \ --cc=yuchao0@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: 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.