From: "Darrick J. Wong" <djwong@kernel.org>
To: Dave Chinner <david@fromorbit.com>
Cc: linux-xfs@vger.kernel.org, chris@onthe.net.au
Subject: Re: [PATCH 2/2] xfs: introduce xfs_inodegc_push()
Date: Tue, 24 May 2022 09:17:25 -0700 [thread overview]
Message-ID: <Yo0FFWYECpIdKyZC@magnolia> (raw)
In-Reply-To: <20220524063802.1938505-3-david@fromorbit.com>
On Tue, May 24, 2022 at 04:38:02PM +1000, Dave Chinner wrote:
> From: Dave Chinner <dchinner@redhat.com>
>
> The current blocking mechanism for pushing the inodegc queue out to
> disk can result in systems becoming unusable when there is a long
> running inodegc operation. This is because the statfs()
> implementation currently issues a blocking flush of the inodegc
> queue and a significant number of common system utilities will call
> statfs() to discover something about the underlying filesystem.
>
> This can result in userspace operations getting stuck on inodegc
> progress, and when trying to remove a heavily reflinked file on slow
> storage with a full journal, this can result in delays measuring in
> hours.
>
> Avoid this problem by adding "push" function that expedites the
> flushing of the inodegc queue, but doesn't wait for it to complete.
>
> Convert xfs_fs_statfs() to use this mechanism so it doesn't block
> but it does ensure that queued operations are expedited.
>
> Fixes: ab23a7768739 ("xfs: per-cpu deferred inode inactivation queues")
> Reported-by: Chris Dunlop <chris@onthe.net.au>
> Signed-off-by: Dave Chinner <dchinner@redhat.com>
> ---
> fs/xfs/xfs_icache.c | 20 +++++++++++++++-----
> fs/xfs/xfs_icache.h | 1 +
> fs/xfs/xfs_super.c | 7 +++++--
> fs/xfs/xfs_trace.h | 1 +
> 4 files changed, 22 insertions(+), 7 deletions(-)
>
> diff --git a/fs/xfs/xfs_icache.c b/fs/xfs/xfs_icache.c
> index 786702273621..2609825d53ee 100644
> --- a/fs/xfs/xfs_icache.c
> +++ b/fs/xfs/xfs_icache.c
> @@ -1862,19 +1862,29 @@ xfs_inodegc_worker(
> }
>
> /*
> - * Force all currently queued inode inactivation work to run immediately and
> - * wait for the work to finish.
> + * Expedite all pending inodegc work to run immediately. This does not wait for
> + * completion of the work.
> */
> void
> -xfs_inodegc_flush(
> +xfs_inodegc_push(
> struct xfs_mount *mp)
> {
> if (!xfs_is_inodegc_enabled(mp))
> return;
> + trace_xfs_inodegc_push(mp, __return_address);
> + xfs_inodegc_queue_all(mp);
> +}
>
> +/*
> + * Force all currently queued inode inactivation work to run immediately and
> + * wait for the work to finish.
> + */
> +void
> +xfs_inodegc_flush(
> + struct xfs_mount *mp)
> +{
> + xfs_inodegc_push(mp);
> trace_xfs_inodegc_flush(mp, __return_address);
> -
> - xfs_inodegc_queue_all(mp);
> flush_workqueue(mp->m_inodegc_wq);
> }
>
> diff --git a/fs/xfs/xfs_icache.h b/fs/xfs/xfs_icache.h
> index 2e4cfddf8b8e..6cd180721659 100644
> --- a/fs/xfs/xfs_icache.h
> +++ b/fs/xfs/xfs_icache.h
> @@ -76,6 +76,7 @@ void xfs_blockgc_stop(struct xfs_mount *mp);
> void xfs_blockgc_start(struct xfs_mount *mp);
>
> void xfs_inodegc_worker(struct work_struct *work);
> +void xfs_inodegc_push(struct xfs_mount *mp);
> void xfs_inodegc_flush(struct xfs_mount *mp);
> void xfs_inodegc_stop(struct xfs_mount *mp);
> void xfs_inodegc_start(struct xfs_mount *mp);
> diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
> index 62f6b97355a2..e14101813851 100644
> --- a/fs/xfs/xfs_super.c
> +++ b/fs/xfs/xfs_super.c
> @@ -796,8 +796,11 @@ xfs_fs_statfs(
> xfs_extlen_t lsize;
> int64_t ffree;
>
> - /* Wait for whatever inactivations are in progress. */
> - xfs_inodegc_flush(mp);
> + /*
> + * Expedite background inodegc but don't wait. We do not want to block
> + * here waiting hours for a billion extent file to be truncated.
> + */
> + xfs_inodegc_push(mp);
I think the same "don't wait forever for inodegc during a stats call"
logic applies to the _inodegc_flush calls in xfs_qm_scall_getquota*,
wouldn't it?
The logic in this patch looks solid otherwise.
--D
>
> statp->f_type = XFS_SUPER_MAGIC;
> statp->f_namelen = MAXNAMELEN - 1;
> diff --git a/fs/xfs/xfs_trace.h b/fs/xfs/xfs_trace.h
> index d32026585c1b..0fa1b7a2918c 100644
> --- a/fs/xfs/xfs_trace.h
> +++ b/fs/xfs/xfs_trace.h
> @@ -240,6 +240,7 @@ DEFINE_EVENT(xfs_fs_class, name, \
> TP_PROTO(struct xfs_mount *mp, void *caller_ip), \
> TP_ARGS(mp, caller_ip))
> DEFINE_FS_EVENT(xfs_inodegc_flush);
> +DEFINE_FS_EVENT(xfs_inodegc_push);
> DEFINE_FS_EVENT(xfs_inodegc_start);
> DEFINE_FS_EVENT(xfs_inodegc_stop);
> DEFINE_FS_EVENT(xfs_inodegc_queue);
> --
> 2.35.1
>
next prev parent reply other threads:[~2022-05-24 16:17 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-24 6:38 [RFC PATCH 0/2] xfs: non-blocking inodegc pushes Dave Chinner
2022-05-24 6:38 ` [PATCH 1/2] xfs: bound maximum wait time for inodegc work Dave Chinner
2022-05-24 16:54 ` Darrick J. Wong
2022-05-24 23:03 ` Dave Chinner
2022-05-26 9:05 ` [xfs] 55a3d6bbc5: aim7.jobs-per-min 19.8% improvement kernel test robot
2022-05-27 9:12 ` [xfs] 55a3d6bbc5: BUG:KASAN:use-after-free_in_xfs_attr3_node_inactive[xfs] kernel test robot
2022-05-24 6:38 ` [PATCH 2/2] xfs: introduce xfs_inodegc_push() Dave Chinner
2022-05-24 10:47 ` Amir Goldstein
2022-05-24 16:14 ` Darrick J. Wong
2022-05-24 18:05 ` Amir Goldstein
2022-05-24 23:17 ` Dave Chinner
2022-05-24 16:17 ` Darrick J. Wong [this message]
2022-05-24 23:07 ` Dave Chinner
2022-05-26 3:00 ` [xfs] 1e3a7e46a4: stress-ng.rename.ops_per_sec 248.5% improvement kernel test robot
-- strict thread matches above, loose matches on Subject: below --
2022-06-15 22:04 [PATCH 0/2 V2] xfs: xfs: non-blocking inodegc pushes Dave Chinner
2022-06-15 22:04 ` [PATCH 2/2] xfs: introduce xfs_inodegc_push() Dave Chinner
2022-06-22 5:21 ` Darrick J. Wong
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=Yo0FFWYECpIdKyZC@magnolia \
--to=djwong@kernel.org \
--cc=chris@onthe.net.au \
--cc=david@fromorbit.com \
--cc=linux-xfs@vger.kernel.org \
/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).