Commit:     ff7283fa3a66823933991ad55a558a3a01d5ab27
Parent:     ae41be374293e70e1ed441d986afcc6e744ef9d9
Author:     KAMEZAWA Hiroyuki <[EMAIL PROTECTED]>
AuthorDate: Thu Feb 7 00:14:11 2008 -0800
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Thu Feb 7 08:42:20 2008 -0800

    bugfix for memory cgroup controller: avoid !PageLRU page in 
    This patch makes mem_cgroup_isolate_pages() to be
      - ignore !PageLRU pages.
      - fixes the bug that isolation makes no progress if page_zone(page) != 
        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 <[EMAIL PROTECTED]>
    Cc: Balbir Singh <[EMAIL PROTECTED]>
    Cc: Pavel Emelianov <[EMAIL PROTECTED]>
    Cc: Paul Menage <[EMAIL PROTECTED]>
    Cc: Peter Zijlstra <[EMAIL PROTECTED]>
    Cc: "Eric W. Biederman" <[EMAIL PROTECTED]>
    Cc: Nick Piggin <[EMAIL PROTECTED]>
    Cc: Kirill Korotaev <[EMAIL PROTECTED]>
    Cc: Herbert Poetzl <[EMAIL PROTECTED]>
    Cc: David Rientjes <[EMAIL PROTECTED]>
    Cc: Vaidyanathan Srinivasan <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
 mm/memcontrol.c |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 128f45c..e8493fb 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -250,7 +250,7 @@ unsigned long mem_cgroup_isolate_pages(unsigned long 
        unsigned long scan;
        struct list_head *src;
-       struct page_cgroup *pc;
+       struct page_cgroup *pc, *tmp;
        if (active)
                src = &mem_cont->active_list;
@@ -258,11 +258,18 @@ unsigned long mem_cgroup_isolate_pages(unsigned long 
                src = &mem_cont->inactive_list;
-       for (scan = 0; scan < nr_to_scan && !list_empty(src); scan++) {
-               pc = list_entry(src->prev, struct page_cgroup, lru);
+       scan = 0;
+       list_for_each_entry_safe_reverse(pc, tmp, src, lru) {
+               if (scan++ > nr_to_scan)
+                       break;
                page = pc->page;
+               if (unlikely(!PageLRU(page))) {
+                       scan--;
+                       continue;
+               }
                if (PageActive(page) && !active) {
                        __mem_cgroup_move_lists(pc, true);
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to