On Fri, Oct 11, 2019 at 03:56:18AM -0700, Christoph Hellwig wrote:
> > +++ b/fs/xfs/xfs_icache.c
> > @@ -1193,7 +1193,7 @@ xfs_reclaim_inode(
> > *
> > * Return the number of inodes freed.
> > */
> > -STATIC int
> > +int
> > xfs_reclaim_inodes_ag(
> > struct xfs_mount *mp,
> > int flags,
>
> This looks odd. This function actually is unused now. I think you
> want to fold in the patch that removes it instead of this little hack
> to make the compiler happy.
I think it might have been a stray.
>
> > - xfs_reclaim_inodes_ag(mp, SYNC_WAIT, INT_MAX);
> > + struct xfs_ireclaim_args *ra = arg;
> > + struct inode *inode = container_of(item, struct inode, i_lru);
> > + struct xfs_inode *ip = XFS_I(inode);
>
> Whitespace damage, and a line > 80 chars.
Fixed.
>
> > +out_ifunlock:
> > + xfs_ifunlock(ip);
>
> This error path will instantly deadlock, given that xfs_ifunlock takes
> i_flags_lock through xfs_iflags_clear, and we already hold it here.
Good catch. Clearly it's hard to hit a flush locked inode here...
> > + /*
> > + * Remove the inode from the per-AG radix tree.
> > + *
> > + * Because radix_tree_delete won't complain even if the item was never
> > + * added to the tree assert that it's been there before to catch
> > + * problems with the inode life time early on.
> > + */
> > + pag = xfs_perag_get(mp, XFS_INO_TO_AGNO(mp, ino));
> > + spin_lock(&pag->pag_ici_lock);
> > + if (!radix_tree_delete(&pag->pag_ici_root, XFS_INO_TO_AGINO(mp, ino)))
> > + ASSERT(0);
>
> Well, it "complains" by returning NULL instead of the entry. So I think
> that comment could use some updates or simply be removed.
Removed.
>
> > +void
> > +xfs_dispose_inodes(
> > + struct list_head *freeable)
> > +{
> > + while (!list_empty(freeable)) {
> > + struct inode *inode;
> > +
> > + inode = list_first_entry(freeable, struct inode, i_lru);
>
> This could use list_first_entry_or_null in the while loop, or not.
> Or list_pop_entry if we had it, but Linus hates that :)
Changed to use list_first_entry_or_null().
>
> > +xfs_reclaim_inodes(
> > + struct xfs_mount *mp)
> > +{
> > + while (list_lru_count(&mp->m_inode_lru)) {
> > + struct xfs_ireclaim_args ra;
> > + long freed, to_free;
> > +
> > + INIT_LIST_HEAD(&ra.freeable);
> > + ra.lowest_lsn = NULLCOMMITLSN;
> > + to_free = list_lru_count(&mp->m_inode_lru);
>
> Do we want a helper to initialize the xfs_ireclaim_args? That would
> solve the "issue" of not initializing dirty_skipped in a few users
> and make it a little easier to use.
Done.
> > +
> > + freed = list_lru_walk(&mp->m_inode_lru, xfs_inode_reclaim_isolate,
>
> Line > 80 chars.
Fixed.
> > +static inline int __xfs_iflock_nowait(struct xfs_inode *ip)
> > +{
> > + if (ip->i_flags & XFS_IFLOCK)
> > + return false;
> > + ip->i_flags |= XFS_IFLOCK;
> > + return true;
> > +}
>
> I wonder if simply open coding this would be simpler, given how magic
> xfs_inode_reclaim_isolate already is, and given that we really shouldn't
> use this helper anywhere else.
Well, I kind of just added an __xfs_ifunlock() wrapper to pair with
it because of the deadlock you caught above. I've added
lockdep_assert_held() to both of them to indicate the context in
which they should be used. While it's special case, I really would
like to keep the internals of flush locking code together as much as
possible.
Longer term (i.e. a future patchset), I really want to clean up how
we use the i_flags_lock and the i_flags bits. At the time the iflags
wrappers made sense, but now we have as many open coded flags as we
do wrapped. And in many of these cases I think we'd be better off
using bitops for them (e.g. bitops for the flush lock bit make these
new helpers go away), and the i_flags_lock can be removed and
replaced by the VFS inode i_lock for operations that require an
internal spinlock to serialise...
Cheers,
Dave.
--
Dave Chinner
david@xxxxxxxxxxxxx
