Remember page_cgroup is on active_list or not in page_cgroup->flags. Against 2.6.23-mm1. Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx> Signed-off-by: YAMAMOTO Takashi <yamamoto@xxxxxxxxxxxxx> mm/memcontrol.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) Index: devel-2.6.23-mm1/mm/memcontrol.c =================================================================== --- devel-2.6.23-mm1.orig/mm/memcontrol.c +++ devel-2.6.23-mm1/mm/memcontrol.c @@ -85,6 +85,7 @@ struct page_cgroup { /* mapped and cached states */ int flags; #define PCGF_PAGECACHE (0x1) /* charged as page-cache */ +#define PCGF_ACTIVE (0x2) /* this is on cgroup's active list */ }; enum { @@ -208,10 +209,13 @@ clear_page_cgroup(struct page *page, str static void __mem_cgroup_move_lists(struct page_cgroup *pc, bool active) { - if (active) + if (active) { + pc->flags |= PCGF_ACTIVE; list_move(&pc->lru, &pc->mem_cgroup->active_list); - else + } else { + pc->flags &= ~PCGF_ACTIVE; list_move(&pc->lru, &pc->mem_cgroup->inactive_list); + } } int task_in_mem_cgroup(struct task_struct *task, const struct mem_cgroup *mem) @@ -421,9 +425,9 @@ noreclaim: pc->mem_cgroup = mem; pc->page = page; if (is_cache) - pc->flags = PCGF_PAGECACHE; + pc->flags = PCGF_PAGECACHE | PCGF_ACTIVE; else - pc->flags = 0; + pc->flags = PCGF_ACTIVE; if (page_cgroup_assign_new_page_cgroup(page, pc)) { /* * an another charge is added to this page already. _______________________________________________ Containers mailing list Containers@xxxxxxxxxxxxxxxxxxxxxxxxxx https://lists.linux-foundation.org/mailman/listinfo/containers