mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Michal Hocko <mhocko@suse.cz>
To: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>
Cc: linux-mm@kvack.org, mgorman@suse.de,
	kamezawa.hiroyu@jp.fujitsu.com, dhillf@gmail.com,
	aarcange@redhat.com, akpm@linux-foundation.org,
	hannes@cmpxchg.org, linux-kernel@vger.kernel.org,
	cgroups@vger.kernel.org
Subject: Re: [PATCH -V4 04/10] memcg: Add HugeTLB extension
Date: Wed, 28 Mar 2012 17:44:34 +0200	[thread overview]
Message-ID: <20120328154434.GN20949@tiehlicka.suse.cz> (raw)
In-Reply-To: <87d37wetd7.fsf@skywalker.in.ibm.com>

On Wed 28-03-12 19:10:36, Aneesh Kumar K.V wrote:
> Michal Hocko <mhocko@suse.cz> writes:
> 
> > On Fri 16-03-12 23:09:24, Aneesh Kumar K.V wrote:
> >> From: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>
> >> 
> >> This patch implements a memcg extension that allows us to control
> >> HugeTLB allocations via memory controller.
> >
> > And the infrastructure is not used at this stage (you forgot to
> > mention).
> > The changelog should be much more descriptive.
> 
> 
> Will update the changelog.

Thx

> 
> >
> >> 
> >> Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
> >> ---
> >>  include/linux/hugetlb.h    |    1 +
> >>  include/linux/memcontrol.h |   42 +++++++++++++
> >>  init/Kconfig               |    8 +++
> >>  mm/hugetlb.c               |    2 +-
> >>  mm/memcontrol.c            |  138 ++++++++++++++++++++++++++++++++++++++++++++
> >>  5 files changed, 190 insertions(+), 1 deletions(-)
> >> 
> > [...]
> >> diff --git a/init/Kconfig b/init/Kconfig
> >> index 3f42cd6..f0eb8aa 100644
> >> --- a/init/Kconfig
> >> +++ b/init/Kconfig
> >> @@ -725,6 +725,14 @@ config CGROUP_PERF
> >>  
> >>  	  Say N if unsure.
> >>  
> >> +config MEM_RES_CTLR_HUGETLB
> >> +	bool "Memory Resource Controller HugeTLB Extension (EXPERIMENTAL)"
> >> +	depends on CGROUP_MEM_RES_CTLR && HUGETLB_PAGE && EXPERIMENTAL
> >> +	default n
> >> +	help
> >> +	  Add HugeTLB management to memory resource controller. When you
> >> +	  enable this, you can put a per cgroup limit on HugeTLB usage.
> >
> > How does it interact with the hard/soft limists etc...
> 
> 
> There is no softlimit support for HugeTLB extension.

Sure, sorry for not being precise. The point was how this interacts with
memcg hard/soft limit (they are independent) etc...

> > [...]
> >> diff --git a/mm/memcontrol.c b/mm/memcontrol.c
> >> index 6728a7a..4b36c5e 100644
> >> --- a/mm/memcontrol.c
> >> +++ b/mm/memcontrol.c
> >> @@ -235,6 +235,10 @@ struct mem_cgroup {
> >>  	 */
> >>  	struct res_counter memsw;
> >>  	/*
> >> +	 * the counter to account for hugepages from hugetlb.
> >> +	 */
> >> +	struct res_counter hugepage[HUGE_MAX_HSTATE];
> >> +	/*
> >>  	 * Per cgroup active and inactive list, similar to the
> >>  	 * per zone LRU lists.
> >>  	 */
> >> @@ -3156,6 +3160,128 @@ static inline int mem_cgroup_move_swap_account(swp_entry_t entry,
> >>  }
> >>  #endif
> >>  
> >> +#ifdef CONFIG_MEM_RES_CTLR_HUGETLB
> >> +static bool mem_cgroup_have_hugetlb_usage(struct mem_cgroup *memcg)
> >> +{
> >> +	int idx;
> >> +	for (idx = 0; idx < hugetlb_max_hstate; idx++) {
> >
> > Maybe we should expose for_each_hstate as well...
> 
> 
> That will not really help here. If we use for_each_hstate then we will
> need to use hstate_index to get the index.

Fair enough

> >> +		if (memcg->hugepage[idx].usage > 0)
> >> +			return 1;
> >> +	}
> >> +	return 0;
> >> +}
> >> +
> >> +int mem_cgroup_hugetlb_charge_page(int idx, unsigned long nr_pages,
> >> +				   struct mem_cgroup **ptr)
> >> +{
> >> +	int ret = 0;
> >> +	struct mem_cgroup *memcg;
> >> +	struct res_counter *fail_res;
> >> +	unsigned long csize = nr_pages * PAGE_SIZE;
> >> +
> >> +	if (mem_cgroup_disabled())
> >> +		return 0;
> >> +again:
> >> +	rcu_read_lock();
> >> +	memcg = mem_cgroup_from_task(current);
> >> +	if (!memcg)
> >> +		memcg = root_mem_cgroup;
> >> +	if (mem_cgroup_is_root(memcg)) {
> >> +		rcu_read_unlock();
> >> +		goto done;
> >> +	}
> >> +	if (!css_tryget(&memcg->css)) {
> >> +		rcu_read_unlock();
> >> +		goto again;
> >> +	}
> >> +	rcu_read_unlock();
> >> +
> >> +	ret = res_counter_charge(&memcg->hugepage[idx], csize, &fail_res);
> >> +	css_put(&memcg->css);
> >> +done:
> >> +	*ptr = memcg;
> >
> > Why do we set ptr even for the failure case after we dropped a
> > reference?
> 
> That ensures that *ptr is NULL. 

Does it? AFAICS res_counter_charge might fail and you would use non NULL
memcg (with a dropped reference).

[...]
> >> +	SetPageCgroupUsed(pc);
> >> +
> >> +	unlock_page_cgroup(pc);
> >> +	return;
> >> +}
> >> +
> > [...]
> >> @@ -4887,6 +5013,7 @@ err_cleanup:
> >>  static struct cgroup_subsys_state * __ref
> >>  mem_cgroup_create(struct cgroup_subsys *ss, struct cgroup *cont)
> >>  {
> >> +	int idx;
> >>  	struct mem_cgroup *memcg, *parent;
> >>  	long error = -ENOMEM;
> >>  	int node;
> >> @@ -4929,9 +5056,14 @@ mem_cgroup_create(struct cgroup_subsys *ss, struct cgroup *cont)
> >>  		 * mem_cgroup(see mem_cgroup_put).
> >>  		 */
> >>  		mem_cgroup_get(parent);
> >> +		for (idx = 0; idx < HUGE_MAX_HSTATE; idx++)
> >
> > Do we have to init all hstates or is hugetlb_max_hstate enough?
> 
> 
> Yes. we do call mem_cgroup_create for root cgroup before initialzing
> hugetlb hstate.

drop a comment?


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

  reply	other threads:[~2012-03-28 15:44 UTC|newest]

Thread overview: 53+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-03-16 17:39 [PATCH -V4 00/10] memcg: Add memcg extension to control HugeTLB allocation Aneesh Kumar K.V
2012-03-16 17:39 ` [PATCH -V4 01/10] hugetlb: rename max_hstate to hugetlb_max_hstate Aneesh Kumar K.V
2012-03-19  2:07   ` KAMEZAWA Hiroyuki
2012-03-28  9:18   ` Michal Hocko
2012-03-16 17:39 ` [PATCH -V4 02/10] hugetlbfs: don't use ERR_PTR with VM_FAULT* values Aneesh Kumar K.V
2012-03-19  2:11   ` KAMEZAWA Hiroyuki
2012-03-19  6:37     ` Aneesh Kumar K.V
2012-03-28  9:25   ` Michal Hocko
2012-03-28 11:35     ` Aneesh Kumar K.V
2012-03-16 17:39 ` [PATCH -V4 03/10] hugetlbfs: Add an inline helper for finding hstate index Aneesh Kumar K.V
2012-03-19  2:15   ` KAMEZAWA Hiroyuki
2012-03-28  9:41   ` Michal Hocko
2012-03-16 17:39 ` [PATCH -V4 04/10] memcg: Add HugeTLB extension Aneesh Kumar K.V
2012-03-19  2:38   ` KAMEZAWA Hiroyuki
2012-03-19  6:52     ` Aneesh Kumar K.V
2012-03-19  7:00       ` KAMEZAWA Hiroyuki
     [not found]         ` <4F671AE6.5020204@parallels.com>
2012-03-19 12:07           ` KAMEZAWA Hiroyuki
2012-03-21  4:48           ` Aneesh Kumar K.V
2012-03-21  5:22             ` KAMEZAWA Hiroyuki
2012-03-28 11:33   ` Michal Hocko
2012-03-28 13:40     ` Aneesh Kumar K.V
2012-03-28 15:44       ` Michal Hocko [this message]
2012-03-28 13:40   ` Michal Hocko
2012-03-28 17:37     ` Aneesh Kumar K.V
2012-03-29  0:18       ` KAMEZAWA Hiroyuki
2012-03-29  7:57       ` Michal Hocko
2012-03-16 17:39 ` [PATCH -V4 05/10] hugetlb: add charge/uncharge calls for HugeTLB alloc/free Aneesh Kumar K.V
2012-03-19  2:41   ` KAMEZAWA Hiroyuki
2012-03-19  7:01     ` Aneesh Kumar K.V
2012-03-28 13:17   ` Michal Hocko
2012-03-28 17:39     ` Aneesh Kumar K.V
2012-03-29  8:10       ` Michal Hocko
2012-03-30 10:40         ` Aneesh Kumar K.V
2012-03-30 10:46           ` Michal Hocko
2012-03-16 17:39 ` [PATCH -V4 06/10] memcg: track resource index in cftype private Aneesh Kumar K.V
2012-03-19  2:43   ` KAMEZAWA Hiroyuki
2012-03-16 17:39 ` [PATCH -V4 07/10] hugetlbfs: Add memcg control files for hugetlbfs Aneesh Kumar K.V
2012-03-19  2:56   ` KAMEZAWA Hiroyuki
2012-03-19  7:14     ` Aneesh Kumar K.V
2012-03-19  7:34       ` KAMEZAWA Hiroyuki
2012-03-20  9:22         ` Aneesh Kumar K.V
2012-03-16 17:39 ` [PATCH -V4 08/10] hugetlbfs: Add a list for tracking in-use HugeTLB pages Aneesh Kumar K.V
2012-03-19  3:00   ` KAMEZAWA Hiroyuki
2012-03-19  8:59     ` Aneesh Kumar K.V
2012-03-28 13:58   ` Michal Hocko
2012-03-28 17:38     ` Aneesh Kumar K.V
2012-03-29  8:11       ` Michal Hocko
2012-03-16 17:39 ` [PATCH -V4 09/10] memcg: move HugeTLB resource count to parent cgroup on memcg removal Aneesh Kumar K.V
2012-03-19  3:04   ` KAMEZAWA Hiroyuki
2012-03-19  9:00     ` Aneesh Kumar K.V
2012-03-28 14:07   ` Michal Hocko
2012-03-16 17:39 ` [PATCH -V4 10/10] memcg: Add memory controller documentation for hugetlb management Aneesh Kumar K.V
2012-03-28 14:36   ` Michal Hocko

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=20120328154434.GN20949@tiehlicka.suse.cz \
    --to=mhocko@suse.cz \
    --cc=aarcange@redhat.com \
    --cc=akpm@linux-foundation.org \
    --cc=aneesh.kumar@linux.vnet.ibm.com \
    --cc=cgroups@vger.kernel.org \
    --cc=dhillf@gmail.com \
    --cc=hannes@cmpxchg.org \
    --cc=kamezawa.hiroyu@jp.fujitsu.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=mgorman@suse.de \
    /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

all inboxes | Powered by JetHome®