Attach the controller to the containers. This will work with the SLUB allocator only. However, if we need I can port this on SLAB (and maybe SLOB ;) ). This setup is simple and stupid. Signed-off-by: Pavel Emelyanov <xemul@xxxxxxxxxx> --- diff --git a/include/linux/container_subsys.h b/include/linux/container_subsys.h index 81d11c2..9dd90d9 100644 --- a/include/linux/container_subsys.h +++ b/include/linux/container_subsys.h @@ -36,3 +36,9 @@ SUBSYS(mem_container) #endif /* */ + +#ifdef CONFIG_CONTAINER_KMEM +SUBSYS(kmem) +#endif + +/* */ diff --git a/init/Kconfig b/init/Kconfig index 0bb211a..326fd55 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -353,6 +353,12 @@ config CONTAINER_MEM_CONT Provides a memory controller that manages both page cache and RSS memory. +config CONTAINER_KMEM + bool "Kernel memory controller for containers" + depends on CONTAINERS && RESOURCE_COUNTERS && SLUB + help + Provides a kernel memory usage control for containers + config PROC_PID_CPUSET bool "Include legacy /proc/<pid>/cpuset file" depends on CPUSETS diff --git a/mm/Makefile b/mm/Makefile index 6237dd6..1cb7e6d 100644 --- a/mm/Makefile +++ b/mm/Makefile @@ -31,4 +31,5 @@ obj-$(CONFIG_MIGRATION) += migrate.o obj-$(CONFIG_SMP) += allocpercpu.o obj-$(CONFIG_QUICKLIST) += quicklist.o obj-$(CONFIG_CONTAINER_MEM_CONT) += memcontrol.o +obj-$(CONFIG_CONTAINER_KMEM) += kmemcontrol.o diff --git a/mm/kmemcontrol.c b/mm/kmemcontrol.c new file mode 100644 index 0000000..a2c45bb --- /dev/null +++ b/mm/kmemcontrol.c @@ -0,0 +1,123 @@ +/* + * kmemcontrol.c - Kernel Memory Controller + * + * Copyright 2007 OpenVZ SWsoft Inc + * Author: Pavel Emelyanov <xemul@xxxxxxxxxx> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include <linux/mm.h> +#include <linux/container.h> +#include <linux/res_counter.h> +#include <linux/err.h> + +struct kmem_container { + struct container_subsys_state css; + struct res_counter res; +}; + +static inline +struct kmem_container *css_to_kmem(struct container_subsys_state *css) +{ + return container_of(css, struct kmem_container, css); +} + +static inline +struct kmem_container *container_to_kmem(struct container *cont) +{ + return css_to_kmem(container_subsys_state(cont, kmem_subsys_id)); +} + +static inline +struct kmem_container *task_kmem_container(struct task_struct *tsk) +{ + return css_to_kmem(task_subsys_state(tsk, kmem_subsys_id)); +} + +/* + * containers interface + */ + +static struct kmem_container init_kmem_container; + +static struct container_subsys_state *kmem_create(struct container_subsys *ss, + struct container *container) +{ + struct kmem_container *mem; + + if (unlikely((container->parent) == NULL)) + mem = &init_kmem_container; + else + mem = kzalloc(sizeof(struct kmem_container), GFP_KERNEL); + + if (mem == NULL) + return ERR_PTR(-ENOMEM); + + res_counter_init(&mem->res); + return &mem->css; + +} + +static void kmem_destroy(struct container_subsys *ss, + struct container *container) +{ + kfree(container_to_kmem(container)); +} + +static ssize_t kmem_container_read(struct container *cont, struct cftype *cft, + struct file *file, char __user *userbuf, size_t nbytes, + loff_t *ppos) +{ + return res_counter_read(&container_to_kmem(cont)->res, + cft->private, userbuf, nbytes, ppos, NULL); +} + +static ssize_t kmem_container_write(struct container *cont, struct cftype *cft, + struct file *file, const char __user *userbuf, + size_t nbytes, loff_t *ppos) +{ + return res_counter_write(&container_to_kmem(cont)->res, + cft->private, userbuf, nbytes, ppos, NULL); +} + +static struct cftype kmem_files[] = { + { + .name = "usage", + .private = RES_USAGE, + .read = kmem_container_read, + }, + { + .name = "limit", + .private = RES_LIMIT, + .write = kmem_container_write, + .read = kmem_container_read, + }, + { + .name = "failcnt", + .private = RES_FAILCNT, + .read = kmem_container_read, + }, +}; + +static int kmem_populate(struct container_subsys *ss, struct container *cnt) +{ + return container_add_files(cnt, ss, kmem_files, ARRAY_SIZE(kmem_files)); +} + +struct container_subsys kmem_subsys = { + .name = "kmem", + .create = kmem_create, + .destroy = kmem_destroy, + .populate = kmem_populate, + .subsys_id = kmem_subsys_id, + .early_init = 1, +}; _______________________________________________ Containers mailing list Containers@xxxxxxxxxxxxxxxxxxxxxxxxxx https://lists.linux-foundation.org/mailman/listinfo/containers