lkml.org 
[lkml]   [2012]   [Mar]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [patch 2/2] mm: memcg: count pte references from every member of the reclaimed hierarchy
On Tue 28-02-12 15:14:49, Johannes Weiner wrote:
[...]
> diff --git a/mm/memcontrol.c b/mm/memcontrol.c
> index b4622fb..21004df 100644
> --- a/mm/memcontrol.c
> +++ b/mm/memcontrol.c
> @@ -1044,17 +1044,23 @@ struct lruvec *mem_cgroup_lru_move_lists(struct zone *zone,
> * Checks whether given mem is same or in the root_mem_cgroup's
> * hierarchy subtree
> */
> -static bool mem_cgroup_same_or_subtree(const struct mem_cgroup *root_memcg,
> - struct mem_cgroup *memcg)
> +bool __mem_cgroup_same_or_subtree(const struct mem_cgroup *root_memcg,
> + struct mem_cgroup *memcg)
> {
> - bool ret;
> -
> if (root_memcg == memcg)
> return true;
> if (!root_memcg->use_hierarchy)
> return false;
> + return css_is_ancestor(&memcg->css, &root_memcg->css);
> +}
> +
> +static bool mem_cgroup_same_or_subtree(const struct mem_cgroup *root_memcg,
> + struct mem_cgroup *memcg)
> +{
> + bool ret;
> +
> rcu_read_lock();
> - ret = css_is_ancestor(&memcg->css, &root_memcg->css);
> + ret = __mem_cgroup_same_or_subtree(root_memcg, memcg);
> rcu_read_unlock();
> return ret;
> }
> diff --git a/mm/vmscan.c b/mm/vmscan.c
> index c631234..120646e 100644
> --- a/mm/vmscan.c
> +++ b/mm/vmscan.c
> @@ -708,7 +708,8 @@ static enum page_references page_check_references(struct page *page,
> int referenced_ptes, referenced_page;
> unsigned long vm_flags;
>
> - referenced_ptes = page_referenced(page, 1, mz->mem_cgroup, &vm_flags);
> + referenced_ptes = page_referenced(page, 1, sc->target_mem_cgroup,
> + &vm_flags);
> referenced_page = TestClearPageReferenced(page);

Maybe a stupid question but isn't target_mem_cgroup NULL in the global
reclaim case? And we doesn't handle that in __mem_cgroup_same_or_subtree...

--
Michal Hocko
SUSE Labs
SUSE LINUX s.r.o.
Lihovarska 1060/12
190 00 Praha 9
Czech Republic


\
 
 \ /
  Last update: 2012-03-14 15:27    [W:0.087 / U:0.096 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site