On Fri, Nov 01, 2019 at 10:46:11AM +1100, Dave Chinner wrote:
> From: Dave Chinner <dchinner@xxxxxxxxxx>
>
> Inode reclaim currently issues it's own inode IO when it comes
> across dirty inodes. This is used to throttle direct reclaim down to
> the rate at which we can reclaim dirty inodes. Failure to throttle
> in this manner results in the OOM killer being trivial to trigger
> even when there is lots of free memory available.
>
> However, having direct reclaimers issue IO causes an amount of
> IO thrashing to occur. We can have up to the number of AGs in the
> filesystem concurrently issuing IO, plus the AIL pushing thread as
> well. This means we can many competing sources of IO and they all
> end up thrashing and competing for the request slots in the block
> device.
>
> Similar to dirty page throttling and the BDI flusher thread, we can
> use the AIL pushing thread the sole place we issue inode writeback
> from and everything else waits for it to make progress. To do this,
> reclaim will skip over dirty inodes, but in doing so will record the
> lowest LSN of all the dirty inodes it skips. It will then push the
> AIL to this LSN and wait for it to complete that work.
>
> In doing so, we block direct reclaim on the IO of at least one IO,
> thereby providing some level of throttling for when we encounter
> dirty inodes. However we gain the ability to scan and reclaim clean
> inodes in a non-blocking fashion.
>
> Hence direct reclaim will be throttled directly by the rate at which
> dirty inodes are cleaned by AIL pushing, rather than by delays
> caused by competing IO submissions. This allows us to reduce the
> locking that limits direct reclaim concurrency to just protecting
> the reclaim cursor state, hence greatly simplifying the inode
> reclaim code as it now just skips dirty inodes.
>
> Note: this patch by itself isn't completely able to throttle direct
> reclaim sufficiently to prevent OOM killer madness. We can't do that
> until we change the way we index reclaimable inodes in the next
> patch and can feed back state to the mm core sanely. However, we
> can't change the way we index reclaimable inodes until we have
> IO-less non-blocking reclaim for both direct reclaim and kswapd
> reclaim. Catch-22...
>
> Signed-off-by: Dave Chinner <dchinner@xxxxxxxxxx>
> ---
A couple random nits and a question...
> fs/xfs/xfs_icache.c | 218 ++++++++++++++++++--------------------------
> 1 file changed, 89 insertions(+), 129 deletions(-)
>
> diff --git a/fs/xfs/xfs_icache.c b/fs/xfs/xfs_icache.c
> index 7e175304e146..ff8ae32614a6 100644
> --- a/fs/xfs/xfs_icache.c
> +++ b/fs/xfs/xfs_icache.c
...
> @@ -1262,9 +1227,13 @@ xfs_reclaim_inodes_ag(
> for (i = 0; i < nr_found; i++) {
> struct xfs_inode *ip = batch[i];
>
> - if (done || xfs_reclaim_inode_grab(ip, flags))
> + if (done ||
> + !xfs_reclaim_inode_grab(ip, flags, &lsn))
> batch[i] = NULL;
Doesn't look like we can get here with done != 0.
>
> + if (lsn && XFS_LSN_CMP(lsn, lowest_lsn) < 0)
> + lowest_lsn = lsn;
> +
This should probably have the same NULLCOMMITLSN treatment as the
similar check below.
> /*
> * Update the index for the next lookup. Catch
> * overflows into the next AG range which can
> @@ -1289,41 +1258,34 @@ xfs_reclaim_inodes_ag(
...
>
> - /*
> - * if we skipped any AG, and we still have scan count remaining, do
> - * another pass this time using blocking reclaim semantics (i.e
> - * waiting on the reclaim locks and ignoring the reclaim cursors). This
> - * ensure that when we get more reclaimers than AGs we block rather
> - * than spin trying to execute reclaim.
> - */
> - if (skipped && (flags & SYNC_WAIT) && *nr_to_scan > 0) {
> - trylock = 0;
> - goto restart;
> - }
> - return last_error;
> + if ((flags & SYNC_WAIT) && lowest_lsn != NULLCOMMITLSN)
> + xfs_ail_push_sync(mp->m_ail, lowest_lsn);
> +
> + return freed;
Hm, this should have always been returning a free count instead of an
error code right? If so, I'd normally suggest to fix this as an
independent patch, but it's probably not worth splitting up at this
point.
The aforementioned nits seem harmless and the code is going away, so:
Reviewed-by: Brian Foster <bfoster@xxxxxxxxxx>
> }
>
> int
> @@ -1331,9 +1293,7 @@ xfs_reclaim_inodes(
> xfs_mount_t *mp,
> int mode)
> {
> - int nr_to_scan = INT_MAX;
> -
> - return xfs_reclaim_inodes_ag(mp, mode, &nr_to_scan);
> + return xfs_reclaim_inodes_ag(mp, mode, INT_MAX);
> }
>
> /*
> @@ -1350,7 +1310,7 @@ xfs_reclaim_inodes_nr(
> struct xfs_mount *mp,
> int nr_to_scan)
> {
> - int sync_mode = SYNC_TRYLOCK;
> + int sync_mode = 0;
>
> /*
> * For kswapd, we kick background inode writeback. For direct
> @@ -1362,7 +1322,7 @@ xfs_reclaim_inodes_nr(
> else
> sync_mode |= SYNC_WAIT;
>
> - return xfs_reclaim_inodes_ag(mp, sync_mode, &nr_to_scan);
> + return xfs_reclaim_inodes_ag(mp, sync_mode, nr_to_scan);
> }
>
> /*
> --
> 2.24.0.rc0
>
