diff options
author | Balbir Singh <balbir@linux.vnet.ibm.com> | 2008-02-07 03:14:01 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-07 11:42:19 -0500 |
commit | bed7161a519a2faef53e1bce1b47595e297c1d14 (patch) | |
tree | fbc0541340465f7d83221b829a9382cac2855916 /mm/vmscan.c | |
parent | 8697d33194faae6fdd6b2e799f6308aa00cfdf67 (diff) |
Memory controller: make page_referenced() cgroup aware
Make page_referenced() cgroup aware. Without this patch, page_referenced()
can cause a page to be skipped while reclaiming pages. This patch ensures
that other cgroups do not hold pages in a particular cgroup hostage. It
is required to ensure that shared pages are freed from a cgroup when they
are not actively referenced from the cgroup that brought them in
Signed-off-by: Balbir Singh <balbir@linux.vnet.ibm.com>
Cc: Pavel Emelianov <xemul@openvz.org>
Cc: Paul Menage <menage@google.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Nick Piggin <nickpiggin@yahoo.com.au>
Cc: Kirill Korotaev <dev@sw.ru>
Cc: Herbert Poetzl <herbert@13thfloor.at>
Cc: David Rientjes <rientjes@google.com>
Cc: Vaidyanathan Srinivasan <svaidy@linux.vnet.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/vmscan.c')
-rw-r--r-- | mm/vmscan.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/vmscan.c b/mm/vmscan.c index 7408a8a7d882..215f6a726b2f 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c | |||
@@ -503,7 +503,7 @@ static unsigned long shrink_page_list(struct list_head *page_list, | |||
503 | goto keep_locked; | 503 | goto keep_locked; |
504 | } | 504 | } |
505 | 505 | ||
506 | referenced = page_referenced(page, 1); | 506 | referenced = page_referenced(page, 1, sc->mem_cgroup); |
507 | /* In active use or really unfreeable? Activate it. */ | 507 | /* In active use or really unfreeable? Activate it. */ |
508 | if (sc->order <= PAGE_ALLOC_COSTLY_ORDER && | 508 | if (sc->order <= PAGE_ALLOC_COSTLY_ORDER && |
509 | referenced && page_mapping_inuse(page)) | 509 | referenced && page_mapping_inuse(page)) |
@@ -1057,7 +1057,7 @@ force_reclaim_mapped: | |||
1057 | if (page_mapped(page)) { | 1057 | if (page_mapped(page)) { |
1058 | if (!reclaim_mapped || | 1058 | if (!reclaim_mapped || |
1059 | (total_swap_pages == 0 && PageAnon(page)) || | 1059 | (total_swap_pages == 0 && PageAnon(page)) || |
1060 | page_referenced(page, 0)) { | 1060 | page_referenced(page, 0, sc->mem_cgroup)) { |
1061 | list_add(&page->lru, &l_active); | 1061 | list_add(&page->lru, &l_active); |
1062 | continue; | 1062 | continue; |
1063 | } | 1063 | } |