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>
This commit is contained in:
committed by
Linus Torvalds
parent
b95a2f2d48
commit
6290df5458
10
mm/vmscan.c
10
mm/vmscan.c
@@ -1250,8 +1250,8 @@ static unsigned long isolate_pages_global(unsigned long nr,
|
||||
lru += LRU_ACTIVE;
|
||||
if (file)
|
||||
lru += LRU_FILE;
|
||||
return isolate_lru_pages(nr, &z->lru[lru].list, dst, scanned, order,
|
||||
mode, file);
|
||||
return isolate_lru_pages(nr, &z->lruvec.lists[lru], dst,
|
||||
scanned, order, mode, file);
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -1630,7 +1630,7 @@ static void move_active_pages_to_lru(struct zone *zone,
|
||||
VM_BUG_ON(PageLRU(page));
|
||||
SetPageLRU(page);
|
||||
|
||||
list_move(&page->lru, &zone->lru[lru].list);
|
||||
list_move(&page->lru, &zone->lruvec.lists[lru]);
|
||||
mem_cgroup_add_lru_list(page, lru);
|
||||
pgmoved += hpage_nr_pages(page);
|
||||
|
||||
@@ -3448,7 +3448,7 @@ retry:
|
||||
enum lru_list l = page_lru_base_type(page);
|
||||
|
||||
__dec_zone_state(zone, NR_UNEVICTABLE);
|
||||
list_move(&page->lru, &zone->lru[l].list);
|
||||
list_move(&page->lru, &zone->lruvec.lists[l]);
|
||||
mem_cgroup_move_lists(page, LRU_UNEVICTABLE, l);
|
||||
__inc_zone_state(zone, NR_INACTIVE_ANON + l);
|
||||
__count_vm_event(UNEVICTABLE_PGRESCUED);
|
||||
@@ -3457,7 +3457,7 @@ retry:
|
||||
* rotate unevictable list
|
||||
*/
|
||||
SetPageUnevictable(page);
|
||||
list_move(&page->lru, &zone->lru[LRU_UNEVICTABLE].list);
|
||||
list_move(&page->lru, &zone->lruvec.lists[LRU_UNEVICTABLE]);
|
||||
mem_cgroup_rotate_lru_list(page, LRU_UNEVICTABLE);
|
||||
if (page_evictable(page, NULL))
|
||||
goto retry;
|
||||
|
Reference in New Issue
Block a user