OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mm: vmscan: distinguish between memcg triggering reclaim and memcg being scanned 

Memory cgroup hierarchies are currently handled completely outside of
the traditional reclaim code, which is invoked with a single memory
cgroup as an argument for the whole call stack.

Subsequent patches will switch this code to do hierarchical reclaim, so
there needs to be a distinction between a) the memory cgroup that is
triggering reclaim due to hitting its limit and b) the memory cgroup
that is being scanned as a child of a).

This patch introduces a struct mem_cgroup_zone that contains the
combination of the memory cgroup and the zone being scanned, which is
then passed down the stack instead of the zone argument.

[akpm@linux-foundation.org: coding-style fixes]
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:
Johannes Weiner 2012-01-12 17:17:52 -08:00 committed by Linus Torvalds
parent 89b5fae536
commit f16015fbf2
1 changed files with 141 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

249
mm/vmscan.c
View File

@ -103,8 +103,11 @@ struct scan_control {
*/ */
reclaim_mode_t reclaim_mode; reclaim_mode_t reclaim_mode;
/* Which cgroup do we reclaim from */ /*
struct mem_cgroup *mem_cgroup; * The memory cgroup that hit its limit and as a result is the
* primary target of this reclaim invocation.
*/
struct mem_cgroup *target_mem_cgroup;
/* /*
* Nodemask of nodes allowed by the caller. If NULL, all nodes * Nodemask of nodes allowed by the caller. If NULL, all nodes
@ -113,6 +116,11 @@ struct scan_control {
nodemask_t *nodemask; nodemask_t *nodemask;
}; };
struct mem_cgroup_zone {
struct mem_cgroup *mem_cgroup;
struct zone *zone;
};
#define lru_to_page(_head) (list_entry((_head)->prev, struct page, lru)) #define lru_to_page(_head) (list_entry((_head)->prev, struct page, lru))
#ifdef ARCH_HAS_PREFETCH #ifdef ARCH_HAS_PREFETCH
@ -155,12 +163,12 @@ static DECLARE_RWSEM(shrinker_rwsem);
#ifdef CONFIG_CGROUP_MEM_RES_CTLR #ifdef CONFIG_CGROUP_MEM_RES_CTLR
static bool global_reclaim(struct scan_control *sc) static bool global_reclaim(struct scan_control *sc)
{ {
return !sc->mem_cgroup; return !sc->target_mem_cgroup;
} }
static bool scanning_global_lru(struct scan_control *sc) static bool scanning_global_lru(struct mem_cgroup_zone *mz)
{ {
return !sc->mem_cgroup; return !mz->mem_cgroup;
} }
#else #else
static bool global_reclaim(struct scan_control *sc) static bool global_reclaim(struct scan_control *sc)
@ -168,29 +176,30 @@ static bool global_reclaim(struct scan_control *sc)
return true; return true;
} }
static bool scanning_global_lru(struct scan_control *sc) static bool scanning_global_lru(struct mem_cgroup_zone *mz)
{ {
return true; return true;
} }
#endif #endif
static struct zone_reclaim_stat *get_reclaim_stat(struct zone *zone, static struct zone_reclaim_stat *get_reclaim_stat(struct mem_cgroup_zone *mz)
struct scan_control *sc)
{ {
if (!scanning_global_lru(sc)) if (!scanning_global_lru(mz))
return mem_cgroup_get_reclaim_stat(sc->mem_cgroup, zone); return mem_cgroup_get_reclaim_stat(mz->mem_cgroup, mz->zone);
return &zone->reclaim_stat; return &mz->zone->reclaim_stat;
} }
static unsigned long zone_nr_lru_pages(struct zone *zone, static unsigned long zone_nr_lru_pages(struct mem_cgroup_zone *mz,
struct scan_control *sc, enum lru_list lru) enum lru_list lru)
{ {
if (!scanning_global_lru(sc)) if (!scanning_global_lru(mz))
return mem_cgroup_zone_nr_lru_pages(sc->mem_cgroup, return mem_cgroup_zone_nr_lru_pages(mz->mem_cgroup,
zone_to_nid(zone), zone_idx(zone), BIT(lru)); zone_to_nid(mz->zone),
zone_idx(mz->zone),
BIT(lru));
return zone_page_state(zone, NR_LRU_BASE + lru); return zone_page_state(mz->zone, NR_LRU_BASE + lru);
} }
@ -693,12 +702,13 @@ enum page_references {
}; };
static enum page_references page_check_references(struct page *page, static enum page_references page_check_references(struct page *page,
struct mem_cgroup_zone *mz,
struct scan_control *sc) struct scan_control *sc)
{ {
int referenced_ptes, referenced_page; int referenced_ptes, referenced_page;
unsigned long vm_flags; unsigned long vm_flags;
referenced_ptes = page_referenced(page, 1, sc->mem_cgroup, &vm_flags); referenced_ptes = page_referenced(page, 1, mz->mem_cgroup, &vm_flags);
referenced_page = TestClearPageReferenced(page); referenced_page = TestClearPageReferenced(page);
/* Lumpy reclaim - ignore references */ /* Lumpy reclaim - ignore references */
@ -754,7 +764,7 @@ static enum page_references page_check_references(struct page *page,
* shrink_page_list() returns the number of reclaimed pages * shrink_page_list() returns the number of reclaimed pages
*/ */
static unsigned long shrink_page_list(struct list_head *page_list, static unsigned long shrink_page_list(struct list_head *page_list,
struct zone *zone, struct mem_cgroup_zone *mz,
struct scan_control *sc, struct scan_control *sc,
int priority, int priority,
unsigned long *ret_nr_dirty, unsigned long *ret_nr_dirty,
@ -785,7 +795,7 @@ static unsigned long shrink_page_list(struct list_head *page_list,
goto keep; goto keep;
VM_BUG_ON(PageActive(page)); VM_BUG_ON(PageActive(page));
VM_BUG_ON(page_zone(page) != zone); VM_BUG_ON(page_zone(page) != mz->zone);
sc->nr_scanned++; sc->nr_scanned++;
@ -819,7 +829,7 @@ static unsigned long shrink_page_list(struct list_head *page_list,
} }
} }
references = page_check_references(page, sc); references = page_check_references(page, mz, sc);
switch (references) { switch (references) {
case PAGEREF_ACTIVATE: case PAGEREF_ACTIVATE:
goto activate_locked; goto activate_locked;
@ -1011,7 +1021,7 @@ keep_lumpy:
* will encounter the same problem * will encounter the same problem
*/ */
if (nr_dirty && nr_dirty == nr_congested && global_reclaim(sc)) if (nr_dirty && nr_dirty == nr_congested && global_reclaim(sc))
zone_set_flag(zone, ZONE_CONGESTED); zone_set_flag(mz->zone, ZONE_CONGESTED);
free_hot_cold_page_list(&free_pages, 1); free_hot_cold_page_list(&free_pages, 1);
@ -1347,13 +1357,14 @@ static int too_many_isolated(struct zone *zone, int file,
* TODO: Try merging with migrations version of putback_lru_pages * TODO: Try merging with migrations version of putback_lru_pages
*/ */
static noinline_for_stack void static noinline_for_stack void
putback_lru_pages(struct zone *zone, struct scan_control *sc, putback_lru_pages(struct mem_cgroup_zone *mz, struct scan_control *sc,
unsigned long nr_anon, unsigned long nr_file, unsigned long nr_anon, unsigned long nr_file,
struct list_head *page_list) struct list_head *page_list)
{ {
struct page *page; struct page *page;
struct pagevec pvec; struct pagevec pvec;
struct zone_reclaim_stat *reclaim_stat = get_reclaim_stat(zone, sc); struct zone *zone = mz->zone;
struct zone_reclaim_stat *reclaim_stat = get_reclaim_stat(mz);
pagevec_init(&pvec, 1); pagevec_init(&pvec, 1);
@ -1393,15 +1404,17 @@ putback_lru_pages(struct zone *zone, struct scan_control *sc,
pagevec_release(&pvec); pagevec_release(&pvec);
} }
static noinline_for_stack void update_isolated_counts(struct zone *zone, static noinline_for_stack void
struct scan_control *sc, update_isolated_counts(struct mem_cgroup_zone *mz,
unsigned long *nr_anon, struct scan_control *sc,
unsigned long *nr_file, unsigned long *nr_anon,
struct list_head *isolated_list) unsigned long *nr_file,
struct list_head *isolated_list)
{ {
unsigned long nr_active; unsigned long nr_active;
struct zone *zone = mz->zone;
unsigned int count[NR_LRU_LISTS] = { 0, }; unsigned int count[NR_LRU_LISTS] = { 0, };
struct zone_reclaim_stat *reclaim_stat = get_reclaim_stat(zone, sc); struct zone_reclaim_stat *reclaim_stat = get_reclaim_stat(mz);
nr_active = clear_active_flags(isolated_list, count); nr_active = clear_active_flags(isolated_list, count);
__count_vm_events(PGDEACTIVATE, nr_active); __count_vm_events(PGDEACTIVATE, nr_active);
@ -1470,8 +1483,8 @@ static inline bool should_reclaim_stall(unsigned long nr_taken,
* of reclaimed pages * of reclaimed pages
*/ */
static noinline_for_stack unsigned long static noinline_for_stack unsigned long
shrink_inactive_list(unsigned long nr_to_scan, struct zone *zone, shrink_inactive_list(unsigned long nr_to_scan, struct mem_cgroup_zone *mz,
struct scan_control *sc, int priority, int file) struct scan_control *sc, int priority, int file)
{ {
LIST_HEAD(page_list); LIST_HEAD(page_list);
unsigned long nr_scanned; unsigned long nr_scanned;
@ -1482,6 +1495,7 @@ shrink_inactive_list(unsigned long nr_to_scan, struct zone *zone,
unsigned long nr_dirty = 0; unsigned long nr_dirty = 0;
unsigned long nr_writeback = 0; unsigned long nr_writeback = 0;
isolate_mode_t reclaim_mode = ISOLATE_INACTIVE; isolate_mode_t reclaim_mode = ISOLATE_INACTIVE;
struct zone *zone = mz->zone;
while (unlikely(too_many_isolated(zone, file, sc))) { while (unlikely(too_many_isolated(zone, file, sc))) {
congestion_wait(BLK_RW_ASYNC, HZ/10); congestion_wait(BLK_RW_ASYNC, HZ/10);
@ -1504,13 +1518,13 @@ shrink_inactive_list(unsigned long nr_to_scan, struct zone *zone,
spin_lock_irq(&zone->lru_lock); spin_lock_irq(&zone->lru_lock);
if (scanning_global_lru(sc)) { if (scanning_global_lru(mz)) {
nr_taken = isolate_pages_global(nr_to_scan, &page_list, nr_taken = isolate_pages_global(nr_to_scan, &page_list,
&nr_scanned, sc->order, reclaim_mode, zone, 0, file); &nr_scanned, sc->order, reclaim_mode, zone, 0, file);
} else { } else {
nr_taken = mem_cgroup_isolate_pages(nr_to_scan, &page_list, nr_taken = mem_cgroup_isolate_pages(nr_to_scan, &page_list,
&nr_scanned, sc->order, reclaim_mode, zone, &nr_scanned, sc->order, reclaim_mode, zone,
sc->mem_cgroup, 0, file); mz->mem_cgroup, 0, file);
} }
if (global_reclaim(sc)) { if (global_reclaim(sc)) {
zone->pages_scanned += nr_scanned; zone->pages_scanned += nr_scanned;
@ -1527,17 +1541,17 @@ shrink_inactive_list(unsigned long nr_to_scan, struct zone *zone,
return 0; return 0;
} }
update_isolated_counts(zone, sc, &nr_anon, &nr_file, &page_list); update_isolated_counts(mz, sc, &nr_anon, &nr_file, &page_list);
spin_unlock_irq(&zone->lru_lock); spin_unlock_irq(&zone->lru_lock);
nr_reclaimed = shrink_page_list(&page_list, zone, sc, priority, nr_reclaimed = shrink_page_list(&page_list, mz, sc, priority,
&nr_dirty, &nr_writeback); &nr_dirty, &nr_writeback);
/* Check if we should syncronously wait for writeback */ /* Check if we should syncronously wait for writeback */
if (should_reclaim_stall(nr_taken, nr_reclaimed, priority, sc)) { if (should_reclaim_stall(nr_taken, nr_reclaimed, priority, sc)) {
set_reclaim_mode(priority, sc, true); set_reclaim_mode(priority, sc, true);
nr_reclaimed += shrink_page_list(&page_list, zone, sc, nr_reclaimed += shrink_page_list(&page_list, mz, sc,
priority, &nr_dirty, &nr_writeback); priority, &nr_dirty, &nr_writeback);
} }
@ -1546,7 +1560,7 @@ shrink_inactive_list(unsigned long nr_to_scan, struct zone *zone,
__count_vm_events(KSWAPD_STEAL, nr_reclaimed); __count_vm_events(KSWAPD_STEAL, nr_reclaimed);
__count_zone_vm_events(PGSTEAL, zone, nr_reclaimed); __count_zone_vm_events(PGSTEAL, zone, nr_reclaimed);
putback_lru_pages(zone, sc, nr_anon, nr_file, &page_list); putback_lru_pages(mz, sc, nr_anon, nr_file, &page_list);
/* /*
* If reclaim is isolating dirty pages under writeback, it implies * If reclaim is isolating dirty pages under writeback, it implies
@ -1633,8 +1647,10 @@ static void move_active_pages_to_lru(struct zone *zone,
__count_vm_events(PGDEACTIVATE, pgmoved); __count_vm_events(PGDEACTIVATE, pgmoved);
} }
static void shrink_active_list(unsigned long nr_pages, struct zone *zone, static void shrink_active_list(unsigned long nr_pages,
struct scan_control *sc, int priority, int file) struct mem_cgroup_zone *mz,
struct scan_control *sc,
int priority, int file)
{ {
unsigned long nr_taken; unsigned long nr_taken;
unsigned long pgscanned; unsigned long pgscanned;
@ -1643,9 +1659,10 @@ static void shrink_active_list(unsigned long nr_pages, struct zone *zone,
LIST_HEAD(l_active); LIST_HEAD(l_active);
LIST_HEAD(l_inactive); LIST_HEAD(l_inactive);
struct page *page; struct page *page;
struct zone_reclaim_stat *reclaim_stat = get_reclaim_stat(zone, sc); struct zone_reclaim_stat *reclaim_stat = get_reclaim_stat(mz);
unsigned long nr_rotated = 0; unsigned long nr_rotated = 0;
isolate_mode_t reclaim_mode = ISOLATE_ACTIVE; isolate_mode_t reclaim_mode = ISOLATE_ACTIVE;
struct zone *zone = mz->zone;
lru_add_drain(); lru_add_drain();
@ -1655,7 +1672,7 @@ static void shrink_active_list(unsigned long nr_pages, struct zone *zone,
reclaim_mode |= ISOLATE_CLEAN; reclaim_mode |= ISOLATE_CLEAN;
spin_lock_irq(&zone->lru_lock); spin_lock_irq(&zone->lru_lock);
if (scanning_global_lru(sc)) { if (scanning_global_lru(mz)) {
nr_taken = isolate_pages_global(nr_pages, &l_hold, nr_taken = isolate_pages_global(nr_pages, &l_hold,
&pgscanned, sc->order, &pgscanned, sc->order,
reclaim_mode, zone, reclaim_mode, zone,
@ -1664,7 +1681,7 @@ static void shrink_active_list(unsigned long nr_pages, struct zone *zone,
nr_taken = mem_cgroup_isolate_pages(nr_pages, &l_hold, nr_taken = mem_cgroup_isolate_pages(nr_pages, &l_hold,
&pgscanned, sc->order, &pgscanned, sc->order,
reclaim_mode, zone, reclaim_mode, zone,
sc->mem_cgroup, 1, file); mz->mem_cgroup, 1, file);
} }
if (global_reclaim(sc)) if (global_reclaim(sc))
@ -1690,7 +1707,7 @@ static void shrink_active_list(unsigned long nr_pages, struct zone *zone,
continue; continue;
} }
if (page_referenced(page, 0, sc->mem_cgroup, &vm_flags)) { if (page_referenced(page, 0, mz->mem_cgroup, &vm_flags)) {
nr_rotated += hpage_nr_pages(page); nr_rotated += hpage_nr_pages(page);
/* /*
* Identify referenced, file-backed active pages and * Identify referenced, file-backed active pages and
@ -1753,10 +1770,8 @@ static int inactive_anon_is_low_global(struct zone *zone)
* Returns true if the zone does not have enough inactive anon pages, * Returns true if the zone does not have enough inactive anon pages,
* meaning some active anon pages need to be deactivated. * meaning some active anon pages need to be deactivated.
*/ */
static int inactive_anon_is_low(struct zone *zone, struct scan_control *sc) static int inactive_anon_is_low(struct mem_cgroup_zone *mz)
{ {
int low;
/* /*
* If we don't have swap space, anonymous page deactivation * If we don't have swap space, anonymous page deactivation
* is pointless. * is pointless.
@ -1764,15 +1779,14 @@ static int inactive_anon_is_low(struct zone *zone, struct scan_control *sc)
if (!total_swap_pages) if (!total_swap_pages)
return 0; return 0;
if (scanning_global_lru(sc)) if (!scanning_global_lru(mz))
low = inactive_anon_is_low_global(zone); return mem_cgroup_inactive_anon_is_low(mz->mem_cgroup,
else mz->zone);
low = mem_cgroup_inactive_anon_is_low(sc->mem_cgroup, zone);
return low; return inactive_anon_is_low_global(mz->zone);
} }
#else #else
static inline int inactive_anon_is_low(struct zone *zone, static inline int inactive_anon_is_low(struct mem_cgroup_zone *mz)
struct scan_control *sc)
{ {
return 0; return 0;
} }
@ -1790,8 +1804,7 @@ static int inactive_file_is_low_global(struct zone *zone)
/** /**
* inactive_file_is_low - check if file pages need to be deactivated * inactive_file_is_low - check if file pages need to be deactivated
* @zone: zone to check * @mz: memory cgroup and zone to check
* @sc: scan control of this context
* *
* When the system is doing streaming IO, memory pressure here * When the system is doing streaming IO, memory pressure here
* ensures that active file pages get deactivated, until more * ensures that active file pages get deactivated, until more
@ -1803,45 +1816,44 @@ static int inactive_file_is_low_global(struct zone *zone)
* This uses a different ratio than the anonymous pages, because * This uses a different ratio than the anonymous pages, because
* the page cache uses a use-once replacement algorithm. * the page cache uses a use-once replacement algorithm.
*/ */
static int inactive_file_is_low(struct zone *zone, struct scan_control *sc) static int inactive_file_is_low(struct mem_cgroup_zone *mz)
{ {
int low; if (!scanning_global_lru(mz))
return mem_cgroup_inactive_file_is_low(mz->mem_cgroup,
mz->zone);
if (scanning_global_lru(sc)) return inactive_file_is_low_global(mz->zone);
low = inactive_file_is_low_global(zone);
else
low = mem_cgroup_inactive_file_is_low(sc->mem_cgroup, zone);
return low;
} }
static int inactive_list_is_low(struct zone *zone, struct scan_control *sc, static int inactive_list_is_low(struct mem_cgroup_zone *mz, int file)
int file)
{ {
if (file) if (file)
return inactive_file_is_low(zone, sc); return inactive_file_is_low(mz);
else else
return inactive_anon_is_low(zone, sc); return inactive_anon_is_low(mz);
} }
static unsigned long shrink_list(enum lru_list lru, unsigned long nr_to_scan, static unsigned long shrink_list(enum lru_list lru, unsigned long nr_to_scan,
struct zone *zone, struct scan_control *sc, int priority) struct mem_cgroup_zone *mz,
struct scan_control *sc, int priority)
{ {
int file = is_file_lru(lru); int file = is_file_lru(lru);
if (is_active_lru(lru)) { if (is_active_lru(lru)) {
if (inactive_list_is_low(zone, sc, file)) if (inactive_list_is_low(mz, file))
shrink_active_list(nr_to_scan, zone, sc, priority, file); shrink_active_list(nr_to_scan, mz, sc, priority, file);
return 0; return 0;
} }
return shrink_inactive_list(nr_to_scan, zone, sc, priority, file); return shrink_inactive_list(nr_to_scan, mz, sc, priority, file);
} }
static int vmscan_swappiness(struct scan_control *sc) static int vmscan_swappiness(struct mem_cgroup_zone *mz,
struct scan_control *sc)
{ {
if (global_reclaim(sc)) if (global_reclaim(sc))
return vm_swappiness; return vm_swappiness;
return mem_cgroup_swappiness(sc->mem_cgroup); return mem_cgroup_swappiness(mz->mem_cgroup);
} }
/* /*
@ -1852,13 +1864,13 @@ static int vmscan_swappiness(struct scan_control *sc)
* *
* nr[0] = anon pages to scan; nr[1] = file pages to scan * nr[0] = anon pages to scan; nr[1] = file pages to scan
*/ */
static void get_scan_count(struct zone *zone, struct scan_control *sc, static void get_scan_count(struct mem_cgroup_zone *mz, struct scan_control *sc,
unsigned long *nr, int priority) unsigned long *nr, int priority)
{ {
unsigned long anon, file, free; unsigned long anon, file, free;
unsigned long anon_prio, file_prio; unsigned long anon_prio, file_prio;
unsigned long ap, fp; unsigned long ap, fp;
struct zone_reclaim_stat *reclaim_stat = get_reclaim_stat(zone, sc); struct zone_reclaim_stat *reclaim_stat = get_reclaim_stat(mz);
u64 fraction[2], denominator; u64 fraction[2], denominator;
enum lru_list l; enum lru_list l;
int noswap = 0; int noswap = 0;
@ -1888,16 +1900,16 @@ static void get_scan_count(struct zone *zone, struct scan_control *sc,
goto out; goto out;
} }
anon = zone_nr_lru_pages(zone, sc, LRU_ACTIVE_ANON) + anon = zone_nr_lru_pages(mz, LRU_ACTIVE_ANON) +
zone_nr_lru_pages(zone, sc, LRU_INACTIVE_ANON); zone_nr_lru_pages(mz, LRU_INACTIVE_ANON);
file = zone_nr_lru_pages(zone, sc, LRU_ACTIVE_FILE) + file = zone_nr_lru_pages(mz, LRU_ACTIVE_FILE) +
zone_nr_lru_pages(zone, sc, LRU_INACTIVE_FILE); zone_nr_lru_pages(mz, LRU_INACTIVE_FILE);
if (global_reclaim(sc)) { if (global_reclaim(sc)) {
free = zone_page_state(zone, NR_FREE_PAGES); free = zone_page_state(mz->zone, NR_FREE_PAGES);
/* If we have very few page cache pages, /* If we have very few page cache pages,
force-scan anon pages. */ force-scan anon pages. */
if (unlikely(file + free <= high_wmark_pages(zone))) { if (unlikely(file + free <= high_wmark_pages(mz->zone))) {
fraction[0] = 1; fraction[0] = 1;
fraction[1] = 0; fraction[1] = 0;
denominator = 1; denominator = 1;
@ -1909,8 +1921,8 @@ static void get_scan_count(struct zone *zone, struct scan_control *sc,
* With swappiness at 100, anonymous and file have the same priority. * With swappiness at 100, anonymous and file have the same priority.
* This scanning priority is essentially the inverse of IO cost. * This scanning priority is essentially the inverse of IO cost.
*/ */
anon_prio = vmscan_swappiness(sc); anon_prio = vmscan_swappiness(mz, sc);
file_prio = 200 - vmscan_swappiness(sc); file_prio = 200 - vmscan_swappiness(mz, sc);
/* /*
* OK, so we have swap space and a fair amount of page cache * OK, so we have swap space and a fair amount of page cache
@ -1923,7 +1935,7 @@ static void get_scan_count(struct zone *zone, struct scan_control *sc,
* *
* anon in [0], file in [1] * anon in [0], file in [1]
*/ */
spin_lock_irq(&zone->lru_lock); spin_lock_irq(&mz->zone->lru_lock);
if (unlikely(reclaim_stat->recent_scanned[0] > anon / 4)) { if (unlikely(reclaim_stat->recent_scanned[0] > anon / 4)) {
reclaim_stat->recent_scanned[0] /= 2; reclaim_stat->recent_scanned[0] /= 2;
reclaim_stat->recent_rotated[0] /= 2; reclaim_stat->recent_rotated[0] /= 2;
@ -1944,7 +1956,7 @@ static void get_scan_count(struct zone *zone, struct scan_control *sc,
fp = (file_prio + 1) * (reclaim_stat->recent_scanned[1] + 1); fp = (file_prio + 1) * (reclaim_stat->recent_scanned[1] + 1);
fp /= reclaim_stat->recent_rotated[1] + 1; fp /= reclaim_stat->recent_rotated[1] + 1;
spin_unlock_irq(&zone->lru_lock); spin_unlock_irq(&mz->zone->lru_lock);
fraction[0] = ap; fraction[0] = ap;
fraction[1] = fp; fraction[1] = fp;
@ -1954,7 +1966,7 @@ out:
int file = is_file_lru(l); int file = is_file_lru(l);
unsigned long scan; unsigned long scan;
scan = zone_nr_lru_pages(zone, sc, l); scan = zone_nr_lru_pages(mz, l);
if (priority || noswap) { if (priority || noswap) {
scan >>= priority; scan >>= priority;
if (!scan && force_scan) if (!scan && force_scan)
@ -1972,7 +1984,7 @@ out:
* back to the allocator and call try_to_compact_zone(), we ensure that * back to the allocator and call try_to_compact_zone(), we ensure that
* there are enough free pages for it to be likely successful * there are enough free pages for it to be likely successful
*/ */
static inline bool should_continue_reclaim(struct zone *zone, static inline bool should_continue_reclaim(struct mem_cgroup_zone *mz,
unsigned long nr_reclaimed, unsigned long nr_reclaimed,
unsigned long nr_scanned, unsigned long nr_scanned,
struct scan_control *sc) struct scan_control *sc)
@ -2012,15 +2024,15 @@ static inline bool should_continue_reclaim(struct zone *zone,
* inactive lists are large enough, continue reclaiming * inactive lists are large enough, continue reclaiming
*/ */
pages_for_compaction = (2UL << sc->order); pages_for_compaction = (2UL << sc->order);
inactive_lru_pages = zone_nr_lru_pages(zone, sc, LRU_INACTIVE_FILE); inactive_lru_pages = zone_nr_lru_pages(mz, LRU_INACTIVE_FILE);
if (nr_swap_pages > 0) if (nr_swap_pages > 0)
inactive_lru_pages += zone_nr_lru_pages(zone, sc, LRU_INACTIVE_ANON); inactive_lru_pages += zone_nr_lru_pages(mz, LRU_INACTIVE_ANON);
if (sc->nr_reclaimed < pages_for_compaction && if (sc->nr_reclaimed < pages_for_compaction &&
inactive_lru_pages > pages_for_compaction) inactive_lru_pages > pages_for_compaction)
return true; return true;
/* If compaction would go ahead or the allocation would succeed, stop */ /* If compaction would go ahead or the allocation would succeed, stop */
switch (compaction_suitable(zone, sc->order)) { switch (compaction_suitable(mz->zone, sc->order)) {
case COMPACT_PARTIAL: case COMPACT_PARTIAL:
case COMPACT_CONTINUE: case COMPACT_CONTINUE:
return false; return false;
@ -2032,8 +2044,8 @@ static inline bool should_continue_reclaim(struct zone *zone,
/* /*
* This is a basic per-zone page freer. Used by both kswapd and direct reclaim. * This is a basic per-zone page freer. Used by both kswapd and direct reclaim.
*/ */
static void shrink_zone(int priority, struct zone *zone, static void shrink_mem_cgroup_zone(int priority, struct mem_cgroup_zone *mz,
struct scan_control *sc) struct scan_control *sc)
{ {
unsigned long nr[NR_LRU_LISTS]; unsigned long nr[NR_LRU_LISTS];
unsigned long nr_to_scan; unsigned long nr_to_scan;
@ -2045,7 +2057,7 @@ static void shrink_zone(int priority, struct zone *zone,
restart: restart:
nr_reclaimed = 0; nr_reclaimed = 0;
nr_scanned = sc->nr_scanned; nr_scanned = sc->nr_scanned;
get_scan_count(zone, sc, nr, priority); get_scan_count(mz, sc, nr, priority);
blk_start_plug(&plug); blk_start_plug(&plug);
while (nr[LRU_INACTIVE_ANON] || nr[LRU_ACTIVE_FILE] || while (nr[LRU_INACTIVE_ANON] || nr[LRU_ACTIVE_FILE] ||
@ -2057,7 +2069,7 @@ restart:
nr[l] -= nr_to_scan; nr[l] -= nr_to_scan;
nr_reclaimed += shrink_list(l, nr_to_scan, nr_reclaimed += shrink_list(l, nr_to_scan,
zone, sc, priority); mz, sc, priority);
} }
} }
/* /*
@ -2078,17 +2090,28 @@ restart:
* Even if we did not try to evict anon pages at all, we want to * Even if we did not try to evict anon pages at all, we want to
* rebalance the anon lru active/inactive ratio. * rebalance the anon lru active/inactive ratio.
*/ */
if (inactive_anon_is_low(zone, sc)) if (inactive_anon_is_low(mz))
shrink_active_list(SWAP_CLUSTER_MAX, zone, sc, priority, 0); shrink_active_list(SWAP_CLUSTER_MAX, mz, sc, priority, 0);
/* reclaim/compaction might need reclaim to continue */ /* reclaim/compaction might need reclaim to continue */
if (should_continue_reclaim(zone, nr_reclaimed, if (should_continue_reclaim(mz, nr_reclaimed,
sc->nr_scanned - nr_scanned, sc)) sc->nr_scanned - nr_scanned, sc))
goto restart; goto restart;
throttle_vm_writeout(sc->gfp_mask); throttle_vm_writeout(sc->gfp_mask);
} }
static void shrink_zone(int priority, struct zone *zone,
struct scan_control *sc)
{
struct mem_cgroup_zone mz = {
.mem_cgroup = sc->target_mem_cgroup,
.zone = zone,
};
shrink_mem_cgroup_zone(priority, &mz, sc);
}
/* /*
* This is the direct reclaim path, for page-allocating processes. We only * This is the direct reclaim path, for page-allocating processes. We only
* try to reclaim pages from zones which will satisfy the caller's allocation * try to reclaim pages from zones which will satisfy the caller's allocation
@ -2230,7 +2253,7 @@ static unsigned long do_try_to_free_pages(struct zonelist *zonelist,
for (priority = DEF_PRIORITY; priority >= 0; priority--) { for (priority = DEF_PRIORITY; priority >= 0; priority--) {
sc->nr_scanned = 0; sc->nr_scanned = 0;
if (!priority) if (!priority)
disable_swap_token(sc->mem_cgroup); disable_swap_token(sc->target_mem_cgroup);
if (shrink_zones(priority, zonelist, sc)) if (shrink_zones(priority, zonelist, sc))
break; break;
@ -2317,7 +2340,7 @@ unsigned long try_to_free_pages(struct zonelist *zonelist, int order,
.may_unmap = 1, .may_unmap = 1,
.may_swap = 1, .may_swap = 1,
.order = order, .order = order,
.mem_cgroup = NULL, .target_mem_cgroup = NULL,
.nodemask = nodemask, .nodemask = nodemask,
}; };
struct shrink_control shrink = { struct shrink_control shrink = {
@ -2349,7 +2372,7 @@ unsigned long mem_cgroup_shrink_node_zone(struct mem_cgroup *mem,
.may_unmap = 1, .may_unmap = 1,
.may_swap = !noswap, .may_swap = !noswap,
.order = 0, .order = 0,
.mem_cgroup = mem, .target_mem_cgroup = mem,
}; };
sc.gfp_mask = (gfp_mask & GFP_RECLAIM_MASK) | sc.gfp_mask = (gfp_mask & GFP_RECLAIM_MASK) |
@ -2387,7 +2410,7 @@ unsigned long try_to_free_mem_cgroup_pages(struct mem_cgroup *mem_cont,
.may_swap = !noswap, .may_swap = !noswap,
.nr_to_reclaim = SWAP_CLUSTER_MAX, .nr_to_reclaim = SWAP_CLUSTER_MAX,
.order = 0, .order = 0,
.mem_cgroup = mem_cont, .target_mem_cgroup = mem_cont,
.nodemask = NULL, /* we don't care the placement */ .nodemask = NULL, /* we don't care the placement */
.gfp_mask = (gfp_mask & GFP_RECLAIM_MASK) | .gfp_mask = (gfp_mask & GFP_RECLAIM_MASK) |
(GFP_HIGHUSER_MOVABLE & ~GFP_RECLAIM_MASK), (GFP_HIGHUSER_MOVABLE & ~GFP_RECLAIM_MASK),
@ -2417,6 +2440,18 @@ unsigned long try_to_free_mem_cgroup_pages(struct mem_cgroup *mem_cont,
} }
#endif #endif
static void age_active_anon(struct zone *zone, struct scan_control *sc,
int priority)
{
struct mem_cgroup_zone mz = {
.mem_cgroup = NULL,
.zone = zone,
};
if (inactive_anon_is_low(&mz))
shrink_active_list(SWAP_CLUSTER_MAX, &mz, sc, priority, 0);
}
/* /*
* pgdat_balanced is used when checking if a node is balanced for high-order * pgdat_balanced is used when checking if a node is balanced for high-order
* allocations. Only zones that meet watermarks and are in a zone allowed * allocations. Only zones that meet watermarks and are in a zone allowed
@ -2537,7 +2572,7 @@ static unsigned long balance_pgdat(pg_data_t *pgdat, int order,
*/ */
.nr_to_reclaim = ULONG_MAX, .nr_to_reclaim = ULONG_MAX,
.order = order, .order = order,
.mem_cgroup = NULL, .target_mem_cgroup = NULL,
}; };
struct shrink_control shrink = { struct shrink_control shrink = {
.gfp_mask = sc.gfp_mask, .gfp_mask = sc.gfp_mask,
@ -2576,9 +2611,7 @@ loop_again:
* Do some background aging of the anon list, to give * Do some background aging of the anon list, to give
* pages a chance to be referenced before reclaiming. * pages a chance to be referenced before reclaiming.
*/ */
if (inactive_anon_is_low(zone, &sc)) age_active_anon(zone, &sc, priority);
shrink_active_list(SWAP_CLUSTER_MAX, zone,
&sc, priority, 0);
if (!zone_watermark_ok_safe(zone, order, if (!zone_watermark_ok_safe(zone, order,
high_wmark_pages(zone), 0, 0)) { high_wmark_pages(zone), 0, 0)) {