From: Balbir Singh <balbir@in.ibm.com> To: linux-kernel@vger.kernel.org Cc: vatsa@in.ibm.com, ckrm-tech@lists.sourceforge.net, xemul@sw.ru, linux-mm@kvack.org, menage@google.com, svaidy@linux.vnet.ibm.com, Balbir Singh <balbir@in.ibm.com>, devel@openvz.org Subject: [RFC][PATCH][1/4] RSS controller setup Date: Mon, 19 Feb 2007 12:20:26 +0530 [thread overview] Message-ID: <20070219065026.3626.36882.sendpatchset@balbir-laptop> (raw) In-Reply-To: <20070219065019.3626.33947.sendpatchset@balbir-laptop> This patch sets up the basic controller infrastructure on top of the containers infrastructure. Two files are provided for monitoring and control memctlr_usage and memctlr_limit. memctlr_usage shows the current usage (in pages, of RSS) and the limit set by the user. memctlr_limit can be used to set a limit on the RSS usage of the resource. A special value of 0, indicates that the usage is unlimited. The limit is set in units of pages. Signed-off-by: <balbir@in.ibm.com> --- include/linux/memctlr.h | 22 ++++++ init/Kconfig | 7 + mm/Makefile | 1 mm/memctlr.c | 169 ++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 199 insertions(+) diff -puN /dev/null include/linux/memctlr.h --- /dev/null 2007-02-02 22:51:23.000000000 +0530 +++ linux-2.6.20-balbir/include/linux/memctlr.h 2007-02-16 00:22:11.000000000 +0530 @@ -0,0 +1,22 @@ +/* memctlr.h - Memory Controller for containers + * + * Copyright (C) Balbir Singh, IBM Corp. 2006-2007 + * + * 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_MEMCTLR_H +#define _LINUX_MEMCTLR_H + +#ifdef CONFIG_CONTAINER_MEMCTLR + +#else /* CONFIG_CONTAINER_MEMCTLR */ + +#endif /* CONFIG_CONTAINER_MEMCTLR */ +#endif /* _LINUX_MEMCTLR_H */ diff -puN init/Kconfig~memctlr-setup init/Kconfig --- linux-2.6.20/init/Kconfig~memctlr-setup 2007-02-15 21:58:42.000000000 +0530 +++ linux-2.6.20-balbir/init/Kconfig 2007-02-15 21:58:42.000000000 +0530 @@ -306,6 +306,13 @@ config CONTAINER_NS for instance virtual servers and checkpoint/restart jobs. +config CONTAINER_MEMCTLR + bool "A simple RSS based memory controller" + select CONTAINERS + help + Provides a simple Resource Controller for monitoring and + controlling the total Resident Set Size of the tasks in a container + config RELAY bool "Kernel->user space relay support (formerly relayfs)" help diff -puN mm/Makefile~memctlr-setup mm/Makefile --- linux-2.6.20/mm/Makefile~memctlr-setup 2007-02-15 21:58:42.000000000 +0530 +++ linux-2.6.20-balbir/mm/Makefile 2007-02-15 21:58:42.000000000 +0530 @@ -29,3 +29,4 @@ obj-$(CONFIG_MEMORY_HOTPLUG) += memory_h obj-$(CONFIG_FS_XIP) += filemap_xip.o obj-$(CONFIG_MIGRATION) += migrate.o obj-$(CONFIG_SMP) += allocpercpu.o +obj-$(CONFIG_CONTAINER_MEMCTLR) += memctlr.o diff -puN /dev/null mm/memctlr.c --- /dev/null 2007-02-02 22:51:23.000000000 +0530 +++ linux-2.6.20-balbir/mm/memctlr.c 2007-02-16 00:22:11.000000000 +0530 @@ -0,0 +1,169 @@ +/* + * memctlr.c - Memory Controller for containers + * + * Copyright (C) Balbir Singh, IBM Corp. 2006-2007 + * + * 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/init.h> +#include <linux/parser.h> +#include <linux/fs.h> +#include <linux/container.h> +#include <linux/memctlr.h> + +#include <asm/uaccess.h> + +#define RES_USAGE_NO_LIMIT 0 +static const char version[] = "0.1"; + +struct res_counter { + unsigned long usage; /* The current usage of the resource being */ + /* counted */ + unsigned long limit; /* The limit on the resource */ + unsigned long nr_limit_exceeded; +}; + +struct memctlr { + struct container_subsys_state css; + struct res_counter counter; + spinlock_t lock; +}; + +static struct container_subsys memctlr_subsys; + +static inline struct memctlr *memctlr_from_cont(struct container *cont) +{ + return container_of(container_subsys_state(cont, &memctlr_subsys), + struct memctlr, css); +} + +static inline struct memctlr *memctlr_from_task(struct task_struct *p) +{ + return memctlr_from_cont(task_container(p, &memctlr_subsys)); +} + +static int memctlr_create(struct container_subsys *ss, struct container *cont) +{ + struct memctlr *mem = kzalloc(sizeof(*mem), GFP_KERNEL); + if (!mem) + return -ENOMEM; + + spin_lock_init(&mem->lock); + cont->subsys[memctlr_subsys.subsys_id] = &mem->css; + return 0; +} + +static void memctlr_destroy(struct container_subsys *ss, + struct container *cont) +{ + kfree(memctlr_from_cont(cont)); +} + +static ssize_t memctlr_write(struct container *cont, struct cftype *cft, + struct file *file, const char __user *userbuf, + size_t nbytes, loff_t *ppos) +{ + char *buffer; + int ret = 0; + unsigned long limit; + struct memctlr *mem = memctlr_from_cont(cont); + + BUG_ON(!mem); + if ((buffer = kmalloc(nbytes + 1, GFP_KERNEL)) == 0) + return -ENOMEM; + + buffer[nbytes] = 0; + if (copy_from_user(buffer, userbuf, nbytes)) { + ret = -EFAULT; + goto out_err; + } + + container_manage_lock(); + if (container_is_removed(cont)) { + ret = -ENODEV; + goto out_unlock; + } + + limit = simple_strtoul(buffer, NULL, 10); + /* + * 0 is a valid limit (unlimited resource usage) + */ + if (!limit && strcmp(buffer, "0")) + goto out_unlock; + + spin_lock(&mem->lock); + mem->counter.limit = limit; + spin_unlock(&mem->lock); + + ret = nbytes; +out_unlock: + container_manage_unlock(); +out_err: + kfree(buffer); + return ret; +} + +static ssize_t memctlr_read(struct container *cont, struct cftype *cft, + struct file *file, char __user *userbuf, + size_t nbytes, loff_t *ppos) +{ + unsigned long usage, limit; + char usagebuf[64]; /* Move away from stack later */ + char *s = usagebuf; + struct memctlr *mem = memctlr_from_cont(cont); + + spin_lock(&mem->lock); + usage = mem->counter.usage; + limit = mem->counter.limit; + spin_unlock(&mem->lock); + + s += sprintf(s, "usage %lu, limit %ld\n", usage, limit); + return simple_read_from_buffer(userbuf, nbytes, ppos, usagebuf, + s - usagebuf); +} + +static struct cftype memctlr_usage = { + .name = "memctlr_usage", + .read = memctlr_read, +}; + +static struct cftype memctlr_limit = { + .name = "memctlr_limit", + .write = memctlr_write, +}; + +static int memctlr_populate(struct container_subsys *ss, + struct container *cont) +{ + int rc; + if ((rc = container_add_file(cont, &memctlr_usage)) < 0) + return rc; + if ((rc = container_add_file(cont, &memctlr_limit)) < 0) + return rc; + return 0; +} + +static struct container_subsys memctlr_subsys = { + .name = "memctlr", + .create = memctlr_create, + .destroy = memctlr_destroy, + .populate = memctlr_populate, +}; + +int __init memctlr_init(void) +{ + int id; + + id = container_register_subsys(&memctlr_subsys); + printk("Initializing memctlr version %s, id %d\n", version, id); + return id < 0 ? id : 0; +} + +module_init(memctlr_init); _ -- Warm Regards, Balbir Singh
WARNING: multiple messages have this Message-ID (diff)
From: Balbir Singh <balbir@in.ibm.com> To: linux-kernel@vger.kernel.org Cc: vatsa@in.ibm.com, ckrm-tech@lists.sourceforge.net, xemul@sw.ru, linux-mm@kvack.org, menage@google.com, svaidy@linux.vnet.ibm.com, Balbir Singh <balbir@in.ibm.com>, devel@openvz.org Subject: [RFC][PATCH][1/4] RSS controller setup Date: Mon, 19 Feb 2007 12:20:26 +0530 [thread overview] Message-ID: <20070219065026.3626.36882.sendpatchset@balbir-laptop> (raw) In-Reply-To: <20070219065019.3626.33947.sendpatchset@balbir-laptop> This patch sets up the basic controller infrastructure on top of the containers infrastructure. Two files are provided for monitoring and control memctlr_usage and memctlr_limit. memctlr_usage shows the current usage (in pages, of RSS) and the limit set by the user. memctlr_limit can be used to set a limit on the RSS usage of the resource. A special value of 0, indicates that the usage is unlimited. The limit is set in units of pages. Signed-off-by: <balbir@in.ibm.com> --- include/linux/memctlr.h | 22 ++++++ init/Kconfig | 7 + mm/Makefile | 1 mm/memctlr.c | 169 ++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 199 insertions(+) diff -puN /dev/null include/linux/memctlr.h --- /dev/null 2007-02-02 22:51:23.000000000 +0530 +++ linux-2.6.20-balbir/include/linux/memctlr.h 2007-02-16 00:22:11.000000000 +0530 @@ -0,0 +1,22 @@ +/* memctlr.h - Memory Controller for containers + * + * Copyright (C) Balbir Singh, IBM Corp. 2006-2007 + * + * 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_MEMCTLR_H +#define _LINUX_MEMCTLR_H + +#ifdef CONFIG_CONTAINER_MEMCTLR + +#else /* CONFIG_CONTAINER_MEMCTLR */ + +#endif /* CONFIG_CONTAINER_MEMCTLR */ +#endif /* _LINUX_MEMCTLR_H */ diff -puN init/Kconfig~memctlr-setup init/Kconfig --- linux-2.6.20/init/Kconfig~memctlr-setup 2007-02-15 21:58:42.000000000 +0530 +++ linux-2.6.20-balbir/init/Kconfig 2007-02-15 21:58:42.000000000 +0530 @@ -306,6 +306,13 @@ config CONTAINER_NS for instance virtual servers and checkpoint/restart jobs. +config CONTAINER_MEMCTLR + bool "A simple RSS based memory controller" + select CONTAINERS + help + Provides a simple Resource Controller for monitoring and + controlling the total Resident Set Size of the tasks in a container + config RELAY bool "Kernel->user space relay support (formerly relayfs)" help diff -puN mm/Makefile~memctlr-setup mm/Makefile --- linux-2.6.20/mm/Makefile~memctlr-setup 2007-02-15 21:58:42.000000000 +0530 +++ linux-2.6.20-balbir/mm/Makefile 2007-02-15 21:58:42.000000000 +0530 @@ -29,3 +29,4 @@ obj-$(CONFIG_MEMORY_HOTPLUG) += memory_h obj-$(CONFIG_FS_XIP) += filemap_xip.o obj-$(CONFIG_MIGRATION) += migrate.o obj-$(CONFIG_SMP) += allocpercpu.o +obj-$(CONFIG_CONTAINER_MEMCTLR) += memctlr.o diff -puN /dev/null mm/memctlr.c --- /dev/null 2007-02-02 22:51:23.000000000 +0530 +++ linux-2.6.20-balbir/mm/memctlr.c 2007-02-16 00:22:11.000000000 +0530 @@ -0,0 +1,169 @@ +/* + * memctlr.c - Memory Controller for containers + * + * Copyright (C) Balbir Singh, IBM Corp. 2006-2007 + * + * 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/init.h> +#include <linux/parser.h> +#include <linux/fs.h> +#include <linux/container.h> +#include <linux/memctlr.h> + +#include <asm/uaccess.h> + +#define RES_USAGE_NO_LIMIT 0 +static const char version[] = "0.1"; + +struct res_counter { + unsigned long usage; /* The current usage of the resource being */ + /* counted */ + unsigned long limit; /* The limit on the resource */ + unsigned long nr_limit_exceeded; +}; + +struct memctlr { + struct container_subsys_state css; + struct res_counter counter; + spinlock_t lock; +}; + +static struct container_subsys memctlr_subsys; + +static inline struct memctlr *memctlr_from_cont(struct container *cont) +{ + return container_of(container_subsys_state(cont, &memctlr_subsys), + struct memctlr, css); +} + +static inline struct memctlr *memctlr_from_task(struct task_struct *p) +{ + return memctlr_from_cont(task_container(p, &memctlr_subsys)); +} + +static int memctlr_create(struct container_subsys *ss, struct container *cont) +{ + struct memctlr *mem = kzalloc(sizeof(*mem), GFP_KERNEL); + if (!mem) + return -ENOMEM; + + spin_lock_init(&mem->lock); + cont->subsys[memctlr_subsys.subsys_id] = &mem->css; + return 0; +} + +static void memctlr_destroy(struct container_subsys *ss, + struct container *cont) +{ + kfree(memctlr_from_cont(cont)); +} + +static ssize_t memctlr_write(struct container *cont, struct cftype *cft, + struct file *file, const char __user *userbuf, + size_t nbytes, loff_t *ppos) +{ + char *buffer; + int ret = 0; + unsigned long limit; + struct memctlr *mem = memctlr_from_cont(cont); + + BUG_ON(!mem); + if ((buffer = kmalloc(nbytes + 1, GFP_KERNEL)) == 0) + return -ENOMEM; + + buffer[nbytes] = 0; + if (copy_from_user(buffer, userbuf, nbytes)) { + ret = -EFAULT; + goto out_err; + } + + container_manage_lock(); + if (container_is_removed(cont)) { + ret = -ENODEV; + goto out_unlock; + } + + limit = simple_strtoul(buffer, NULL, 10); + /* + * 0 is a valid limit (unlimited resource usage) + */ + if (!limit && strcmp(buffer, "0")) + goto out_unlock; + + spin_lock(&mem->lock); + mem->counter.limit = limit; + spin_unlock(&mem->lock); + + ret = nbytes; +out_unlock: + container_manage_unlock(); +out_err: + kfree(buffer); + return ret; +} + +static ssize_t memctlr_read(struct container *cont, struct cftype *cft, + struct file *file, char __user *userbuf, + size_t nbytes, loff_t *ppos) +{ + unsigned long usage, limit; + char usagebuf[64]; /* Move away from stack later */ + char *s = usagebuf; + struct memctlr *mem = memctlr_from_cont(cont); + + spin_lock(&mem->lock); + usage = mem->counter.usage; + limit = mem->counter.limit; + spin_unlock(&mem->lock); + + s += sprintf(s, "usage %lu, limit %ld\n", usage, limit); + return simple_read_from_buffer(userbuf, nbytes, ppos, usagebuf, + s - usagebuf); +} + +static struct cftype memctlr_usage = { + .name = "memctlr_usage", + .read = memctlr_read, +}; + +static struct cftype memctlr_limit = { + .name = "memctlr_limit", + .write = memctlr_write, +}; + +static int memctlr_populate(struct container_subsys *ss, + struct container *cont) +{ + int rc; + if ((rc = container_add_file(cont, &memctlr_usage)) < 0) + return rc; + if ((rc = container_add_file(cont, &memctlr_limit)) < 0) + return rc; + return 0; +} + +static struct container_subsys memctlr_subsys = { + .name = "memctlr", + .create = memctlr_create, + .destroy = memctlr_destroy, + .populate = memctlr_populate, +}; + +int __init memctlr_init(void) +{ + int id; + + id = container_register_subsys(&memctlr_subsys); + printk("Initializing memctlr version %s, id %d\n", version, id); + return id < 0 ? id : 0; +} + +module_init(memctlr_init); _ -- Warm Regards, Balbir Singh -- 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>
next prev parent reply other threads:[~2007-02-19 6:50 UTC|newest] Thread overview: 76+ messages / expand[flat|nested] mbox.gz Atom feed top 2007-02-19 6:50 [RFC][PATCH][0/4] Memory controller (RSS Control) Balbir Singh 2007-02-19 6:50 ` Balbir Singh 2007-02-19 6:50 ` Balbir Singh [this message] 2007-02-19 6:50 ` [RFC][PATCH][1/4] RSS controller setup Balbir Singh 2007-02-19 8:57 ` Andrew Morton 2007-02-19 8:57 ` Andrew Morton 2007-02-19 9:18 ` Paul Menage 2007-02-19 9:18 ` Paul Menage 2007-02-19 11:13 ` Balbir Singh 2007-02-19 11:13 ` Balbir Singh 2007-02-19 19:43 ` Matthew Helsley 2007-02-19 19:43 ` Matthew Helsley 2007-02-19 10:06 ` Balbir Singh 2007-02-19 10:06 ` Balbir Singh 2007-02-19 6:50 ` [RFC][PATCH][2/4] Add RSS accounting and control Balbir Singh 2007-02-19 6:50 ` Balbir Singh 2007-02-19 8:58 ` Andrew Morton 2007-02-19 8:58 ` Andrew Morton 2007-02-19 10:37 ` [ckrm-tech] " Balbir Singh 2007-02-19 10:37 ` Balbir Singh 2007-02-19 11:01 ` Andrew Morton 2007-02-19 11:01 ` Andrew Morton 2007-02-19 11:09 ` Balbir Singh 2007-02-19 11:09 ` Balbir Singh 2007-02-19 11:23 ` Andrew Morton 2007-02-19 11:23 ` Andrew Morton 2007-02-19 11:56 ` Balbir Singh 2007-02-19 11:56 ` Balbir Singh 2007-02-19 12:09 ` Paul Menage 2007-02-19 12:09 ` Paul Menage 2007-02-19 14:10 ` Balbir Singh 2007-02-19 14:10 ` Balbir Singh 2007-02-19 16:07 ` Vaidyanathan Srinivasan 2007-02-19 16:07 ` Vaidyanathan Srinivasan 2007-02-19 16:17 ` Balbir Singh 2007-02-19 16:17 ` Balbir Singh 2007-02-20 6:40 ` Vaidyanathan Srinivasan 2007-02-20 6:40 ` Vaidyanathan Srinivasan 2007-02-19 6:50 ` [RFC][PATCH][3/4] Add reclaim support Balbir Singh 2007-02-19 6:50 ` Balbir Singh 2007-02-19 8:59 ` Andrew Morton 2007-02-19 8:59 ` Andrew Morton 2007-02-19 10:50 ` Balbir Singh 2007-02-19 10:50 ` Balbir Singh 2007-02-19 11:10 ` Andrew Morton 2007-02-19 11:10 ` Andrew Morton 2007-02-19 11:16 ` Balbir Singh 2007-02-19 11:16 ` Balbir Singh 2007-02-19 9:48 ` KAMEZAWA Hiroyuki 2007-02-19 9:48 ` KAMEZAWA Hiroyuki 2007-02-19 10:52 ` Balbir Singh 2007-02-19 10:52 ` Balbir Singh 2007-02-19 6:50 ` [RFC][PATCH][4/4] RSS controller documentation Balbir Singh 2007-02-19 6:50 ` Balbir Singh 2007-02-19 8:54 ` [RFC][PATCH][0/4] Memory controller (RSS Control) Andrew Morton 2007-02-19 8:54 ` Andrew Morton 2007-02-19 9:06 ` Paul Menage 2007-02-19 9:06 ` Paul Menage 2007-02-19 9:50 ` [ckrm-tech] " Kirill Korotaev 2007-02-19 9:50 ` Kirill Korotaev 2007-02-19 9:50 ` Paul Menage 2007-02-19 9:50 ` Paul Menage 2007-02-19 10:24 ` Balbir Singh 2007-02-19 10:24 ` Balbir Singh 2007-02-19 10:39 ` Balbir Singh 2007-02-19 10:39 ` Balbir Singh 2007-02-19 9:16 ` Magnus Damm 2007-02-19 9:16 ` Magnus Damm 2007-02-19 10:45 ` Balbir Singh 2007-02-19 10:45 ` Balbir Singh 2007-02-19 11:56 ` Magnus Damm 2007-02-19 11:56 ` Magnus Damm 2007-02-19 14:07 ` Balbir Singh 2007-02-19 14:07 ` Balbir Singh 2007-02-19 10:00 ` Balbir Singh 2007-02-19 10:00 ` Balbir Singh
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=20070219065026.3626.36882.sendpatchset@balbir-laptop \ --to=balbir@in.ibm.com \ --cc=ckrm-tech@lists.sourceforge.net \ --cc=devel@openvz.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=menage@google.com \ --cc=svaidy@linux.vnet.ibm.com \ --cc=vatsa@in.ibm.com \ --cc=xemul@sw.ru \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.