mm/vmscan: replace zone_nr_lru_pages() with get_lruvec_size()
If memory cgroup is enabled we always use lruvecs which are embedded into struct mem_cgroup_per_zone, so we can reach lru_size counters via container_of(). Signed-off-by: Konstantin Khlebnikov <khlebnikov@openvz.org> Cc: Mel Gorman <mel@csn.ul.ie> Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> Acked-by: 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:
parent
27ac81d85e
commit
074291fea8
|
@ -123,8 +123,7 @@ int mem_cgroup_inactive_anon_is_low(struct mem_cgroup *memcg,
|
||||||
int mem_cgroup_inactive_file_is_low(struct mem_cgroup *memcg,
|
int mem_cgroup_inactive_file_is_low(struct mem_cgroup *memcg,
|
||||||
struct zone *zone);
|
struct zone *zone);
|
||||||
int mem_cgroup_select_victim_node(struct mem_cgroup *memcg);
|
int mem_cgroup_select_victim_node(struct mem_cgroup *memcg);
|
||||||
unsigned long mem_cgroup_zone_nr_lru_pages(struct mem_cgroup *memcg,
|
unsigned long mem_cgroup_get_lruvec_size(struct lruvec *lruvec, enum lru_list);
|
||||||
int nid, int zid, unsigned int lrumask);
|
|
||||||
struct zone_reclaim_stat*
|
struct zone_reclaim_stat*
|
||||||
mem_cgroup_get_reclaim_stat_from_page(struct page *page);
|
mem_cgroup_get_reclaim_stat_from_page(struct page *page);
|
||||||
extern void mem_cgroup_print_oom_info(struct mem_cgroup *memcg,
|
extern void mem_cgroup_print_oom_info(struct mem_cgroup *memcg,
|
||||||
|
@ -343,8 +342,7 @@ mem_cgroup_inactive_file_is_low(struct mem_cgroup *memcg, struct zone *zone)
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline unsigned long
|
static inline unsigned long
|
||||||
mem_cgroup_zone_nr_lru_pages(struct mem_cgroup *memcg, int nid, int zid,
|
mem_cgroup_get_lruvec_size(struct lruvec *lruvec, enum lru_list lru)
|
||||||
unsigned int lru_mask)
|
|
||||||
{
|
{
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -723,6 +723,15 @@ static void mem_cgroup_charge_statistics(struct mem_cgroup *memcg,
|
||||||
}
|
}
|
||||||
|
|
||||||
unsigned long
|
unsigned long
|
||||||
|
mem_cgroup_get_lruvec_size(struct lruvec *lruvec, enum lru_list lru)
|
||||||
|
{
|
||||||
|
struct mem_cgroup_per_zone *mz;
|
||||||
|
|
||||||
|
mz = container_of(lruvec, struct mem_cgroup_per_zone, lruvec);
|
||||||
|
return mz->lru_size[lru];
|
||||||
|
}
|
||||||
|
|
||||||
|
static unsigned long
|
||||||
mem_cgroup_zone_nr_lru_pages(struct mem_cgroup *memcg, int nid, int zid,
|
mem_cgroup_zone_nr_lru_pages(struct mem_cgroup *memcg, int nid, int zid,
|
||||||
unsigned int lru_mask)
|
unsigned int lru_mask)
|
||||||
{
|
{
|
||||||
|
|
31
mm/vmscan.c
31
mm/vmscan.c
|
@ -155,19 +155,14 @@ static struct zone_reclaim_stat *get_reclaim_stat(struct mem_cgroup_zone *mz)
|
||||||
return &mem_cgroup_zone_lruvec(mz->zone, mz->mem_cgroup)->reclaim_stat;
|
return &mem_cgroup_zone_lruvec(mz->zone, mz->mem_cgroup)->reclaim_stat;
|
||||||
}
|
}
|
||||||
|
|
||||||
static unsigned long zone_nr_lru_pages(struct mem_cgroup_zone *mz,
|
static unsigned long get_lruvec_size(struct lruvec *lruvec, enum lru_list lru)
|
||||||
enum lru_list lru)
|
|
||||||
{
|
{
|
||||||
if (!mem_cgroup_disabled())
|
if (!mem_cgroup_disabled())
|
||||||
return mem_cgroup_zone_nr_lru_pages(mz->mem_cgroup,
|
return mem_cgroup_get_lruvec_size(lruvec, lru);
|
||||||
zone_to_nid(mz->zone),
|
|
||||||
zone_idx(mz->zone),
|
|
||||||
BIT(lru));
|
|
||||||
|
|
||||||
return zone_page_state(mz->zone, NR_LRU_BASE + lru);
|
return zone_page_state(lruvec_zone(lruvec), NR_LRU_BASE + lru);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Add a shrinker callback to be called from the vm
|
* Add a shrinker callback to be called from the vm
|
||||||
*/
|
*/
|
||||||
|
@ -1603,6 +1598,9 @@ static void get_scan_count(struct mem_cgroup_zone *mz, struct scan_control *sc,
|
||||||
enum lru_list lru;
|
enum lru_list lru;
|
||||||
int noswap = 0;
|
int noswap = 0;
|
||||||
bool force_scan = false;
|
bool force_scan = false;
|
||||||
|
struct lruvec *lruvec;
|
||||||
|
|
||||||
|
lruvec = mem_cgroup_zone_lruvec(mz->zone, mz->mem_cgroup);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* If the zone or memcg is small, nr[l] can be 0. This
|
* If the zone or memcg is small, nr[l] can be 0. This
|
||||||
|
@ -1628,10 +1626,10 @@ static void get_scan_count(struct mem_cgroup_zone *mz, struct scan_control *sc,
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
|
|
||||||
anon = zone_nr_lru_pages(mz, LRU_ACTIVE_ANON) +
|
anon = get_lruvec_size(lruvec, LRU_ACTIVE_ANON) +
|
||||||
zone_nr_lru_pages(mz, LRU_INACTIVE_ANON);
|
get_lruvec_size(lruvec, LRU_INACTIVE_ANON);
|
||||||
file = zone_nr_lru_pages(mz, LRU_ACTIVE_FILE) +
|
file = get_lruvec_size(lruvec, LRU_ACTIVE_FILE) +
|
||||||
zone_nr_lru_pages(mz, LRU_INACTIVE_FILE);
|
get_lruvec_size(lruvec, LRU_INACTIVE_FILE);
|
||||||
|
|
||||||
if (global_reclaim(sc)) {
|
if (global_reclaim(sc)) {
|
||||||
free = zone_page_state(mz->zone, NR_FREE_PAGES);
|
free = zone_page_state(mz->zone, NR_FREE_PAGES);
|
||||||
|
@ -1694,7 +1692,7 @@ out:
|
||||||
int file = is_file_lru(lru);
|
int file = is_file_lru(lru);
|
||||||
unsigned long scan;
|
unsigned long scan;
|
||||||
|
|
||||||
scan = zone_nr_lru_pages(mz, lru);
|
scan = get_lruvec_size(lruvec, lru);
|
||||||
if (sc->priority || noswap || !vmscan_swappiness(sc)) {
|
if (sc->priority || noswap || !vmscan_swappiness(sc)) {
|
||||||
scan >>= sc->priority;
|
scan >>= sc->priority;
|
||||||
if (!scan && force_scan)
|
if (!scan && force_scan)
|
||||||
|
@ -1730,6 +1728,7 @@ static inline bool should_continue_reclaim(struct mem_cgroup_zone *mz,
|
||||||
{
|
{
|
||||||
unsigned long pages_for_compaction;
|
unsigned long pages_for_compaction;
|
||||||
unsigned long inactive_lru_pages;
|
unsigned long inactive_lru_pages;
|
||||||
|
struct lruvec *lruvec;
|
||||||
|
|
||||||
/* If not in reclaim/compaction mode, stop */
|
/* If not in reclaim/compaction mode, stop */
|
||||||
if (!in_reclaim_compaction(sc))
|
if (!in_reclaim_compaction(sc))
|
||||||
|
@ -1762,10 +1761,12 @@ static inline bool should_continue_reclaim(struct mem_cgroup_zone *mz,
|
||||||
* If we have not reclaimed enough pages for compaction and the
|
* If we have not reclaimed enough pages for compaction and the
|
||||||
* inactive lists are large enough, continue reclaiming
|
* inactive lists are large enough, continue reclaiming
|
||||||
*/
|
*/
|
||||||
|
lruvec = mem_cgroup_zone_lruvec(mz->zone, mz->mem_cgroup);
|
||||||
pages_for_compaction = (2UL << sc->order);
|
pages_for_compaction = (2UL << sc->order);
|
||||||
inactive_lru_pages = zone_nr_lru_pages(mz, LRU_INACTIVE_FILE);
|
inactive_lru_pages = get_lruvec_size(lruvec, LRU_INACTIVE_FILE);
|
||||||
if (nr_swap_pages > 0)
|
if (nr_swap_pages > 0)
|
||||||
inactive_lru_pages += zone_nr_lru_pages(mz, LRU_INACTIVE_ANON);
|
inactive_lru_pages += get_lruvec_size(lruvec,
|
||||||
|
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;
|
||||||
|
|
Loading…
Reference in New Issue