leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] mm: make shrink_all_memory try harder

Browse Source 
Make shrink_all_memory() repeat the attempts to free more memory if there
seems to be no pages to free.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Cc: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Rafael J. Wysocki 2006-03-22 00:09:04 -08:00 committed by Linus Torvalds
parent d5d4b0aa4e
commit 248a0301e7
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mm/vmscan.c
View File

@ -33,6 +33,7 @@
#include <linux/cpuset.h> #include <linux/cpuset.h>
#include <linux/notifier.h> #include <linux/notifier.h>
#include <linux/rwsem.h> #include <linux/rwsem.h>
#include <linux/delay.h>
#include <asm/tlbflush.h> #include <asm/tlbflush.h>
#include <asm/div64.h> #include <asm/div64.h>
@ -1784,11 +1785,13 @@ unsigned long shrink_all_memory(unsigned long nr_pages)
pg_data_t *pgdat; pg_data_t *pgdat;
unsigned long nr_to_free = nr_pages; unsigned long nr_to_free = nr_pages;
unsigned long ret = 0; unsigned long ret = 0;
unsigned retry = 2;
struct reclaim_state reclaim_state = { struct reclaim_state reclaim_state = {
.reclaimed_slab = 0, .reclaimed_slab = 0,
}; };
current->reclaim_state = &reclaim_state; current->reclaim_state = &reclaim_state;
repeat:
for_each_pgdat(pgdat) { for_each_pgdat(pgdat) {
unsigned long freed; unsigned long freed;
@ -1798,6 +1801,10 @@ unsigned long shrink_all_memory(unsigned long nr_pages)
if ((long)nr_to_free <= 0) if ((long)nr_to_free <= 0)
break; break;
} }
if (retry-- && ret < nr_pages) {
blk_congestion_wait(WRITE, HZ/5);
goto repeat;
}
current->reclaim_state = NULL; current->reclaim_state = NULL;
return ret; return ret;
} }