Re: [patch 4/8] mm: memcg: lookup_page_cgroup (almost) never returns NULL

[Johannes Weiner <hannes-druUgvl0LCNAfugRpC6u6w@public.gmane.org>]

On Thu, Nov 24, 2011 at 10:52:51AM +0100, Michal Hocko wrote:
> On Wed 23-11-11 16:42:27, Johannes Weiner wrote:
> > From: Johannes Weiner <jweiner-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
> > 
> > Pages have their corresponding page_cgroup descriptors set up before
> > they are used in userspace, and thus managed by a memory cgroup.
> > 
> > The only time where lookup_page_cgroup() can return NULL is in the
> > page sanity checking code that executes while feeding pages into the
> > page allocator for the first time.
> > 
> > Remove the NULL checks against lookup_page_cgroup() results from all
> > callsites where we know that corresponding page_cgroup descriptors
> > must be allocated.
> 
> OK, shouldn't we add
> 
> diff --git a/mm/page_cgroup.c b/mm/page_cgroup.c
> index 2d123f9..cb93f64 100644
> --- a/mm/page_cgroup.c
> +++ b/mm/page_cgroup.c
> @@ -35,8 +35,7 @@ struct page_cgroup *lookup_page_cgroup(struct page *page)
>  	struct page_cgroup *base;
>  
>  	base = NODE_DATA(page_to_nid(page))->node_page_cgroup;
> -	if (unlikely(!base))
> -		return NULL;
> +	BUG_ON(!base);
>  
>  	offset = pfn - NODE_DATA(page_to_nid(page))->node_start_pfn;
>  	return base + offset;
> @@ -112,8 +111,7 @@ struct page_cgroup *lookup_page_cgroup(struct page *page)
>  	unsigned long pfn = page_to_pfn(page);
>  	struct mem_section *section = __pfn_to_section(pfn);
>  
> -	if (!section->page_cgroup)
> -		return NULL;
> +	BUG_ON(!section->page_cgroup);
>  	return section->page_cgroup + pfn;
>  }
>  
> just to make it explicit?

No, see the last hunk in this patch.  It's actually possible for this
to run, although only while feeding fresh pages into the allocator:

> > @@ -3326,6 +3321,7 @@ static struct page_cgroup *lookup_page_cgroup_used(struct page *page)
> >  	struct page_cgroup *pc;
> >  
> >  	pc = lookup_page_cgroup(page);
> > +	/* Can be NULL while bootstrapping the page allocator */
> >  	if (likely(pc) && PageCgroupUsed(pc))
> >  		return pc;
> >  	return NULL;

We could add a lookup_page_cgroup_safe() for this DEBUG_VM-only
callsite as an optimization separately and remove the NULL check from
lookup_page_cgroup() itself.  But this patch was purely about removing
the actively misleading checks.

> > Signed-off-by: Johannes Weiner <jweiner-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
> 
> Other than that
> Acked-by: Michal Hocko <mhocko-AlSwsSmVLrQ@public.gmane.org>

Thanks.
--
To unsubscribe from this list: send the line "unsubscribe cgroups" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html