From: Jan Kara <jack@suse.cz>
To: Eric Sandeen <sandeen@redhat.com>
Cc: fsdevel <linux-fsdevel@vger.kernel.org>, Jan Kara <jack@suse.cz>,
Al Viro <viro@zeniv.linux.org.uk>, Eric Paris <eparis@redhat.com>
Subject: Re: [PATCH 2/1] fs: call fsnotify_sb_delete after evict_inodes
Date: Thu, 17 Oct 2019 10:39:26 +0200 [thread overview]
Message-ID: <20191017083926.GD20260@quack2.suse.cz> (raw)
In-Reply-To: <e71d3fbf-8b12-a650-e622-76bc9d4d6a98@redhat.com>
On Wed 16-10-19 12:11:24, Eric Sandeen wrote:
> When a filesystem is unmounted, we currently call fsnotify_sb_delete()
> before evict_inodes(), which means that fsnotify_unmount_inodes()
> must iterate over all inodes on the superblock, even though it will
> only act on inodes with a refcount. This is inefficient and can lead
> to livelocks as it iterates over many unrefcounted inodes.
>
> However, since fsnotify_sb_delete() and evict_inodes() are working
> on orthogonal sets of inodes (fsnotify_sb_delete() only cares about nonzero
> refcount, and evict_inodes() only cares about zero refcount), we can swap
> the order of the calls. The fsnotify call will then have a much smaller
> list to walk (any refcounted inodes).
>
> This should speed things up overall, and avoid livelocks in
> fsnotify_unmount_inodes().
>
> Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Thanks for the patch. It looks good to me. Feel free to add:
Reviewed-by: Jan Kara <jack@suse.cz>
> ---
>
> I just did basic sanity testing here, but AFAIK there is no *notify
> test suite, so I'm not sure how to really give this a workout.
LTP has quite a few tests for inotify & fanotify.
Honza
> diff --git a/fs/notify/fsnotify.c b/fs/notify/fsnotify.c
> index ac9eb273e28c..426f03b6e660 100644
> --- a/fs/notify/fsnotify.c
> +++ b/fs/notify/fsnotify.c
> @@ -57,6 +57,10 @@ static void fsnotify_unmount_inodes(struct super_block *sb)
> * doing an __iget/iput with SB_ACTIVE clear would actually
> * evict all inodes with zero i_count from icache which is
> * unnecessarily violent and may in fact be illegal to do.
> + *
> + * However, we should have been called /after/ evict_inodes
> + * removed all zero refcount inodes, in any case. Test to
> + * be sure.
> */
> if (!atomic_read(&inode->i_count)) {
> spin_unlock(&inode->i_lock);
> diff --git a/fs/super.c b/fs/super.c
> index cfadab2cbf35..cd352530eca9 100644
> --- a/fs/super.c
> +++ b/fs/super.c
> @@ -448,10 +448,12 @@ void generic_shutdown_super(struct super_block *sb)
> sync_filesystem(sb);
> sb->s_flags &= ~SB_ACTIVE;
>
> - fsnotify_sb_delete(sb);
> cgroup_writeback_umount();
>
> + /* evict all inodes with zero refcount */
> evict_inodes(sb);
> + /* only nonzero refcount inodes can have marks */
> + fsnotify_sb_delete(sb);
>
> if (sb->s_dio_done_wq) {
> destroy_workqueue(sb->s_dio_done_wq);
>
>
--
Jan Kara <jack@suse.com>
SUSE Labs, CR
prev parent reply other threads:[~2019-10-17 8:39 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-14 21:30 [PATCH V2] fs: avoid softlockups in s_inodes iterators Eric Sandeen
2019-10-14 21:36 ` Eric Sandeen
2019-10-15 7:37 ` Jan Kara
2019-10-16 2:36 ` Eric Sandeen
2019-10-16 9:42 ` Jan Kara
2019-10-16 13:23 ` Eric Sandeen
2019-10-16 13:49 ` Jan Kara
2019-10-16 14:39 ` Eric Sandeen
2019-10-16 15:26 ` Eric Sandeen
2019-10-16 15:35 ` Jan Kara
2019-10-16 17:11 ` [PATCH 2/1] fs: call fsnotify_sb_delete after evict_inodes Eric Sandeen
2019-10-17 8:39 ` Jan Kara [this message]
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=20191017083926.GD20260@quack2.suse.cz \
--to=jack@suse.cz \
--cc=eparis@redhat.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=sandeen@redhat.com \
--cc=viro@zeniv.linux.org.uk \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).