On Fri, May 22, 2020 at 04:06:42PM -0700, Darrick J. Wong wrote:
> On Fri, May 22, 2020 at 01:50:19PM +1000, Dave Chinner wrote:
> > From: Dave Chinner <dchinner@xxxxxxxxxx>
> >
> > We no longer need to issue IO from shrinker based inode reclaim to
> > prevent spurious OOM killer invocation. This leaves only the global
> > filesystem management operations such as unmount needing to
> > writeback dirty inodes and reclaim them.
> >
> > Instead of using the reclaim pass to write dirty inodes before
> > reclaiming them, use the AIL to push all the dirty inodes before we
> > try to reclaim them. This allows us to remove all the conditional
> > SYNC_WAIT locking and the writeback code from xfs_reclaim_inode()
> > and greatly simplify the checks we need to do to reclaim an inode.
> >
> > Signed-off-by: Dave Chinner <dchinner@xxxxxxxxxx>
> > ---
> > fs/xfs/xfs_icache.c | 116 +++++++++++---------------------------------
> > 1 file changed, 29 insertions(+), 87 deletions(-)
> >
> > diff --git a/fs/xfs/xfs_icache.c b/fs/xfs/xfs_icache.c
> > index 0f0f8fcd61b03..ee9bc82a0dfbe 100644
> > --- a/fs/xfs/xfs_icache.c
> > +++ b/fs/xfs/xfs_icache.c
> > @@ -1130,24 +1130,17 @@ xfs_reclaim_inode_grab(
> > * dirty, async => requeue
> > * dirty, sync => flush, wait and reclaim
> > */
>
> The function comment probably ought to describe what the two return
> values mean. true when the inode was freed and false if we need to try
> again, right?
The comments are all updated in a later patch. It seemed better to
do that than to have to rewrite the repeatedly as behaviour changes
in each patch.
> > @@ -1272,20 +1219,17 @@ xfs_reclaim_inode(
> > * then a shut down during filesystem unmount reclaim walk leak all the
> > * unreclaimed inodes.
> > */
> > -STATIC int
> > +static int
>
> The function comment /really/ needs to note that the return value
> here is number of inodes that were skipped, and not just some negative
> error code.
OK, done.
> > @@ -1398,8 +1329,18 @@ xfs_reclaim_inodes(
> > int mode)
> > {
> > int nr_to_scan = INT_MAX;
> > + int skipped;
> >
> > - return xfs_reclaim_inodes_ag(mp, mode, &nr_to_scan);
> > + skipped = xfs_reclaim_inodes_ag(mp, mode, &nr_to_scan);
> > + if (!(mode & SYNC_WAIT))
> > + return 0;
> > +
> > + do {
> > + xfs_ail_push_all_sync(mp->m_ail);
> > + skipped = xfs_reclaim_inodes_ag(mp, mode, &nr_to_scan);
> > + } while (skipped > 0);
> > +
> > + return 0;
>
> Might as well kill the return value here since none of the callers care.
I think I did that in the SYNC_WAIT futzing patches that were
causing me problems and I dropped. It was in a separate patch,
anyway.
> > }
> >
> > /*
> > @@ -1420,7 +1361,8 @@ xfs_reclaim_inodes_nr(
> > xfs_reclaim_work_queue(mp);
> > xfs_ail_push_all(mp->m_ail);
> >
> > - return xfs_reclaim_inodes_ag(mp, SYNC_TRYLOCK, &nr_to_scan);
>
> So the old code was returning negative error codes here? Given that the
> only caller is free_cached_objects which adds it to the 'freed' count...
> wow.
Actually, no. the error from xfs_reclaim_inodes_ag() can only come
from xfs_reclaim_inode(), which always returned 0.
> > + xfs_reclaim_inodes_ag(mp, SYNC_TRYLOCK, &nr_to_scan);
> > + return 0;
>
> Why do we return zero freed items here? The VFS asked us to clear
> shrink_control->nr_to_scan (passed in here as nr_to_scan) and we're
> supposed to report what we did, right?
It's the same behaviour as we currently have.
ISTR that I did the accounting this way originally so we didn't
double count inodes being freed. The inode has already been
accounted as freed by the VFS inode shrinker when it runs
->destroy_inode, so double counting every inode that is freed (once
for the VFS cache removal, once for the XFS cache removal) seemed
like a bad thing to be doing...
> Or is there some odd subtlety here where we hate the shrinker and that's
> why we return zero?
Oh, that too :P
Cheers,
Dave.
--
Dave Chinner
david@xxxxxxxxxxxxx
