linux-mm.kvack.org archive mirror
 help / color / mirror / Atom feed
From: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>
To: linux-mm@kvack.org, kamezawa.hiroyu@jp.fujitsu.com,
	dhillf@gmail.com, rientjes@google.com, mhocko@suse.cz,
	akpm@linux-foundation.org, hannes@cmpxchg.org
Cc: linux-kernel@vger.kernel.org, cgroups@vger.kernel.org,
	"Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>
Subject: [PATCH -V8 11/16] hugetlb/cgroup: Add charge/uncharge routines for hugetlb cgroup
Date: Sat,  9 Jun 2012 14:29:56 +0530	[thread overview]
Message-ID: <1339232401-14392-12-git-send-email-aneesh.kumar@linux.vnet.ibm.com> (raw)
In-Reply-To: <1339232401-14392-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com>

From: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>

This patchset add the charge and uncharge routines for hugetlb cgroup.
This will be used in later patches when we allocate/free HugeTLB
pages.

Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
---
 mm/hugetlb_cgroup.c |   87 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 87 insertions(+)

diff --git a/mm/hugetlb_cgroup.c b/mm/hugetlb_cgroup.c
index 20a32c5..48efd5a 100644
--- a/mm/hugetlb_cgroup.c
+++ b/mm/hugetlb_cgroup.c
@@ -105,6 +105,93 @@ static int hugetlb_cgroup_pre_destroy(struct cgroup *cgroup)
 	   return -EBUSY;
 }
 
+int hugetlb_cgroup_charge_page(int idx, unsigned long nr_pages,
+			       struct hugetlb_cgroup **ptr)
+{
+	int ret = 0;
+	struct res_counter *fail_res;
+	struct hugetlb_cgroup *h_cg = NULL;
+	unsigned long csize = nr_pages * PAGE_SIZE;
+
+	if (hugetlb_cgroup_disabled())
+		goto done;
+	/*
+	 * We don't charge any cgroup if the compound page have less
+	 * than 3 pages.
+	 */
+	if (hstates[idx].order < 2)
+		goto done;
+again:
+	rcu_read_lock();
+	h_cg = hugetlb_cgroup_from_task(current);
+	if (!h_cg)
+		h_cg = root_h_cgroup;
+
+	if (!css_tryget(&h_cg->css)) {
+		rcu_read_unlock();
+		goto again;
+	}
+	rcu_read_unlock();
+
+	ret = res_counter_charge(&h_cg->hugepage[idx], csize, &fail_res);
+	css_put(&h_cg->css);
+done:
+	*ptr = h_cg;
+	return ret;
+}
+
+void hugetlb_cgroup_commit_charge(int idx, unsigned long nr_pages,
+				  struct hugetlb_cgroup *h_cg,
+				  struct page *page)
+{
+	if (hugetlb_cgroup_disabled() || !h_cg)
+		return;
+
+	spin_lock(&hugetlb_lock);
+	if (hugetlb_cgroup_from_page(page)) {
+		hugetlb_cgroup_uncharge_cgroup(idx, nr_pages, h_cg);
+		goto done;
+	}
+	set_hugetlb_cgroup(page, h_cg);
+done:
+	spin_unlock(&hugetlb_lock);
+	return;
+}
+
+void hugetlb_cgroup_uncharge_page(int idx, unsigned long nr_pages,
+				  struct page *page)
+{
+	struct hugetlb_cgroup *h_cg;
+	unsigned long csize = nr_pages * PAGE_SIZE;
+
+	if (hugetlb_cgroup_disabled())
+		return;
+
+	spin_lock(&hugetlb_lock);
+	h_cg = hugetlb_cgroup_from_page(page);
+	if (unlikely(!h_cg)) {
+		spin_unlock(&hugetlb_lock);
+		return;
+	}
+	set_hugetlb_cgroup(page, NULL);
+	spin_unlock(&hugetlb_lock);
+
+	res_counter_uncharge(&h_cg->hugepage[idx], csize);
+	return;
+}
+
+void hugetlb_cgroup_uncharge_cgroup(int idx, unsigned long nr_pages,
+				    struct hugetlb_cgroup *h_cg)
+{
+	unsigned long csize = nr_pages * PAGE_SIZE;
+
+	if (hugetlb_cgroup_disabled() || !h_cg)
+		return;
+
+	res_counter_uncharge(&h_cg->hugepage[idx], csize);
+	return;
+}
+
 struct cgroup_subsys hugetlb_subsys = {
 	.name = "hugetlb",
 	.create     = hugetlb_cgroup_create,
-- 
1.7.10

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>

  parent reply	other threads:[~2012-06-09  9:00 UTC|newest]

Thread overview: 71+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-06-09  8:59 [PATCH -V8 00/16] hugetlb: Add HugeTLB controller to control HugeTLB allocation Aneesh Kumar K.V
2012-06-09  8:59 ` [PATCH -V8 01/16] hugetlb: rename max_hstate to hugetlb_max_hstate Aneesh Kumar K.V
2012-06-09  8:59 ` [PATCH -V8 02/16] hugetlb: don't use ERR_PTR with VM_FAULT* values Aneesh Kumar K.V
2012-06-09 11:10   ` Konrad Rzeszutek Wilk
2012-06-09 13:17     ` Aneesh Kumar K.V
2012-06-09 19:28   ` KOSAKI Motohiro
2012-06-10  1:59   ` Hillf Danton
2012-06-09  8:59 ` [PATCH -V8 03/16] hugetlb: add an inline helper for finding hstate index Aneesh Kumar K.V
2012-06-09  8:59 ` [PATCH -V8 04/16] hugetlb: use mmu_gather instead of a temporary linked list for accumulating pages Aneesh Kumar K.V
2012-06-09  8:59 ` [PATCH -V8 05/16] hugetlb: avoid taking i_mmap_mutex in unmap_single_vma() for hugetlb Aneesh Kumar K.V
2012-06-09  9:44   ` Johannes Weiner
2012-06-09 13:03     ` Aneesh Kumar K.V
2012-06-09 14:49       ` Johannes Weiner
2012-06-09  8:59 ` [PATCH -V8 06/16] hugetlb: simplify migrate_huge_page() Aneesh Kumar K.V
2012-06-12  7:31   ` Kamezawa Hiroyuki
2012-06-09  8:59 ` [PATCH -V8 07/16] hugetlb: add a list for tracking in-use HugeTLB pages Aneesh Kumar K.V
2012-06-09  8:59 ` [PATCH -V8 08/16] hugetlb: Make some static variables global Aneesh Kumar K.V
2012-06-12  7:35   ` Kamezawa Hiroyuki
2012-06-09  8:59 ` [PATCH -V8 09/16] mm/hugetlb: Add new HugeTLB cgroup Aneesh Kumar K.V
2012-06-12  7:46   ` Kamezawa Hiroyuki
2012-06-12  9:37     ` Aneesh Kumar K.V
2012-06-09  8:59 ` [PATCH -V8 10/16] hugetlb/cgroup: Add the cgroup pointer to page lru Aneesh Kumar K.V
2012-06-09 11:14   ` Konrad Rzeszutek Wilk
2012-06-09 17:04   ` Aneesh Kumar K.V
2012-06-11  8:16   ` Michal Hocko
2012-06-11  9:03     ` Aneesh Kumar K.V
2012-06-11  9:16       ` Michal Hocko
2012-06-11  9:33         ` Aneesh Kumar K.V
2012-06-11  8:41   ` Kamezawa Hiroyuki
2012-06-12  7:52   ` Kamezawa Hiroyuki
2012-06-12  9:40     ` Aneesh Kumar K.V
2012-06-09  8:59 ` Aneesh Kumar K.V [this message]
2012-06-11  8:38   ` [PATCH -V8 11/16] hugetlb/cgroup: Add charge/uncharge routines for hugetlb cgroup Michal Hocko
2012-06-11  9:10     ` Michal Hocko
2012-06-11  9:28     ` Aneesh Kumar K.V
2012-06-11 12:59       ` Michal Hocko
2012-06-11 15:35         ` Aneesh Kumar K.V
2012-06-12  8:08   ` Kamezawa Hiroyuki
2012-06-12 10:50     ` Aneesh Kumar K.V
2012-06-13 11:02       ` Kamezawa Hiroyuki
2012-06-09  8:59 ` [PATCH -V8 12/16] hugetlb/cgroup: Add support for cgroup removal Aneesh Kumar K.V
2012-06-11  8:52   ` Michal Hocko
2012-06-11  9:40     ` Aneesh Kumar K.V
2012-06-11 13:14       ` Michal Hocko
2012-06-11 15:34         ` Aneesh Kumar K.V
2012-06-12  8:23   ` Kamezawa Hiroyuki
2012-06-12 10:52     ` Aneesh Kumar K.V
2012-06-09  8:59 ` [PATCH -V8 13/16] hugetlb/cgroup: add hugetlb cgroup control files Aneesh Kumar K.V
2012-06-09 11:19   ` Konrad Rzeszutek Wilk
2012-06-11  9:02   ` Michal Hocko
2012-06-11  9:43     ` Aneesh Kumar K.V
2012-06-11 13:15       ` Michal Hocko
2012-06-12  8:35   ` Kamezawa Hiroyuki
2012-06-12 10:58     ` Aneesh Kumar K.V
2012-06-13  0:16       ` Kamezawa Hiroyuki
2012-06-09  8:59 ` [PATCH -V8 14/16] hugetlb/cgroup: add charge/uncharge calls for HugeTLB alloc/free Aneesh Kumar K.V
2012-06-09  9:23   ` Johannes Weiner
2012-06-09 13:09     ` Aneesh Kumar K.V
2012-06-09 14:30       ` Johannes Weiner
2012-06-09 15:55         ` Aneesh Kumar K.V
2012-06-11  9:19         ` Michal Hocko
2012-06-11  9:21   ` Michal Hocko
2012-06-11 10:29     ` Aneesh Kumar K.V
2012-06-09  9:00 ` [PATCH -V8 15/16] hugetlb/cgroup: migrate hugetlb cgroup info from oldpage to new page during migration Aneesh Kumar K.V
2012-06-11  9:24   ` Michal Hocko
2012-06-11 10:17     ` Aneesh Kumar K.V
2012-06-12  8:51   ` Kamezawa Hiroyuki
2012-06-12 11:00     ` Aneesh Kumar K.V
2012-06-13 11:15       ` Kamezawa Hiroyuki
2012-06-09  9:00 ` [PATCH -V8 16/16] hugetlb/cgroup: add HugeTLB controller documentation Aneesh Kumar K.V
2012-06-12  8:57   ` Kamezawa Hiroyuki

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=1339232401-14392-12-git-send-email-aneesh.kumar@linux.vnet.ibm.com \
    --to=aneesh.kumar@linux.vnet.ibm.com \
    --cc=akpm@linux-foundation.org \
    --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=mhocko@suse.cz \
    --cc=rientjes@google.com \
    /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).