mm: collect LRU list heads into struct lruvec

Having a unified structure with a LRU list set for both global zones and
per-memcg zones allows to keep that code simple which deals with LRU
lists and does not care about the container itself.

Once the per-memcg LRU lists directly link struct pages, the isolation
function and all other list manipulations are shared between the memcg
case and the global LRU case.

Signed-off-by: Johannes Weiner <jweiner@redhat.com>
Reviewed-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Reviewed-by: Michal Hocko <mhocko@suse.cz>
Reviewed-by: Kirill A. Shutemov <kirill@shutemov.name>
Cc: Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp>
Cc: Balbir Singh <bsingharora@gmail.com>
Cc: Ying Han <yinghan@google.com>
Cc: Greg Thelen <gthelen@google.com>
Cc: Michel Lespinasse <walken@google.com>
Cc: Rik van Riel <riel@redhat.com>
Cc: Minchan Kim <minchan.kim@gmail.com>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: Hugh Dickins <hughd@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 5 insertions, 6 deletions

diff --git a/mm/swap.c b/mm/swap.c
index 67a09a633a09..76ef79d3857c 100644
--- a/mm/swap.c
+++ b/mm/swap.c
@@ -236,7 +236,7 @@ static void pagevec_move_tail_fn(struct page *page, void *arg)
 
         if (PageLRU(page) && !PageActive(page) && !PageUnevictable(page)) {
                 enum lru_list lru = page_lru_base_type(page);
-                list_move_tail(&page->lru, &zone->lru[lru].list);
+                list_move_tail(&page->lru, &zone->lruvec.lists[lru]);
                 mem_cgroup_rotate_reclaimable_page(page);
                 (*pgmoved)++;
         }
@@ -480,7 +480,7 @@ static void lru_deactivate_fn(struct page *page, void *arg)
                  * The page's writeback ends up during pagevec
                  * We moves tha page into tail of inactive.
                  */
-                list_move_tail(&page->lru, &zone->lru[lru].list);
+                list_move_tail(&page->lru, &zone->lruvec.lists[lru]);
                 mem_cgroup_rotate_reclaimable_page(page);
                 __count_vm_event(PGROTATED);
         }
@@ -654,7 +654,6 @@ void lru_add_page_tail(struct zone* zone,
         int active;
         enum lru_list lru;
         const int file = 0;
-        struct list_head *head;
 
         VM_BUG_ON(!PageHead(page));
         VM_BUG_ON(PageCompound(page_tail));
@@ -674,10 +673,10 @@ void lru_add_page_tail(struct zone* zone,
                 }
                 update_page_reclaim_stat(zone, page_tail, file, active);
                 if (likely(PageLRU(page)))
-                        head = page->lru.prev;
+                        __add_page_to_lru_list(zone, page_tail, lru,
+                                               page->lru.prev);
                 else
-                        head = &zone->lru[lru].list;
-                __add_page_to_lru_list(zone, page_tail, lru, head);
+                        add_page_to_lru_list(zone, page_tail, lru);
         } else {
                 SetPageUnevictable(page_tail);
                 add_page_to_lru_list(zone, page_tail, LRU_UNEVICTABLE);