From: Dave Chinner <dchinner@xxxxxxxxxx>
From: Dave Chinner <dchinner@xxxxxxxxxx>
Whenthe filesystem is mounting, the superblock based shrinker cannot run due to
the mount process holding the sb->s_umount lock exclusively. Hence when
quotacheck runs, it cannot shrink the inode cache if it grows too large. We've
had repeated problems with the inode cache shrinker startup and quotacheck
resulting in OOM conditions.
Avoid this problem altogether by installing a quotacheck specific inode cache
shrinker that is registered before the quotacheck starts, and is then
unregistered after the quotacheck finishes. This shrinker uses exactly the same
infrastructure as the superblock based inode cache shrinker, so there is very
little extra code.
Signed-off-by: Dave Chinner <dchinner@xxxxxxxxxx>
---
fs/xfs/xfs_qm.c | 28 ++++++++++++++++++++++++++++
fs/xfs/xfs_qm.h | 2 ++
2 files changed, 30 insertions(+), 0 deletions(-)
diff --git a/fs/xfs/xfs_qm.c b/fs/xfs/xfs_qm.c
index c872fea..c1a42f1 100644
--- a/fs/xfs/xfs_qm.c
+++ b/fs/xfs/xfs_qm.c
@@ -823,6 +823,7 @@ xfs_qm_init_quotainfo(
return error;
}
+ qinf->qi_mount = mp;
INIT_LIST_HEAD(&qinf->qi_dqlist);
mutex_init(&qinf->qi_dqlist_lock);
lockdep_set_class(&qinf->qi_dqlist_lock, &xfs_quota_mplist_class);
@@ -1398,6 +1399,26 @@ error0:
}
/*
+ * quotacheck specific shrinker. This is only active while quotacheck is in
+ * progress as the superblock shrinker won't run until the mount completes and
+ * drops the sb->s_umount lock.
+ */
+static int
+xfs_qm_quotacheck_shrink(
+ struct shrinker *shr,
+ struct shrink_control *sc)
+{
+ struct xfs_quotainfo *qi = container_of(shr, struct xfs_quotainfo,
+ qi_shrinker);
+ if (!(sc->gfp_mask & __GFP_FS))
+ return -1;
+ if (sc->nr_to_scan)
+ xfs_reclaim_inodes_nr(qi->qi_mount, sc->nr_to_scan);
+
+ return xfs_reclaim_inodes_count(qi->qi_mount);
+}
+
+/*
* Walk thru all the filesystem inodes and construct a consistent view
* of the disk quota world. If the quotacheck fails, disable quotas.
*/
@@ -1410,6 +1431,7 @@ xfs_qm_quotacheck(
size_t structsz;
xfs_inode_t *uip, *gip;
uint flags;
+ struct xfs_quotainfo *qi = mp->m_quotainfo;
count = INT_MAX;
structsz = 1;
@@ -1427,6 +1449,11 @@ xfs_qm_quotacheck(
xfs_notice(mp, "Quotacheck needed: Please wait.");
+ qi->qi_shrinker.seeks = DEFAULT_SEEKS;
+ qi->qi_shrinker.shrink = xfs_qm_quotacheck_shrink;
+ qi->qi_shrinker.batch = 1024;
+ register_shrinker(&qi->qi_shrinker);
+
/*
* First we go thru all the dquots on disk, USR and GRP/PRJ, and reset
* their counters to zero. We need a clean slate.
@@ -1500,6 +1527,7 @@ xfs_qm_quotacheck(
mp->m_qflags |= flags;
error_return:
+ unregister_shrinker(&qi->qi_shrinker);
if (error) {
xfs_warn(mp,
"Quotacheck: Unsuccessful (Error %d): Disabling quotas.",
diff --git a/fs/xfs/xfs_qm.h b/fs/xfs/xfs_qm.h
index 9a9b997..9ee7990 100644
--- a/fs/xfs/xfs_qm.h
+++ b/fs/xfs/xfs_qm.h
@@ -73,6 +73,8 @@ typedef struct xfs_qm {
typedef struct xfs_quotainfo {
xfs_inode_t *qi_uquotaip; /* user quota inode */
xfs_inode_t *qi_gquotaip; /* group quota inode */
+ struct xfs_mount *qi_mount;
+ struct shrinker qi_shrinker;
struct list_head qi_dqlist; /* all dquots in filesys */
struct mutex qi_dqlist_lock;
int qi_dquots;
--
1.7.9
_______________________________________________
xfs mailing list
xfs@xxxxxxxxxxx
http://oss.sgi.com/mailman/listinfo/xfs
