summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWu Fengguang <fengguang.wu@intel.com>2009-10-26 16:49:53 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2009-11-09 16:23:05 -0800
commit94f48f549e455e4abbb3f0d6e65185830cbec8f1 (patch)
tree69ec9b645ea8dc731dfd2dac69567653569c8608
parent781e844b1db70e0fe4911fa049e675a010d79cf9 (diff)
downloadlwn-94f48f549e455e4abbb3f0d6e65185830cbec8f1.tar.gz
lwn-94f48f549e455e4abbb3f0d6e65185830cbec8f1.zip
vmscan: limit VM_EXEC protection to file pages
commit 41e20983fe553b39bc2b00e07c7a379f0c86a4bc upstream. It is possible to have !Anon but SwapBacked pages, and some apps could create huge number of such pages with MAP_SHARED|MAP_ANONYMOUS. These pages go into the ANON lru list, and hence shall not be protected: we only care mapped executable files. Failing to do so may trigger OOM. Tested-by: Christian Borntraeger <borntraeger@de.ibm.com> Reviewed-by: Rik van Riel <riel@redhat.com> Signed-off-by: Wu Fengguang <fengguang.wu@intel.com> Cc: Hugh Dickins <hugh.dickins@tiscali.co.uk> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--mm/vmscan.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/vmscan.c b/mm/vmscan.c
index 94e86dd6954c..95f35a7d1f05 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -1298,7 +1298,7 @@ static void shrink_active_list(unsigned long nr_pages, struct zone *zone,
* IO, plus JVM can create lots of anon VM_EXEC pages,
* so we ignore them here.
*/
- if ((vm_flags & VM_EXEC) && !PageAnon(page)) {
+ if ((vm_flags & VM_EXEC) && page_is_file_cache(page)) {
list_add(&page->lru, &l_active);
continue;
}