On Tue, 28 Feb 2012 21:30:17 -0800 (PST) Hugh Dickins <hughd@xxxxxxxxxx> wrote: > Swapping tmpfs loads show absurd wrapped rss and wrong cache in memcg's > memory.stat statistics: __mem_cgroup_uncharge_common() is failing to > distinguish the anon and tmpfs cases. > I thought I tested this..maybe my test was wrong, sorry. > Mostly we can decide between them by PageAnon, which is reliable once > it has been set; but there are several callers who need to uncharge a > MEM_CGROUP_CHARGE_TYPE_MAPPED page before it was fully initialized, > so allow that case to override the PageAnon decision. > > Signed-off-by: Hugh Dickins <hughd@xxxxxxxxxx> > --- Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx> It seems I should revisit these and consinder some cleanup... _OFF TOPIC_ To be honest, I don't like to have anon/rss counter in memory.stat because we have LRU statistics. It seems enough.. If shmem counter is required, I think we should have shmem counter rather than anon/rss. > > mm/memcontrol.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > --- 3.3-rc5-next/mm/memcontrol.c 2012-02-25 10:06:52.496035568 -0800 > +++ linux/mm/memcontrol.c 2012-02-26 10:44:32.146365398 -0800 > @@ -2944,13 +2944,16 @@ __mem_cgroup_uncharge_common(struct page > if (!PageCgroupUsed(pc)) > goto unlock_out; > > + anon = PageAnon(page); > + > switch (ctype) { > case MEM_CGROUP_CHARGE_TYPE_MAPPED: > + anon = true; > + /* fallthrough */ > case MEM_CGROUP_CHARGE_TYPE_DROP: > /* See mem_cgroup_prepare_migration() */ > if (page_mapped(page) || PageCgroupMigration(pc)) > goto unlock_out; > - anon = true; > break; > case MEM_CGROUP_CHARGE_TYPE_SWAPOUT: > if (!PageAnon(page)) { /* Shared memory */ > @@ -2958,10 +2961,8 @@ __mem_cgroup_uncharge_common(struct page > goto unlock_out; > } else if (page_mapped(page)) /* Anon */ > goto unlock_out; > - anon = true; > break; > default: > - anon = false; > break; > } > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ > -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@xxxxxxxxx. For more info on Linux MM, see: http://www.linux-mm.org/ . Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/ Don't email: <a href=mailto:"dont@xxxxxxxxx"> email@xxxxxxxxx </a>