Commit b066a4ee authored by Abhi Das's avatar Abhi Das Committed by Bob Peterson
Browse files

gfs2: forcibly flush ail to relieve memory pressure 



On systems with low memory, it is possible for gfs2 to infinitely
loop in balance_dirty_pages() under heavy IO (creating sparse files).

balance_dirty_pages() attempts to write out the dirty pages via
gfs2_writepages() but none are found because these dirty pages are
being used by the journaling code in the ail. Normally, the journal
has an upper threshold which when hit triggers an automatic flush
of the ail. But this threshold can be higher than the number of
allowable dirty pages and result in the ail never being flushed.

This patch forces an ail flush when gfs2_writepages() fails to write
anything. This is a good indication that the ail might be holding
some dirty pages.

Signed-off-by: default avatarAbhi Das <adas@redhat.com>
Signed-off-by: default avatarBob Peterson <rpeterso@redhat.com>
parent a91323e2

fs/gfs2/aops.c

+13 −1
Original line number Diff line number Diff line
@@ -234,7 +234,19 @@ out: 
static int gfs2_writepages(struct address_space *mapping,

			   struct writeback_control *wbc)

{

	return mpage_writepages(mapping, wbc, gfs2_get_block_noalloc);

	struct gfs2_sbd *sdp = gfs2_mapping2sbd(mapping);

	int ret = mpage_writepages(mapping, wbc, gfs2_get_block_noalloc);



	/*

	 * Even if we didn't write any pages here, we might still be holding

	 * dirty pages in the ail. We forcibly flush the ail because we don't

	 * want balance_dirty_pages() to loop indefinitely trying to write out

	 * pages held in the ail that it can't find.

	 */

	if (ret == 0)

		set_bit(SDF_FORCE_AIL_FLUSH, &sdp->sd_flags);



	return ret;

}



/**

fs/gfs2/incore.h

+1 −0
Original line number Diff line number Diff line
@@ -606,6 +606,7 @@ enum { 
	SDF_NOJOURNALID		= 6,

	SDF_RORECOVERY		= 7, /* read only recovery */

	SDF_SKIP_DLM_UNLOCK	= 8,

	SDF_FORCE_AIL_FLUSH     = 9,

};



enum gfs2_freeze_state {

fs/gfs2/log.c

+4 −0
Original line number Diff line number Diff line
@@ -898,6 +898,10 @@ static inline int gfs2_jrnl_flush_reqd(struct gfs2_sbd *sdp) 
static inline int gfs2_ail_flush_reqd(struct gfs2_sbd *sdp)

{

	unsigned int used_blocks = sdp->sd_jdesc->jd_blocks - atomic_read(&sdp->sd_log_blks_free);



	if (test_and_clear_bit(SDF_FORCE_AIL_FLUSH, &sdp->sd_flags))

		return 1;



	return used_blocks + atomic_read(&sdp->sd_log_blks_needed) >=

		atomic_read(&sdp->sd_log_thresh2);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE