xfs: stable update for 2.6.32.x and 2.6.33.y
PATCH 1/1 xfs: stable update for 2.6.32.x and 2.6.33.y
G'day,
The following patch that adds a inode reclaim shrinker needs to be added to both the 2.6.32.x stable series and the 2.6.33.y stable series.
The regression this patch addresses was introduced in the previous round of XFS stable updates that have just been released (2.6.32.12 and 2.6.33.3). However, the fix wasn't upstream until after thoes stable kernels were released, so please consider this for the next stable releaseѕ.
The same patch applies to the XFS code in both 2.6.32.12 and 2.6.33.3 trees, and has passed a run of xfsqa on both kernels with limited memory to trigger the OOM conditions that lead to problems. The upstream commit is 9bf729c0af67897ea8498ce17c29b0683f7f2028.
Cheers,
Dave.
Signature · 29 lines
Dave Chinner [email protected] xfs: add a shrinker to background inode reclaim From: Dave Chinner <[email protected]> From 9bf729c0af67897ea8498ce17c29b0683f7f2028 Thu, 29 Apr 2010 21:22:13 +0000 On low memory boxes or those with highmem, kernel can OOM before the background reclaims inodes via xfssyncd. Add a shrinker to run inode reclaim so that it inode reclaim is expedited when memory is low. This is more complex than it needs to be because the VM folk don't want a context added to the shrinker infrastructure. Hence we need to add a global list of XFS mount structures so the shrinker can traverse them. Signed-off-by: Dave Chinner <[email protected]> Reviewed-by: Christoph Hellwig <[email protected]> --- fs/xfs/linux-2.6/xfs_super.c | 5 ++ fs/xfs/linux-2.6/xfs_sync.c | 107 +++++++++++++++++++++++++++++++++++++--- fs/xfs/linux-2.6/xfs_sync.h | 7 ++- fs/xfs/quota/xfs_qm_syscalls.c | 3 +- fs/xfs/xfs_ag.h | 1 + fs/xfs/xfs_mount.h | 1 + 6 files changed, 115 insertions(+), 9 deletions(-)
fs/xfs/linux-2.6/xfs_super.c +5 -0
@@ -1160,6 +1160,7 @@ xfs_fs_put_super(xfs_unmountfs (mp);xfs_freesb (mp); +xfs_inode_shrinker_unregister (mp);xfs_icsb_destroy_counters (mp);xfs_close_devices (mp);xfs_dmops_put (mp);
@@ -1523,6 +1524,8 @@ xfs_fs_fill_super(if (error) goto fail_vnrele; +xfs_inode_shrinker_register (mp); +kfree (mtpt);return 0 ;
@@ -1767,6 +1770,7 @@ init_xfs_fs(void) goto out_cleanup_procfs;vfs_initquota (); +xfs_inode_shrinker_init (); error =register_filesystem (&xfs_fs_type);if (error)
@@ -1794,6 +1798,7 @@ exit_xfs_fs(void) {vfs_exitquota ();unregister_filesystem (&xfs_fs_type); +xfs_inode_shrinker_destroy ();xfs_sysctl_unregister ();xfs_cleanup_procfs ();xfs_buf_terminate ();
fs/xfs/linux-2.6/xfs_sync.c +100 -7
168 lines not on this page · raw message
fs/xfs/linux-2.6/xfs_sync.h +6 -1
@@ -54,6 +54,11 @@ void __xfs_inode_clear_reclaim_tag(struct xfs_mount *mp, struct xfs_perag *pag,int xfs_sync_inode_valid (struct xfs_inode *ip,struct xfs_perag *pag);int xfs_inode_ag_iterator (struct xfs_mount *mp,int (*execute)(struct xfs_inode *ip,struct xfs_perag *pag,int flags), -int flags,int tag,int write_lock); +int flags,int tag,int write_lock,int *nr_to_scan); + +void xfs_inode_shrinker_init (void ); +void xfs_inode_shrinker_destroy (void ); +void xfs_inode_shrinker_register (struct xfs_mount *mp); +void xfs_inode_shrinker_unregister (struct xfs_mount *mp);#endif
fs/xfs/quota/xfs_qm_syscalls.c +2 -1
@@ -891,7 +891,8 @@ xfs_qm_dqrele_all_inodes( uint flags) {ASSERT (mp->m_quotainfo); -xfs_inode_ag_iterator (mp, xfs_dqrele_inode, flags,XFS_ICI_NO_TAG ,0 ); +xfs_inode_ag_iterator (mp, xfs_dqrele_inode, flags, +XFS_ICI_NO_TAG ,0 ,NULL ); }/*------------------------------------------------------------------------*/
fs/xfs/xfs_ag.h +1 -0
@@ -229,6 +229,7 @@ typedef struct xfs_peragint pag_ici_init;/* incore inode cache initialised */ rwlock_t pag_ici_lock;/* incore inode lock */ struct radix_tree_root pag_ici_root;/* incore inode cache root */ +int pag_ici_reclaimable;/* reclaimable inodes */ #endif } xfs_perag_t;
fs/xfs/xfs_mount.h +1 -0
@@ -257,6 +257,7 @@ typedef struct xfs_mount {wait_queue_head_t m_wait_single_sync_task;__int64_t m_update_flags;/* sb flags we need to update on the next remount,rw */ +struct list_head m_mplist;/* inode shrinker mount list */ } xfs_mount_t;/*
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs