mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 03:27:44 -04:00
[PATCH] throttle_vm_writeout(): don't loop on GFP_NOFS and GFP_NOIO allocations
throttle_vm_writeout() is designed to wait for the dirty levels to subside. But if the caller holds IO or FS locks, we might be holding up that writeout. So change it to take a single nap to give other devices a chance to clean some memory, then return. Cc: Nick Piggin <[email protected]> Cc: OGAWA Hirofumi <[email protected]> Cc: Kumar Gala <[email protected]> Cc: Pete Zaitcev <[email protected]> Cc: <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
parent
b1a316f6f9
commit
232ea4d69d
3 changed files with 13 additions and 4 deletions
|
|
@ -296,11 +296,21 @@ void balance_dirty_pages_ratelimited_nr(struct address_space *mapping,
|
|||
}
|
||||
EXPORT_SYMBOL(balance_dirty_pages_ratelimited_nr);
|
||||
|
||||
void throttle_vm_writeout(void)
|
||||
void throttle_vm_writeout(gfp_t gfp_mask)
|
||||
{
|
||||
long background_thresh;
|
||||
long dirty_thresh;
|
||||
|
||||
if ((gfp_mask & (__GFP_FS|__GFP_IO)) != (__GFP_FS|__GFP_IO)) {
|
||||
/*
|
||||
* The caller might hold locks which can prevent IO completion
|
||||
* or progress in the filesystem. So we cannot just sit here
|
||||
* waiting for IO to complete.
|
||||
*/
|
||||
congestion_wait(WRITE, HZ/10);
|
||||
return;
|
||||
}
|
||||
|
||||
for ( ; ; ) {
|
||||
get_dirty_limits(&background_thresh, &dirty_thresh, NULL);
|
||||
|
||||
|
|
@ -317,7 +327,6 @@ void throttle_vm_writeout(void)
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* writeback at least _min_pages, and keep writing until the amount of dirty
|
||||
* memory is less than the background threshold, or until we're all clean.
|
||||
|
|
|
|||
Loading…
Reference in a new issue