Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 308895
b: refs/heads/master
c: 89abfab
h: refs/heads/master
i:
  308893: 59abce5
  308891: e11c72a
  308887: 9730c5e
  308879: 805c72a
  308863: 60a4fa2
v: v3
  • Loading branch information
Hugh Dickins authored and Linus Torvalds committed May 29, 2012
1 parent 70eca32 commit 6050aa0
Show file tree
Hide file tree
Showing 7 changed files with 31 additions and 63 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c3c787e8c38557ccf44c670d73aebe630a2b1479
refs/heads/master: 89abfab133ef1f5902abafb744df72793213ac19
9 changes: 0 additions & 9 deletions trunk/include/linux/memcontrol.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,6 @@ int mem_cgroup_inactive_file_is_low(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,
int nid, int zid, unsigned int lrumask);
struct zone_reclaim_stat *mem_cgroup_get_reclaim_stat(struct mem_cgroup *memcg,
struct zone *zone);
struct zone_reclaim_stat*
mem_cgroup_get_reclaim_stat_from_page(struct page *page);
extern void mem_cgroup_print_oom_info(struct mem_cgroup *memcg,
Expand Down Expand Up @@ -356,13 +354,6 @@ mem_cgroup_zone_nr_lru_pages(struct mem_cgroup *memcg, int nid, int zid,
return 0;
}


static inline struct zone_reclaim_stat*
mem_cgroup_get_reclaim_stat(struct mem_cgroup *memcg, struct zone *zone)
{
return NULL;
}

static inline struct zone_reclaim_stat*
mem_cgroup_get_reclaim_stat_from_page(struct page *page)
{
Expand Down
29 changes: 14 additions & 15 deletions trunk/include/linux/mmzone.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -185,8 +185,22 @@ static inline int is_unevictable_lru(enum lru_list lru)
return (lru == LRU_UNEVICTABLE);
}

struct zone_reclaim_stat {
/*
* The pageout code in vmscan.c keeps track of how many of the
* mem/swap backed and file backed pages are refeferenced.
* The higher the rotated/scanned ratio, the more valuable
* that cache is.
*
* The anon LRU stats live in [0], file LRU stats in [1]
*/
unsigned long recent_rotated[2];
unsigned long recent_scanned[2];
};

struct lruvec {
struct list_head lists[NR_LRU_LISTS];
struct zone_reclaim_stat reclaim_stat;
};

/* Mask used at gathering information at once (see memcontrol.c) */
Expand Down Expand Up @@ -313,19 +327,6 @@ enum zone_type {
#error ZONES_SHIFT -- too many zones configured adjust calculation
#endif

struct zone_reclaim_stat {
/*
* The pageout code in vmscan.c keeps track of how many of the
* mem/swap backed and file backed pages are refeferenced.
* The higher the rotated/scanned ratio, the more valuable
* that cache is.
*
* The anon LRU stats live in [0], file LRU stats in [1]
*/
unsigned long recent_rotated[2];
unsigned long recent_scanned[2];
};

struct zone {
/* Fields commonly accessed by the page allocator */

Expand Down Expand Up @@ -407,8 +408,6 @@ struct zone {
spinlock_t lru_lock;
struct lruvec lruvec;

struct zone_reclaim_stat reclaim_stat;

unsigned long pages_scanned; /* since last reclaim */
unsigned long flags; /* zone flags, see below */

Expand Down
27 changes: 7 additions & 20 deletions trunk/mm/memcontrol.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,6 @@ struct mem_cgroup_per_zone {

struct mem_cgroup_reclaim_iter reclaim_iter[DEF_PRIORITY + 1];

struct zone_reclaim_stat reclaim_stat;
struct rb_node tree_node; /* RB tree node */
unsigned long long usage_in_excess;/* Set to the value by which */
/* the soft limit is exceeded*/
Expand Down Expand Up @@ -1243,16 +1242,6 @@ int mem_cgroup_inactive_file_is_low(struct mem_cgroup *memcg, struct zone *zone)
return (active > inactive);
}

struct zone_reclaim_stat *mem_cgroup_get_reclaim_stat(struct mem_cgroup *memcg,
struct zone *zone)
{
int nid = zone_to_nid(zone);
int zid = zone_idx(zone);
struct mem_cgroup_per_zone *mz = mem_cgroup_zoneinfo(memcg, nid, zid);

return &mz->reclaim_stat;
}

struct zone_reclaim_stat *
mem_cgroup_get_reclaim_stat_from_page(struct page *page)
{
Expand All @@ -1268,7 +1257,7 @@ mem_cgroup_get_reclaim_stat_from_page(struct page *page)
/* Ensure pc->mem_cgroup is visible after reading PCG_USED. */
smp_rmb();
mz = page_cgroup_zoneinfo(pc->mem_cgroup, page);
return &mz->reclaim_stat;
return &mz->lruvec.reclaim_stat;
}

#define mem_cgroup_from_res_counter(counter, member) \
Expand Down Expand Up @@ -4216,21 +4205,19 @@ static int mem_control_stat_show(struct cgroup *cont, struct cftype *cft,
{
int nid, zid;
struct mem_cgroup_per_zone *mz;
struct zone_reclaim_stat *rstat;
unsigned long recent_rotated[2] = {0, 0};
unsigned long recent_scanned[2] = {0, 0};

for_each_online_node(nid)
for (zid = 0; zid < MAX_NR_ZONES; zid++) {
mz = mem_cgroup_zoneinfo(memcg, nid, zid);
rstat = &mz->lruvec.reclaim_stat;

recent_rotated[0] +=
mz->reclaim_stat.recent_rotated[0];
recent_rotated[1] +=
mz->reclaim_stat.recent_rotated[1];
recent_scanned[0] +=
mz->reclaim_stat.recent_scanned[0];
recent_scanned[1] +=
mz->reclaim_stat.recent_scanned[1];
recent_rotated[0] += rstat->recent_rotated[0];
recent_rotated[1] += rstat->recent_rotated[1];
recent_scanned[0] += rstat->recent_scanned[0];
recent_scanned[1] += rstat->recent_scanned[1];
}
cb->fill(cb, "recent_rotated_anon", recent_rotated[0]);
cb->fill(cb, "recent_rotated_file", recent_rotated[1]);
Expand Down
8 changes: 4 additions & 4 deletions trunk/mm/page_alloc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4410,10 +4410,10 @@ static void __paginginit free_area_init_core(struct pglist_data *pgdat,
zone_pcp_init(zone);
for_each_lru(lru)
INIT_LIST_HEAD(&zone->lruvec.lists[lru]);
zone->reclaim_stat.recent_rotated[0] = 0;
zone->reclaim_stat.recent_rotated[1] = 0;
zone->reclaim_stat.recent_scanned[0] = 0;
zone->reclaim_stat.recent_scanned[1] = 0;
zone->lruvec.reclaim_stat.recent_rotated[0] = 0;
zone->lruvec.reclaim_stat.recent_rotated[1] = 0;
zone->lruvec.reclaim_stat.recent_scanned[0] = 0;
zone->lruvec.reclaim_stat.recent_scanned[1] = 0;
zap_zone_vm_stats(zone);
zone->flags = 0;
if (!size)
Expand Down
14 changes: 4 additions & 10 deletions trunk/mm/swap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -312,21 +312,15 @@ void rotate_reclaimable_page(struct page *page)
static void update_page_reclaim_stat(struct zone *zone, struct page *page,
int file, int rotated)
{
struct zone_reclaim_stat *reclaim_stat = &zone->reclaim_stat;
struct zone_reclaim_stat *memcg_reclaim_stat;
struct zone_reclaim_stat *reclaim_stat;

memcg_reclaim_stat = mem_cgroup_get_reclaim_stat_from_page(page);
reclaim_stat = mem_cgroup_get_reclaim_stat_from_page(page);
if (!reclaim_stat)
reclaim_stat = &zone->lruvec.reclaim_stat;

reclaim_stat->recent_scanned[file]++;
if (rotated)
reclaim_stat->recent_rotated[file]++;

if (!memcg_reclaim_stat)
return;

memcg_reclaim_stat->recent_scanned[file]++;
if (rotated)
memcg_reclaim_stat->recent_rotated[file]++;
}

static void __activate_page(struct page *page, void *arg)
Expand Down
5 changes: 1 addition & 4 deletions trunk/mm/vmscan.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,10 +149,7 @@ static bool global_reclaim(struct scan_control *sc)

static struct zone_reclaim_stat *get_reclaim_stat(struct mem_cgroup_zone *mz)
{
if (!mem_cgroup_disabled())
return mem_cgroup_get_reclaim_stat(mz->mem_cgroup, mz->zone);

return &mz->zone->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,
Expand Down

0 comments on commit 6050aa0

Please sign in to comment.