Merge branch 'urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/writeback
* 'urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/writeback: squeeze max-pause area and drop pass-good area
This commit is contained in:
commit
e33f2d238e
|
@ -12,15 +12,6 @@
|
||||||
*
|
*
|
||||||
* (thresh - thresh/DIRTY_FULL_SCOPE, thresh)
|
* (thresh - thresh/DIRTY_FULL_SCOPE, thresh)
|
||||||
*
|
*
|
||||||
* The 1/16 region above the global dirty limit will be put to maximum pauses:
|
|
||||||
*
|
|
||||||
* (limit, limit + limit/DIRTY_MAXPAUSE_AREA)
|
|
||||||
*
|
|
||||||
* The 1/16 region above the max-pause region, dirty exceeded bdi's will be put
|
|
||||||
* to loops:
|
|
||||||
*
|
|
||||||
* (limit + limit/DIRTY_MAXPAUSE_AREA, limit + limit/DIRTY_PASSGOOD_AREA)
|
|
||||||
*
|
|
||||||
* Further beyond, all dirtier tasks will enter a loop waiting (possibly long
|
* Further beyond, all dirtier tasks will enter a loop waiting (possibly long
|
||||||
* time) for the dirty pages to drop, unless written enough pages.
|
* time) for the dirty pages to drop, unless written enough pages.
|
||||||
*
|
*
|
||||||
|
@ -31,8 +22,6 @@
|
||||||
*/
|
*/
|
||||||
#define DIRTY_SCOPE 8
|
#define DIRTY_SCOPE 8
|
||||||
#define DIRTY_FULL_SCOPE (DIRTY_SCOPE / 2)
|
#define DIRTY_FULL_SCOPE (DIRTY_SCOPE / 2)
|
||||||
#define DIRTY_MAXPAUSE_AREA 16
|
|
||||||
#define DIRTY_PASSGOOD_AREA 8
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* 4MB minimal write chunk size
|
* 4MB minimal write chunk size
|
||||||
|
|
|
@ -754,21 +754,10 @@ static void balance_dirty_pages(struct address_space *mapping,
|
||||||
* 200ms is typically more than enough to curb heavy dirtiers;
|
* 200ms is typically more than enough to curb heavy dirtiers;
|
||||||
* (b) the pause time limit makes the dirtiers more responsive.
|
* (b) the pause time limit makes the dirtiers more responsive.
|
||||||
*/
|
*/
|
||||||
if (nr_dirty < dirty_thresh +
|
if (nr_dirty < dirty_thresh &&
|
||||||
dirty_thresh / DIRTY_MAXPAUSE_AREA &&
|
bdi_dirty < (task_bdi_thresh + bdi_thresh) / 2 &&
|
||||||
time_after(jiffies, start_time + MAX_PAUSE))
|
time_after(jiffies, start_time + MAX_PAUSE))
|
||||||
break;
|
break;
|
||||||
/*
|
|
||||||
* pass-good area. When some bdi gets blocked (eg. NFS server
|
|
||||||
* not responding), or write bandwidth dropped dramatically due
|
|
||||||
* to concurrent reads, or dirty threshold suddenly dropped and
|
|
||||||
* the dirty pages cannot be brought down anytime soon (eg. on
|
|
||||||
* slow USB stick), at least let go of the good bdi's.
|
|
||||||
*/
|
|
||||||
if (nr_dirty < dirty_thresh +
|
|
||||||
dirty_thresh / DIRTY_PASSGOOD_AREA &&
|
|
||||||
bdi_dirty < bdi_thresh)
|
|
||||||
break;
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Increase the delay for each loop, up to our previous
|
* Increase the delay for each loop, up to our previous
|
||||||
|
|
Loading…
Reference in New Issue