diff options
author | Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> | 2012-07-31 19:42:24 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-31 21:42:41 -0400 |
commit | abb8206cb07734d0b7bf033c715995d6371a94c3 (patch) | |
tree | a27a55420bd6fad941c559bb80176f10931deb60 /mm/hugetlb_cgroup.c | |
parent | da1def55919f4852c4759249a78d63a0c5d2d8f9 (diff) |
hugetlb/cgroup: add hugetlb cgroup control files
Add the control files for hugetlb controller
[akpm@linux-foundation.org: s/CONFIG_CGROUP_HUGETLB_RES_CTLR/CONFIG_MEMCG_HUGETLB/g]
[akpm@linux-foundation.org: s/CONFIG_MEMCG_HUGETLB/CONFIG_CGROUP_HUGETLB/]
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Cc: David Rientjes <rientjes@google.com>
Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Hillf Danton <dhillf@gmail.com>
Reviewed-by: Michal Hocko <mhocko@suse.cz>
Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/hugetlb_cgroup.c')
-rw-r--r-- | mm/hugetlb_cgroup.c | 129 |
1 files changed, 129 insertions, 0 deletions
diff --git a/mm/hugetlb_cgroup.c b/mm/hugetlb_cgroup.c index bc518bedea98..d1ca1196e62f 100644 --- a/mm/hugetlb_cgroup.c +++ b/mm/hugetlb_cgroup.c | |||
@@ -26,6 +26,10 @@ struct hugetlb_cgroup { | |||
26 | struct res_counter hugepage[HUGE_MAX_HSTATE]; | 26 | struct res_counter hugepage[HUGE_MAX_HSTATE]; |
27 | }; | 27 | }; |
28 | 28 | ||
29 | #define MEMFILE_PRIVATE(x, val) (((x) << 16) | (val)) | ||
30 | #define MEMFILE_IDX(val) (((val) >> 16) & 0xffff) | ||
31 | #define MEMFILE_ATTR(val) ((val) & 0xffff) | ||
32 | |||
29 | struct cgroup_subsys hugetlb_subsys __read_mostly; | 33 | struct cgroup_subsys hugetlb_subsys __read_mostly; |
30 | static struct hugetlb_cgroup *root_h_cgroup __read_mostly; | 34 | static struct hugetlb_cgroup *root_h_cgroup __read_mostly; |
31 | 35 | ||
@@ -257,6 +261,131 @@ void hugetlb_cgroup_uncharge_cgroup(int idx, unsigned long nr_pages, | |||
257 | return; | 261 | return; |
258 | } | 262 | } |
259 | 263 | ||
264 | static ssize_t hugetlb_cgroup_read(struct cgroup *cgroup, struct cftype *cft, | ||
265 | struct file *file, char __user *buf, | ||
266 | size_t nbytes, loff_t *ppos) | ||
267 | { | ||
268 | u64 val; | ||
269 | char str[64]; | ||
270 | int idx, name, len; | ||
271 | struct hugetlb_cgroup *h_cg = hugetlb_cgroup_from_cgroup(cgroup); | ||
272 | |||
273 | idx = MEMFILE_IDX(cft->private); | ||
274 | name = MEMFILE_ATTR(cft->private); | ||
275 | |||
276 | val = res_counter_read_u64(&h_cg->hugepage[idx], name); | ||
277 | len = scnprintf(str, sizeof(str), "%llu\n", (unsigned long long)val); | ||
278 | return simple_read_from_buffer(buf, nbytes, ppos, str, len); | ||
279 | } | ||
280 | |||
281 | static int hugetlb_cgroup_write(struct cgroup *cgroup, struct cftype *cft, | ||
282 | const char *buffer) | ||
283 | { | ||
284 | int idx, name, ret; | ||
285 | unsigned long long val; | ||
286 | struct hugetlb_cgroup *h_cg = hugetlb_cgroup_from_cgroup(cgroup); | ||
287 | |||
288 | idx = MEMFILE_IDX(cft->private); | ||
289 | name = MEMFILE_ATTR(cft->private); | ||
290 | |||
291 | switch (name) { | ||
292 | case RES_LIMIT: | ||
293 | if (hugetlb_cgroup_is_root(h_cg)) { | ||
294 | /* Can't set limit on root */ | ||
295 | ret = -EINVAL; | ||
296 | break; | ||
297 | } | ||
298 | /* This function does all necessary parse...reuse it */ | ||
299 | ret = res_counter_memparse_write_strategy(buffer, &val); | ||
300 | if (ret) | ||
301 | break; | ||
302 | ret = res_counter_set_limit(&h_cg->hugepage[idx], val); | ||
303 | break; | ||
304 | default: | ||
305 | ret = -EINVAL; | ||
306 | break; | ||
307 | } | ||
308 | return ret; | ||
309 | } | ||
310 | |||
311 | static int hugetlb_cgroup_reset(struct cgroup *cgroup, unsigned int event) | ||
312 | { | ||
313 | int idx, name, ret = 0; | ||
314 | struct hugetlb_cgroup *h_cg = hugetlb_cgroup_from_cgroup(cgroup); | ||
315 | |||
316 | idx = MEMFILE_IDX(event); | ||
317 | name = MEMFILE_ATTR(event); | ||
318 | |||
319 | switch (name) { | ||
320 | case RES_MAX_USAGE: | ||
321 | res_counter_reset_max(&h_cg->hugepage[idx]); | ||
322 | break; | ||
323 | case RES_FAILCNT: | ||
324 | res_counter_reset_failcnt(&h_cg->hugepage[idx]); | ||
325 | break; | ||
326 | default: | ||
327 | ret = -EINVAL; | ||
328 | break; | ||
329 | } | ||
330 | return ret; | ||
331 | } | ||
332 | |||
333 | static char *mem_fmt(char *buf, int size, unsigned long hsize) | ||
334 | { | ||
335 | if (hsize >= (1UL << 30)) | ||
336 | snprintf(buf, size, "%luGB", hsize >> 30); | ||
337 | else if (hsize >= (1UL << 20)) | ||
338 | snprintf(buf, size, "%luMB", hsize >> 20); | ||
339 | else | ||
340 | snprintf(buf, size, "%luKB", hsize >> 10); | ||
341 | return buf; | ||
342 | } | ||
343 | |||
344 | int __init hugetlb_cgroup_file_init(int idx) | ||
345 | { | ||
346 | char buf[32]; | ||
347 | struct cftype *cft; | ||
348 | struct hstate *h = &hstates[idx]; | ||
349 | |||
350 | /* format the size */ | ||
351 | mem_fmt(buf, 32, huge_page_size(h)); | ||
352 | |||
353 | /* Add the limit file */ | ||
354 | cft = &h->cgroup_files[0]; | ||
355 | snprintf(cft->name, MAX_CFTYPE_NAME, "%s.limit_in_bytes", buf); | ||
356 | cft->private = MEMFILE_PRIVATE(idx, RES_LIMIT); | ||
357 | cft->read = hugetlb_cgroup_read; | ||
358 | cft->write_string = hugetlb_cgroup_write; | ||
359 | |||
360 | /* Add the usage file */ | ||
361 | cft = &h->cgroup_files[1]; | ||
362 | snprintf(cft->name, MAX_CFTYPE_NAME, "%s.usage_in_bytes", buf); | ||
363 | cft->private = MEMFILE_PRIVATE(idx, RES_USAGE); | ||
364 | cft->read = hugetlb_cgroup_read; | ||
365 | |||
366 | /* Add the MAX usage file */ | ||
367 | cft = &h->cgroup_files[2]; | ||
368 | snprintf(cft->name, MAX_CFTYPE_NAME, "%s.max_usage_in_bytes", buf); | ||
369 | cft->private = MEMFILE_PRIVATE(idx, RES_MAX_USAGE); | ||
370 | cft->trigger = hugetlb_cgroup_reset; | ||
371 | cft->read = hugetlb_cgroup_read; | ||
372 | |||
373 | /* Add the failcntfile */ | ||
374 | cft = &h->cgroup_files[3]; | ||
375 | snprintf(cft->name, MAX_CFTYPE_NAME, "%s.failcnt", buf); | ||
376 | cft->private = MEMFILE_PRIVATE(idx, RES_FAILCNT); | ||
377 | cft->trigger = hugetlb_cgroup_reset; | ||
378 | cft->read = hugetlb_cgroup_read; | ||
379 | |||
380 | /* NULL terminate the last cft */ | ||
381 | cft = &h->cgroup_files[4]; | ||
382 | memset(cft, 0, sizeof(*cft)); | ||
383 | |||
384 | WARN_ON(cgroup_add_cftypes(&hugetlb_subsys, h->cgroup_files)); | ||
385 | |||
386 | return 0; | ||
387 | } | ||
388 | |||
260 | struct cgroup_subsys hugetlb_subsys = { | 389 | struct cgroup_subsys hugetlb_subsys = { |
261 | .name = "hugetlb", | 390 | .name = "hugetlb", |
262 | .create = hugetlb_cgroup_create, | 391 | .create = hugetlb_cgroup_create, |