| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Mon, 20 Feb 2012 16:51:40 +0530
From: "Aneesh Kumar K.V" <aneesh.kumar@...ux.vnet.ibm.com>
To: linux-mm@...ck.org, mgorman@...e.de,
kamezawa.hiroyu@...fujitsu.com, dhillf@...il.com,
aarcange@...hat.com, mhocko@...e.cz, akpm@...ux-foundation.org,
hannes@...xchg.org
Cc: linux-kernel@...r.kernel.org, cgroups@...nel.org,
"Aneesh Kumar K.V" <aneesh.kumar@...ux.vnet.ibm.com>
Subject: [PATCH -V1 7/9] hugetlbfs: Add truncate region functions
From: "Aneesh Kumar K.V" <aneesh.kumar@...ux.vnet.ibm.com>
This will later be used by the task migration patches.
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@...ux.vnet.ibm.com>
---
fs/hugetlbfs/hugetlb_cgroup.c | 84 ++++++++++++++++++++++++++++++++++++++++
fs/hugetlbfs/region.c | 58 +++++++++++++++++++++++++++
include/linux/hugetlb_cgroup.h | 12 +++++-
3 files changed, 153 insertions(+), 1 deletions(-)
diff --git a/fs/hugetlbfs/hugetlb_cgroup.c b/fs/hugetlbfs/hugetlb_cgroup.c
index a4c6786..b8b319b 100644
--- a/fs/hugetlbfs/hugetlb_cgroup.c
+++ b/fs/hugetlbfs/hugetlb_cgroup.c
@@ -323,6 +323,90 @@ long hugetlb_truncate_cgroup(struct hstate *h,
return chg;
}
+long hugetlb_truncate_cgroup_range(struct hstate *h,
+ struct list_head *head, long from, long to)
+{
+ long chg = 0, csize;
+ int idx = h - hstates;
+ struct hugetlb_cgroup *h_cg;
+ struct file_region *rg, *trg;
+
+ /* Locate the region we are either in or before. */
+ list_for_each_entry(rg, head, link)
+ if (from <= rg->to)
+ break;
+ if (&rg->link == head)
+ return 0;
+
+ /* If we are in the middle of a region then adjust it. */
+ if (from > rg->from) {
+ if (to < rg->to) {
+ struct file_region *nrg;
+ /* rg->from from to rg->to */
+ nrg = kmalloc(sizeof(*nrg), GFP_KERNEL);
+ /*
+ * If we fail to allocate we return the
+ * with the 0 charge . Later a complete
+ * truncate will reclaim the left over space
+ */
+ if (!nrg)
+ return 0;
+ nrg->from = to;
+ nrg->to = rg->to;
+ nrg->data = rg->data;
+ INIT_LIST_HEAD(&nrg->link);
+ list_add(&nrg->link, &rg->link);
+
+ /* Adjust the rg entry */
+ rg->to = from;
+ chg = to - from;
+ h_cg = (struct hugetlb_cgroup *)rg->data;
+ if (!hugetlb_cgroup_is_root(h_cg)) {
+ csize = chg * huge_page_size(h);
+ res_counter_uncharge(&h_cg->memhuge[idx],
+ csize);
+ }
+ return chg;
+ }
+ chg = rg->to - from;
+ rg->to = from;
+ h_cg = (struct hugetlb_cgroup *)rg->data;
+ if (!hugetlb_cgroup_is_root(h_cg)) {
+ csize = chg * huge_page_size(h);
+ res_counter_uncharge(&h_cg->memhuge[idx], csize);
+ }
+ rg = list_entry(rg->link.next, typeof(*rg), link);
+ }
+ /* Drop any remaining regions till to */
+ list_for_each_entry_safe(rg, trg, rg->link.prev, link) {
+ if (rg->from >= to)
+ break;
+ if (&rg->link == head)
+ break;
+ if (rg->to > to) {
+ /* rg->from to rg->to */
+ chg += to - rg->from;
+ rg->from = to;
+ h_cg = (struct hugetlb_cgroup *)rg->data;
+ if (!hugetlb_cgroup_is_root(h_cg)) {
+ csize = (to - rg->from) * huge_page_size(h);
+ res_counter_uncharge(&h_cg->memhuge[idx],
+ csize);
+ }
+ return chg;
+ }
+ chg += rg->to - rg->from;
+ h_cg = (struct hugetlb_cgroup *)rg->data;
+ if (!hugetlb_cgroup_is_root(h_cg)) {
+ csize = (rg->to - rg->from) * huge_page_size(h);
+ res_counter_uncharge(&h_cg->memhuge[idx], csize);
+ }
+ list_del(&rg->link);
+ kfree(rg);
+ }
+ return chg;
+}
+
int hugetlb_priv_page_charge(struct resv_map *map, struct hstate *h, long chg)
{
long csize;
diff --git a/fs/hugetlbfs/region.c b/fs/hugetlbfs/region.c
index d2445fb..8ac63b0 100644
--- a/fs/hugetlbfs/region.c
+++ b/fs/hugetlbfs/region.c
@@ -200,3 +200,61 @@ long region_count(struct list_head *head, long f, long t)
return chg;
}
+
+long region_truncate_range(struct list_head *head, long from, long to)
+{
+ long chg = 0;
+ struct file_region *rg, *trg;
+
+ /* Locate the region we are either in or before. */
+ list_for_each_entry(rg, head, link)
+ if (from <= rg->to)
+ break;
+ if (&rg->link == head)
+ return 0;
+
+ /* If we are in the middle of a region then adjust it. */
+ if (from > rg->from) {
+ if (to < rg->to) {
+ struct file_region *nrg;
+ /* rf->from f t rg->to */
+ nrg = kmalloc(sizeof(*nrg), GFP_KERNEL);
+ /*
+ * If we fail to allocate we return the
+ * with the 0 charge . Later a complete
+ * truncate will reclaim the left over space
+ */
+ if (!nrg)
+ return 0;
+ nrg->from = to;
+ nrg->to = rg->to;
+ nrg->data = rg->data;
+ INIT_LIST_HEAD(&nrg->link);
+ list_add(&nrg->link, &rg->link);
+
+ /* Adjust the rg entry */
+ rg->to = from;
+ chg = to - from;
+ return chg;
+ }
+ chg = rg->to - from;
+ rg->to = from;
+ rg = list_entry(rg->link.next, typeof(*rg), link);
+ }
+ /* Drop any remaining regions till to */
+ list_for_each_entry_safe(rg, trg, rg->link.prev, link) {
+ if (rg->from >= to)
+ break;
+ if (&rg->link == head)
+ break;
+ if (rg->to > to) {
+ chg += to - rg->from;
+ rg->from = to;
+ return chg;
+ }
+ chg += rg->to - rg->from;
+ list_del(&rg->link);
+ kfree(rg);
+ }
+ return chg;
+}
diff --git a/include/linux/hugetlb_cgroup.h b/include/linux/hugetlb_cgroup.h
index eaad86b..68c1d61 100644
--- a/include/linux/hugetlb_cgroup.h
+++ b/include/linux/hugetlb_cgroup.h
@@ -27,7 +27,7 @@ extern void region_add(struct list_head *head, long f, long t,
unsigned long data);
extern long region_truncate(struct list_head *head, long end);
extern long region_count(struct list_head *head, long f, long t);
-
+extern long region_truncate_range(struct list_head *head, long from, long end);
#ifdef CONFIG_CGROUP_HUGETLB_RES_CTLR
extern u64 hugetlb_cgroup_read(struct cgroup *cgroup, struct cftype *cft);
extern int hugetlb_cgroup_write(struct cgroup *cgroup, struct cftype *cft,
@@ -40,6 +40,9 @@ extern void hugetlb_page_uncharge(struct list_head *head,
extern void hugetlb_commit_page_charge(struct list_head *head, long f, long t);
extern long hugetlb_truncate_cgroup(struct hstate *h,
struct list_head *head, long from);
+extern long hugetlb_truncate_cgroup_range(struct hstate *h,
+ struct list_head *head,
+ long from, long end);
extern int hugetlb_priv_page_charge(struct resv_map *map,
struct hstate *h, long chg);
extern void hugetlb_priv_page_uncharge(struct resv_map *map,
@@ -69,6 +72,13 @@ static inline long hugetlb_truncate_cgroup(struct hstate *h,
return region_truncate(head, from);
}
+static inline long hugetlb_truncate_cgroup_range(struct hstate *h,
+ struct list_head *head,
+ long from, long end)
+{
+ return region_truncate_range(head, from, end);
+}
+
static inline int hugetlb_priv_page_charge(struct resv_map *map,
struct hstate *h, long chg)
{
--
1.7.9
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists