Messages in this thread | | | Date | Fri, 12 Jun 2009 11:40:32 +0900 | From | Daisuke Nishimura <> | Subject | Re: [BUGFIX][PATCH] memcg fix lru rotation in isolate_pages v2 |
| |
On Fri, 12 Jun 2009 10:28:21 +0900, KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> wrote: > From: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> > > This patch tries to fix memcg's lru rotation sanity...make memcg use > the same logic as global LRU does. > > Now, at __isolate_lru_page() retruns -EBUSY, the page is rotated to > the tail of LRU in global LRU's isolate LRU pages. But in memcg, > it's not handled. This makes memcg do the same behavior as global LRU > and rotate LRU in the page is busy. > > Changelog: v1->v2 > - adjusted to new beas patch. > > Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> > Looks good to me.
Reviewed-by: Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp>
> --- > Index: lumpy-reclaim-trial/mm/vmscan.c > =================================================================== > --- lumpy-reclaim-trial.orig/mm/vmscan.c > +++ lumpy-reclaim-trial/mm/vmscan.c > @@ -844,7 +844,6 @@ int __isolate_lru_page(struct page *page > */ > ClearPageLRU(page); > ret = 0; > - mem_cgroup_del_lru(page); > } > > return ret; > @@ -892,12 +891,14 @@ static unsigned long isolate_lru_pages(u > switch (__isolate_lru_page(page, mode, file)) { > case 0: > list_move(&page->lru, dst); > + mem_cgroup_del_lru(page); > nr_taken++; > break; > > case -EBUSY: > /* else it is being freed elsewhere */ > list_move(&page->lru, src); > + mem_cgroup_rotate_lru_list(page, page_lru(page)); > continue; > > default: > @@ -938,6 +939,7 @@ static unsigned long isolate_lru_pages(u > continue; > if (__isolate_lru_page(cursor_page, mode, file) == 0) { > list_move(&cursor_page->lru, dst); > + mem_cgroup_del_lru(page); > nr_taken++; > scan++; > } > Index: lumpy-reclaim-trial/mm/memcontrol.c > =================================================================== > --- lumpy-reclaim-trial.orig/mm/memcontrol.c > +++ lumpy-reclaim-trial/mm/memcontrol.c > @@ -649,6 +649,7 @@ unsigned long mem_cgroup_isolate_pages(u > int zid = zone_idx(z); > struct mem_cgroup_per_zone *mz; > int lru = LRU_FILE * !!file + !!active; > + int ret; > > BUG_ON(!mem_cont); > mz = mem_cgroup_zoneinfo(mem_cont, nid, zid); > @@ -666,9 +667,19 @@ unsigned long mem_cgroup_isolate_pages(u > continue; > > scan++; > - if (__isolate_lru_page(page, mode, file) == 0) { > + ret = __isolate_lru_page(page, mode, file); > + switch (ret) { > + case 0: > list_move(&page->lru, dst); > + mem_cgroup_del_lru(page); > nr_taken++; > + break; > + case -EBUSY: > + /* we don't affect global LRU but rotate in our LRU */ > + mem_cgroup_rotate_lru_list(page, page_lru(page)); > + break; > + default: > + break; > } > } > >
| |