xfs: check for not fully initialized inodes in xfs_ireclaim
PATCH 1/1 xfs: check for not fully initialized inodes in xfs_ireclaim
Add an assert for inodes not added to the inode cache in xfs_ireclaim, to make sure we're not going to introduce something like the famous nfsd inode cache bug again.
fs/xfs/xfs_iget.c +8 -4
@@ -514,17 +514,21 @@ xfs_ireclaim( {struct xfs_mount *mp = ip->i_mount;struct xfs_perag *pag; +xfs_agino_t agino =XFS_INO_TO_AGINO (mp, ip->i_ino);XFS_STATS_INC (xs_ig_reclaims);/* -* Remove the inode from the per-AG radix tree. It doesn't matter -* if it was never added to it because radix_tree_delete can deal -* with that case just fine. +* 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_get_perag (mp, ip->i_ino);write_lock (&pag->pag_ici_lock); -radix_tree_delete (&pag->pag_ici_root,XFS_INO_TO_AGINO (mp, ip->i_ino)); +ASSERT (radix_tree_lookup (&pag->pag_ici_root, agino)); +radix_tree_delete (&pag->pag_ici_root, agino);write_unlock (&pag->pag_ici_lock);xfs_put_perag (mp, pag);
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
Quoted 3 lines · Christoph Hellwig
Add an assert for inodes not added to the inode cache in
xfs_ireclaim, to make sure we're not going to introduce something like the famous nfsd inode cache bug again.
I confess I have not looked at the radix tree code in detail yet, but radix_tree_delete() returns a value that is ignored here. It reportedly will return a null pointer if the index has no corresponding item in the tree, so this could be used in the assertion rather than doing a separate lookup.
I think the change is fine, but would rather see it done without the extra lookup (though there may be a good reason for doing it anyway).
-Alex
Quoted 33 lines
Signed-off-by Christoph Hellwig <[email protected]>Index:
xfs/fs/xfs/xfs_iget.c
===================================================================fs/xfs/xfs_iget.c +8
-4@@ -514,17 +514,21 @@ xfs_ireclaim( {struct xfs_mount *mp = ip->i_mount;struct xfs_perag *pag; +xfs_agino_t agino =XFS_INO_TO_AGINO (mp, ip->i_ino);XFS_STATS_INC (xs_ig_reclaims);/* -* Remove the inode from the per-AG radix tree. It doesn't matter -* if it was never added to it because radix_tree_delete can deal -* with that case just fine. +* 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_get_perag (mp, ip->i_ino);write_lock (&pag->pag_ici_lock); -radix_tree_delete (&pag->pag_ici_root,XFS_INO_TO_AGINO (mp, ip->i_ino)); +ASSERT (radix_tree_lookup (&pag->pag_ici_root, agino)); +radix_tree_delete (&pag->pag_ici_root, agino);write_unlock (&pag->pag_ici_lock);xfs_put_perag (mp, pag);
Quoted 4 lines
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
Quoted 13 lines · Alex Elder
Quoted 3 lines · Christoph Hellwig
Add an assert for inodes not added to the inode cache in
xfs_ireclaim, to make sure we're not going to introduce something like the famous nfsd inode cache bug again.I confess I have not looked at the radix tree code in detail yet, but
radix_tree_delete()returns a value that is ignored here. It reportedly will return a null pointer if the index has no corresponding item in the tree, so this could be used in the assertion rather than doing a separate lookup.
Quoted 3 lines
I think the change is fine, but would rather see it done without the extra lookup (though there may be a good reason for doing it anyway).
Sounds good, I'll redo it.
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
PATCH v2 1/1 xfs: check for not fully initialized inodes in xfs_ireclaim
In reply to Christoph HellwigAdd an assert for inodes not added to the inode cache in xfs_ireclaim, to make sure we're not going to introduce something like the famous nfsd inode cache bug again.
fs/xfs/xfs_iget.c +8 -4
@@ -514,17 +514,21 @@ xfs_ireclaim( {struct xfs_mount *mp = ip->i_mount;struct xfs_perag *pag; +xfs_agino_t agino =XFS_INO_TO_AGINO (mp, ip->i_ino);XFS_STATS_INC (xs_ig_reclaims);/* -* Remove the inode from the per-AG radix tree. It doesn't matter -* if it was never added to it because radix_tree_delete can deal -* with that case just fine. +* 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_get_perag (mp, ip->i_ino);write_lock (&pag->pag_ici_lock); -radix_tree_delete (&pag->pag_ici_root,XFS_INO_TO_AGINO (mp, ip->i_ino)); +if (!radix_tree_delete (&pag->pag_ici_root, agino)) +ASSERT (0 );write_unlock (&pag->pag_ici_lock);xfs_put_perag (mp, pag);
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
Quoted 3 lines · Christoph Hellwig
Add an assert for inodes not added to the inode cache in
xfs_ireclaim, to make sure we're not going to introduce something like the famous nfsd inode cache bug again.
It's a shame we can't do more than an ASSERT() here (for non-debug builds).
Looks good though.
Quoted 1 line
Signed-off-by Christoph Hellwig <[email protected]>
Quoted 31 lines
Index:
xfs/fs/xfs/xfs_iget.c
===================================================================fs/xfs/xfs_iget.c +8
-4@@ -514,17 +514,21 @@ xfs_ireclaim( {struct xfs_mount *mp = ip->i_mount;struct xfs_perag *pag; +xfs_agino_t agino =XFS_INO_TO_AGINO (mp, ip->i_ino);XFS_STATS_INC (xs_ig_reclaims);/* -* Remove the inode from the per-AG radix tree. It doesn't matter -* if it was never added to it because radix_tree_delete can deal -* with that case just fine. +* 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_get_perag (mp, ip->i_ino);write_lock (&pag->pag_ici_lock); -radix_tree_delete (&pag->pag_ici_root,XFS_INO_TO_AGINO (mp, ip->i_ino)); +if (!radix_tree_delete (&pag->pag_ici_root, agino)) +ASSERT (0 );write_unlock (&pag->pag_ici_lock);xfs_put_perag (mp, pag);
Quoted 4 lines
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs