From: Michal Hocko <mhocko@suse.cz>
To: Johannes Weiner <hannes@cmpxchg.org>
Cc: Andrew Morton <akpm@linux-foundation.org>,
KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>,
Balbir Singh <bsingharora@gmail.com>,
cgroups@vger.kernel.org, linux-mm@kvack.org,
linux-kernel@vger.kernel.org
Subject: Re: [patch 4/8] mm: memcg: lookup_page_cgroup (almost) never returns NULL
Date: Thu, 24 Nov 2011 10:52:51 +0100 [thread overview]
Message-ID: <20111124095251.GD26036@tiehlicka.suse.cz> (raw)
In-Reply-To: <1322062951-1756-5-git-send-email-hannes@cmpxchg.org>
On Wed 23-11-11 16:42:27, Johannes Weiner wrote:
> From: Johannes Weiner <jweiner@redhat.com>
>
> 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?
>
> Signed-off-by: Johannes Weiner <jweiner@redhat.com>
Other than that
Acked-by: Michal Hocko <mhocko@suse.cz>
> ---
> mm/memcontrol.c | 8 ++------
> 1 files changed, 2 insertions(+), 6 deletions(-)
>
> diff --git a/mm/memcontrol.c b/mm/memcontrol.c
> index d825af9..d4d139a 100644
> --- a/mm/memcontrol.c
> +++ b/mm/memcontrol.c
> @@ -1894,9 +1894,6 @@ void mem_cgroup_update_page_stat(struct page *page,
> bool need_unlock = false;
> unsigned long uninitialized_var(flags);
>
> - if (unlikely(!pc))
> - return;
> -
> rcu_read_lock();
> memcg = pc->mem_cgroup;
> if (unlikely(!memcg || !PageCgroupUsed(pc)))
> @@ -2669,8 +2666,6 @@ static int mem_cgroup_charge_common(struct page *page, struct mm_struct *mm,
> }
>
> pc = lookup_page_cgroup(page);
> - BUG_ON(!pc); /* XXX: remove this and move pc lookup into commit */
> -
> ret = __mem_cgroup_try_charge(mm, gfp_mask, nr_pages, &memcg, oom);
> if (ret || !memcg)
> return ret;
> @@ -2942,7 +2937,7 @@ __mem_cgroup_uncharge_common(struct page *page, enum charge_type ctype)
> * Check if our page_cgroup is valid
> */
> pc = lookup_page_cgroup(page);
> - if (unlikely(!pc || !PageCgroupUsed(pc)))
> + if (unlikely(!PageCgroupUsed(pc)))
> return NULL;
>
> lock_page_cgroup(pc);
> @@ -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;
> --
> 1.7.6.4
>
--
Michal Hocko
SUSE Labs
SUSE LINUX s.r.o.
Lihovarska 1060/12
190 00 Praha 9
Czech Republic
next prev parent reply other threads:[~2011-11-24 9:52 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-23 15:42 [patch 0/8] mm: memcg fixlets for 3.3 Johannes Weiner
2011-11-23 15:42 ` [patch 1/8] mm: oom_kill: remove memcg argument from oom_kill_task() Johannes Weiner
2011-11-23 22:35 ` David Rientjes
2011-11-23 23:57 ` KAMEZAWA Hiroyuki
2011-11-24 9:07 ` Michal Hocko
2011-11-28 0:37 ` Balbir Singh
2011-11-23 15:42 ` [patch 2/8] mm: unify remaining mem_cont, mem, etc. variable names to memcg Johannes Weiner
2011-11-23 22:40 ` David Rientjes
2011-11-23 23:58 ` KAMEZAWA Hiroyuki
2011-11-24 9:17 ` Michal Hocko
2011-11-28 0:42 ` Balbir Singh
2011-11-23 15:42 ` [patch 3/8] mm: memcg: clean up fault accounting Johannes Weiner
2011-11-24 0:00 ` KAMEZAWA Hiroyuki
2011-11-24 9:33 ` Michal Hocko
2011-11-24 9:51 ` Johannes Weiner
2011-11-28 0:45 ` Balbir Singh
2011-11-23 15:42 ` [patch 4/8] mm: memcg: lookup_page_cgroup (almost) never returns NULL Johannes Weiner
2011-11-24 0:01 ` KAMEZAWA Hiroyuki
2011-11-24 9:52 ` Michal Hocko [this message]
2011-11-24 10:05 ` Johannes Weiner
2011-11-24 10:26 ` Michal Hocko
2011-11-28 9:15 ` Johannes Weiner
2011-11-28 9:34 ` Johannes Weiner
2011-11-28 10:12 ` Michal Hocko
2011-11-28 7:03 ` Balbir Singh
2011-11-28 9:17 ` Johannes Weiner
2011-11-23 15:42 ` [patch 5/8] mm: memcg: remove unneeded checks from newpage_charge() Johannes Weiner
2011-11-24 0:04 ` KAMEZAWA Hiroyuki
2011-11-24 9:04 ` Johannes Weiner
2011-11-24 10:30 ` Michal Hocko
2011-11-24 11:58 ` Johannes Weiner
2011-11-23 15:42 ` [patch 6/8] mm: memcg: remove unneeded checks from uncharge_page() Johannes Weiner
2011-11-24 0:06 ` KAMEZAWA Hiroyuki
2011-11-24 9:06 ` Johannes Weiner
2011-11-24 10:34 ` Michal Hocko
2011-11-23 15:42 ` [patch 7/8] mm: memcg: modify PageCgroupAcctLRU non-atomically Johannes Weiner
2011-11-23 18:52 ` Hugh Dickins
2011-11-24 8:53 ` Johannes Weiner
2011-11-24 0:09 ` KAMEZAWA Hiroyuki
2011-11-24 8:55 ` Johannes Weiner
2011-11-23 15:42 ` [patch 8/8] mm: memcg: modify PageCgroupCache non-atomically Johannes Weiner
2011-11-24 0:13 ` KAMEZAWA Hiroyuki
2011-11-24 9:13 ` Johannes Weiner
2011-11-24 6:09 ` [patch 0/8] mm: memcg fixlets for 3.3 Balbir Singh
2011-11-24 9:45 ` Johannes Weiner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20111124095251.GD26036@tiehlicka.suse.cz \
--to=mhocko@suse.cz \
--cc=akpm@linux-foundation.org \
--cc=bsingharora@gmail.com \
--cc=cgroups@vger.kernel.org \
--cc=hannes@cmpxchg.org \
--cc=kamezawa.hiroyu@jp.fujitsu.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).