On Wed, Jun 07, 2017 at 09:00:55AM -0400, Brian Foster wrote: > The 0-day kernel test robot reports assertion failures on > !CONFIG_SMP kernels due to failed spin_is_locked() checks. As it > turns out, spin_is_locked() is hardcoded to return zero on > !CONFIG_SMP kernels and so this function cannot be relied on to > verify spinlock state in this configuration. > > To avoid this problem, replace the associated asserts with lockdep > variants that do the right thing regardless of kernel configuration. > Drop the one assert that checks for an unlocked lock as there is no > suitable lockdep variant for that case. This moves the spinlock > checks from XFS debug code to lockdep, but generally provides the > same level of protection. > > Reported-by: kbuild test robot <fengguang.wu@xxxxxxxxx> > Signed-off-by: Brian Foster <bfoster@xxxxxxxxxx> > --- > > Here's another version that uses lockdep calls as suggested by > Christoph. Looks ok, will test: Reviewed-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx> Hmm.... do you want me to put this into 4.12? It's sort of a regression introduced in -rc4, but on the other hand this seems to have been broken for quite a while for SMP=n && XFS_DEBUG=y and nobody complained... --D > > Brian > > v2: > - Use lockdep asserts instead of config check. > - Drop !spin_is_locked() assert from inode initialization. > v1: http://www.spinics.net/lists/linux-xfs/msg07463.html > > fs/xfs/xfs_buf.c | 2 +- > fs/xfs/xfs_icache.c | 5 ++--- > 2 files changed, 3 insertions(+), 4 deletions(-) > > diff --git a/fs/xfs/xfs_buf.c b/fs/xfs/xfs_buf.c > index 07b77b7..16d6a57 100644 > --- a/fs/xfs/xfs_buf.c > +++ b/fs/xfs/xfs_buf.c > @@ -117,7 +117,7 @@ static inline void > __xfs_buf_ioacct_dec( > struct xfs_buf *bp) > { > - ASSERT(spin_is_locked(&bp->b_lock)); > + lockdep_assert_held(&bp->b_lock); > > if (bp->b_state & XFS_BSTATE_IN_FLIGHT) { > bp->b_state &= ~XFS_BSTATE_IN_FLIGHT; > diff --git a/fs/xfs/xfs_icache.c b/fs/xfs/xfs_icache.c > index f61c84f8..990210f 100644 > --- a/fs/xfs/xfs_icache.c > +++ b/fs/xfs/xfs_icache.c > @@ -66,7 +66,6 @@ xfs_inode_alloc( > > XFS_STATS_INC(mp, vn_active); > ASSERT(atomic_read(&ip->i_pincount) == 0); > - ASSERT(!spin_is_locked(&ip->i_flags_lock)); > ASSERT(!xfs_isiflocked(ip)); > ASSERT(ip->i_ino == 0); > > @@ -190,7 +189,7 @@ xfs_perag_set_reclaim_tag( > { > struct xfs_mount *mp = pag->pag_mount; > > - ASSERT(spin_is_locked(&pag->pag_ici_lock)); > + lockdep_assert_held(&pag->pag_ici_lock); > if (pag->pag_ici_reclaimable++) > return; > > @@ -212,7 +211,7 @@ xfs_perag_clear_reclaim_tag( > { > struct xfs_mount *mp = pag->pag_mount; > > - ASSERT(spin_is_locked(&pag->pag_ici_lock)); > + lockdep_assert_held(&pag->pag_ici_lock); > if (--pag->pag_ici_reclaimable) > return; > > -- > 2.7.5 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-xfs" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-xfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
