On Wed, Aug 04, 2021 at 07:06:50PM -0700, Darrick J. Wong wrote:
> From: Dave Chinner <dchinner@xxxxxxxxxx>
<megasnip> A couple of minor changes that aren't worth reposting the
entire series:
> diff --git a/fs/xfs/xfs_icache.c b/fs/xfs/xfs_icache.c
> index b9214733d0c3..fedfa40e3cd6 100644
> --- a/fs/xfs/xfs_icache.c
> +++ b/fs/xfs/xfs_icache.c
<snip>
> @@ -1767,30 +1801,276 @@ xfs_inode_mark_reclaimable(
> ASSERT(0);
> }
>
> + pag = xfs_perag_get(mp, XFS_INO_TO_AGNO(mp, ip->i_ino));
> + spin_lock(&pag->pag_ici_lock);
> + spin_lock(&ip->i_flags_lock);
> +
> + trace_xfs_inode_set_reclaimable(ip);
> + ip->i_flags &= ~(XFS_NEED_INACTIVE | XFS_INACTIVATING);
> + ip->i_flags |= XFS_IRECLAIMABLE;
> + xfs_perag_set_inode_tag(pag, XFS_INO_TO_AGINO(mp, ip->i_ino),
> + XFS_ICI_RECLAIM_TAG);
> +
> + spin_unlock(&ip->i_flags_lock);
> + spin_unlock(&pag->pag_ici_lock);
> + xfs_perag_put(pag);
> +}
> +
> +/*
> + * Free all speculative preallocations and possibly even the inode itself.
> + * This is the last chance to make changes to an otherwise unreferenced file
> + * before incore reclamation happens.
> + */
> +static void
> +xfs_inodegc_inactivate(
> + struct xfs_inode *ip)
> +{
> + struct xfs_mount *mp = ip->i_mount;
> +
> + /*
> + * Inactivation isn't supposed to run when the fs is frozen because
> + * we don't want kernel threads to block on transaction allocation.
> + */
> + ASSERT(mp->m_super->s_writers.frozen < SB_FREEZE_FS);
> +
I solved the problems Dave was complaining about (g/390, x/517) by
removing this ASSERT.
> diff --git a/fs/xfs/xfs_trace.h b/fs/xfs/xfs_trace.h
> index 19260291ff8b..bd8abb50b33a 100644
> --- a/fs/xfs/xfs_trace.h
> +++ b/fs/xfs/xfs_trace.h
> @@ -157,6 +157,48 @@ DEFINE_PERAG_REF_EVENT(xfs_perag_put);
> DEFINE_PERAG_REF_EVENT(xfs_perag_set_inode_tag);
> DEFINE_PERAG_REF_EVENT(xfs_perag_clear_inode_tag);
>
> +#define XFS_STATE_FLAGS \
> + { (1UL << XFS_STATE_INODEGC_ENABLED), "inodegc" }
I've also changed the name of this to XFS_OPSTATE_STRINGS because we use
_STRINGS everywhere else in this file.
--D
> +
> +DECLARE_EVENT_CLASS(xfs_fs_class,
> + TP_PROTO(struct xfs_mount *mp, void *caller_ip),
> + TP_ARGS(mp, caller_ip),
> + TP_STRUCT__entry(
> + __field(dev_t, dev)
> + __field(unsigned long long, mflags)
> + __field(unsigned long, opstate)
> + __field(unsigned long, sbflags)
> + __field(void *, caller_ip)
> + ),
> + TP_fast_assign(
> + if (mp) {
> + __entry->dev = mp->m_super->s_dev;
> + __entry->mflags = mp->m_flags;
> + __entry->opstate = mp->m_opstate;
> + __entry->sbflags = mp->m_super->s_flags;
> + }
> + __entry->caller_ip = caller_ip;
> + ),
> + TP_printk("dev %d:%d m_flags 0x%llx opstate (%s) s_flags 0x%lx caller %pS",
> + MAJOR(__entry->dev), MINOR(__entry->dev),
> + __entry->mflags,
> + __print_flags(__entry->opstate, "|", XFS_STATE_FLAGS),
> + __entry->sbflags,
> + __entry->caller_ip)
> +);
> +
> +#define DEFINE_FS_EVENT(name) \
> +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_start);
> +DEFINE_FS_EVENT(xfs_inodegc_stop);
> +DEFINE_FS_EVENT(xfs_inodegc_worker);
> +DEFINE_FS_EVENT(xfs_inodegc_queue);
> +DEFINE_FS_EVENT(xfs_inodegc_throttle);
> +DEFINE_FS_EVENT(xfs_fs_sync_fs);
> +
> DECLARE_EVENT_CLASS(xfs_ag_class,
> TP_PROTO(struct xfs_mount *mp, xfs_agnumber_t agno),
> TP_ARGS(mp, agno),
> @@ -616,14 +658,17 @@ DECLARE_EVENT_CLASS(xfs_inode_class,
> TP_STRUCT__entry(
> __field(dev_t, dev)
> __field(xfs_ino_t, ino)
> + __field(unsigned long, iflags)
> ),
> TP_fast_assign(
> __entry->dev = VFS_I(ip)->i_sb->s_dev;
> __entry->ino = ip->i_ino;
> + __entry->iflags = ip->i_flags;
> ),
> - TP_printk("dev %d:%d ino 0x%llx",
> + TP_printk("dev %d:%d ino 0x%llx iflags 0x%lx",
> MAJOR(__entry->dev), MINOR(__entry->dev),
> - __entry->ino)
> + __entry->ino,
> + __entry->iflags)
> )
>
> #define DEFINE_INODE_EVENT(name) \
> @@ -667,6 +712,10 @@ DEFINE_INODE_EVENT(xfs_inode_free_eofblocks_invalid);
> DEFINE_INODE_EVENT(xfs_inode_set_cowblocks_tag);
> DEFINE_INODE_EVENT(xfs_inode_clear_cowblocks_tag);
> DEFINE_INODE_EVENT(xfs_inode_free_cowblocks_invalid);
> +DEFINE_INODE_EVENT(xfs_inode_set_reclaimable);
> +DEFINE_INODE_EVENT(xfs_inode_reclaiming);
> +DEFINE_INODE_EVENT(xfs_inode_set_need_inactive);
> +DEFINE_INODE_EVENT(xfs_inode_inactivating);
>
> /*
> * ftrace's __print_symbolic requires that all enum values be wrapped in the
>
