Commit ff7283fa3a66823933991ad55a558a3a01d5ab27
Committed by
Linus Torvalds
Linus Torvalds
1 parent
ae41be3742
Exists in
master
and in
4 other branches
bugfix for memory cgroup controller: avoid !PageLRU page in mem_cgroup_isolate_pages
This patch makes mem_cgroup_isolate_pages() to be
- ignore !PageLRU pages.
- fixes the bug that isolation makes no progress if page_zone(page) != zone
page once find. (just increment scan in this case.)
kswapd and memory migration removes a page from list when it handles
a page for reclaiming/migration.
Because __isolate_lru_page() doesn't moves page !PageLRU pages, it will
be safe to avoid touching !PageLRU() page and its page_cgroup.
Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: 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>
Showing 1 changed file with 10 additions and 3 deletions Side-by-side Diff
mm/memcontrol.c
| ... | ... | @@ -250,7 +250,7 @@ |
| 250 | 250 | unsigned long scan; |
| 251 | 251 | LIST_HEAD(pc_list); |
| 252 | 252 | struct list_head *src; |
| 253 | - struct page_cgroup *pc; | |
| 253 | + struct page_cgroup *pc, *tmp; | |
| 254 | 254 | |
| 255 | 255 | if (active) |
| 256 | 256 | src = &mem_cont->active_list; |
| 257 | 257 | |
| ... | ... | @@ -258,10 +258,17 @@ |
| 258 | 258 | src = &mem_cont->inactive_list; |
| 259 | 259 | |
| 260 | 260 | spin_lock(&mem_cont->lru_lock); |
| 261 | - for (scan = 0; scan < nr_to_scan && !list_empty(src); scan++) { | |
| 262 | - pc = list_entry(src->prev, struct page_cgroup, lru); | |
| 261 | + scan = 0; | |
| 262 | + list_for_each_entry_safe_reverse(pc, tmp, src, lru) { | |
| 263 | + if (scan++ > nr_to_scan) | |
| 264 | + break; | |
| 263 | 265 | page = pc->page; |
| 264 | 266 | VM_BUG_ON(!pc); |
| 267 | + | |
| 268 | + if (unlikely(!PageLRU(page))) { | |
| 269 | + scan--; | |
| 270 | + continue; | |
| 271 | + } | |
| 265 | 272 | |
| 266 | 273 | if (PageActive(page) && !active) { |
| 267 | 274 | __mem_cgroup_move_lists(pc, true); |