forked from torvalds/linux
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Implement a new controller that allows us to control HugeTLB allocations. The extension allows to limit the HugeTLB usage per control group and enforces the controller limit during page fault. Since HugeTLB doesn't support page reclaim, enforcing the limit at page fault time implies that, the application will get SIGBUS signal if it tries to access HugeTLB pages beyond its limit. This requires the application to know beforehand how much HugeTLB pages it would require for its use. The charge/uncharge calls will be added to HugeTLB code in later patch. Support for cgroup removal will be added in later patches. [[email protected]: s/CONFIG_CGROUP_HUGETLB_RES_CTLR/CONFIG_MEMCG_HUGETLB/g] [[email protected]: s/CONFIG_MEMCG_HUGETLB/CONFIG_CGROUP_HUGETLB/g] Reviewed-by: KAMEZAWA Hiroyuki <[email protected]> Signed-off-by: Aneesh Kumar K.V <[email protected]> Cc: David Rientjes <[email protected]> Cc: Hillf Danton <[email protected]> Reviewed-by: Michal Hocko <[email protected]> Cc: KOSAKI Motohiro <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
- Loading branch information
Showing
5 changed files
with
179 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -72,3 +72,9 @@ SUBSYS(net_prio) | |
#endif | ||
|
||
/* */ | ||
|
||
#ifdef CONFIG_CGROUP_HUGETLB | ||
SUBSYS(hugetlb) | ||
#endif | ||
|
||
/* */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
/* | ||
* Copyright IBM Corporation, 2012 | ||
* Author Aneesh Kumar K.V <[email protected]> | ||
* | ||
* This program is free software; you can redistribute it and/or modify it | ||
* under the terms of version 2.1 of the GNU Lesser General Public License | ||
* as published by the Free Software Foundation. | ||
* | ||
* This program is distributed in the hope that it would be useful, but | ||
* WITHOUT ANY WARRANTY; without even the implied warranty of | ||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | ||
* | ||
*/ | ||
|
||
#ifndef _LINUX_HUGETLB_CGROUP_H | ||
#define _LINUX_HUGETLB_CGROUP_H | ||
|
||
#include <linux/res_counter.h> | ||
|
||
struct hugetlb_cgroup; | ||
|
||
#ifdef CONFIG_CGROUP_HUGETLB | ||
static inline bool hugetlb_cgroup_disabled(void) | ||
{ | ||
if (hugetlb_subsys.disabled) | ||
return true; | ||
return false; | ||
} | ||
|
||
#else | ||
static inline bool hugetlb_cgroup_disabled(void) | ||
{ | ||
return true; | ||
} | ||
|
||
#endif /* CONFIG_MEM_RES_CTLR_HUGETLB */ | ||
#endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,120 @@ | ||
/* | ||
* | ||
* Copyright IBM Corporation, 2012 | ||
* Author Aneesh Kumar K.V <[email protected]> | ||
* | ||
* This program is free software; you can redistribute it and/or modify it | ||
* under the terms of version 2.1 of the GNU Lesser General Public License | ||
* as published by the Free Software Foundation. | ||
* | ||
* This program is distributed in the hope that it would be useful, but | ||
* WITHOUT ANY WARRANTY; without even the implied warranty of | ||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | ||
* | ||
*/ | ||
|
||
#include <linux/cgroup.h> | ||
#include <linux/slab.h> | ||
#include <linux/hugetlb.h> | ||
#include <linux/hugetlb_cgroup.h> | ||
|
||
struct hugetlb_cgroup { | ||
struct cgroup_subsys_state css; | ||
/* | ||
* the counter to account for hugepages from hugetlb. | ||
*/ | ||
struct res_counter hugepage[HUGE_MAX_HSTATE]; | ||
}; | ||
|
||
struct cgroup_subsys hugetlb_subsys __read_mostly; | ||
static struct hugetlb_cgroup *root_h_cgroup __read_mostly; | ||
|
||
static inline | ||
struct hugetlb_cgroup *hugetlb_cgroup_from_css(struct cgroup_subsys_state *s) | ||
{ | ||
return container_of(s, struct hugetlb_cgroup, css); | ||
} | ||
|
||
static inline | ||
struct hugetlb_cgroup *hugetlb_cgroup_from_cgroup(struct cgroup *cgroup) | ||
{ | ||
return hugetlb_cgroup_from_css(cgroup_subsys_state(cgroup, | ||
hugetlb_subsys_id)); | ||
} | ||
|
||
static inline | ||
struct hugetlb_cgroup *hugetlb_cgroup_from_task(struct task_struct *task) | ||
{ | ||
return hugetlb_cgroup_from_css(task_subsys_state(task, | ||
hugetlb_subsys_id)); | ||
} | ||
|
||
static inline bool hugetlb_cgroup_is_root(struct hugetlb_cgroup *h_cg) | ||
{ | ||
return (h_cg == root_h_cgroup); | ||
} | ||
|
||
static inline struct hugetlb_cgroup *parent_hugetlb_cgroup(struct cgroup *cg) | ||
{ | ||
if (!cg->parent) | ||
return NULL; | ||
return hugetlb_cgroup_from_cgroup(cg->parent); | ||
} | ||
|
||
static inline bool hugetlb_cgroup_have_usage(struct cgroup *cg) | ||
{ | ||
int idx; | ||
struct hugetlb_cgroup *h_cg = hugetlb_cgroup_from_cgroup(cg); | ||
|
||
for (idx = 0; idx < hugetlb_max_hstate; idx++) { | ||
if ((res_counter_read_u64(&h_cg->hugepage[idx], RES_USAGE)) > 0) | ||
return true; | ||
} | ||
return false; | ||
} | ||
|
||
static struct cgroup_subsys_state *hugetlb_cgroup_create(struct cgroup *cgroup) | ||
{ | ||
int idx; | ||
struct cgroup *parent_cgroup; | ||
struct hugetlb_cgroup *h_cgroup, *parent_h_cgroup; | ||
|
||
h_cgroup = kzalloc(sizeof(*h_cgroup), GFP_KERNEL); | ||
if (!h_cgroup) | ||
return ERR_PTR(-ENOMEM); | ||
|
||
parent_cgroup = cgroup->parent; | ||
if (parent_cgroup) { | ||
parent_h_cgroup = hugetlb_cgroup_from_cgroup(parent_cgroup); | ||
for (idx = 0; idx < HUGE_MAX_HSTATE; idx++) | ||
res_counter_init(&h_cgroup->hugepage[idx], | ||
&parent_h_cgroup->hugepage[idx]); | ||
} else { | ||
root_h_cgroup = h_cgroup; | ||
for (idx = 0; idx < HUGE_MAX_HSTATE; idx++) | ||
res_counter_init(&h_cgroup->hugepage[idx], NULL); | ||
} | ||
return &h_cgroup->css; | ||
} | ||
|
||
static void hugetlb_cgroup_destroy(struct cgroup *cgroup) | ||
{ | ||
struct hugetlb_cgroup *h_cgroup; | ||
|
||
h_cgroup = hugetlb_cgroup_from_cgroup(cgroup); | ||
kfree(h_cgroup); | ||
} | ||
|
||
static int hugetlb_cgroup_pre_destroy(struct cgroup *cgroup) | ||
{ | ||
/* We will add the cgroup removal support in later patches */ | ||
return -EBUSY; | ||
} | ||
|
||
struct cgroup_subsys hugetlb_subsys = { | ||
.name = "hugetlb", | ||
.create = hugetlb_cgroup_create, | ||
.pre_destroy = hugetlb_cgroup_pre_destroy, | ||
.destroy = hugetlb_cgroup_destroy, | ||
.subsys_id = hugetlb_subsys_id, | ||
}; |