[-mm PATCH 0/8] Memory controller introduction (v2)
Changelog since version 1 1. Fixed some compile time errors (in mm/migrate.c from Vaidyanathan S) 2. Fixed a panic seen when LIST_DEBUG is enabled 3. Added a mechanism to control whether we track page cache or both page cache and mapped pages (as requested by Pavel) This patchset implements another version of the memory controller. These patches have been through a big churn, the first set of patches were posted last year and earlier this year at http://lkml.org/lkml/2007/2/19/10 Ever since, the RSS controller has been through four revisions, the latest one being http://lwn.net/Articles/236817/ This patchset draws from the patches listed above and from some of the contents of the patches posted by Vaidyanathan for page cache control. http://lkml.org/lkml/2007/6/20/92 Pavel, Vaidy could you look at the patches and add your signed off by where relevant? At OLS, the resource management BOF, it was discussed that we need to manage RSS and unmapped page cache together. This patchset is a step towards that TODO's 1. Add memory controller water mark support. Reclaim on high water mark 2. Add support for shrinking on limit change 3. Add per zone per container LRU lists 4. Make page_referenced() container aware 5. Figure out a better CLUI for the controller In case you have been using/testing the RSS controller, you'll find that this controller works slower than the RSS controller. The reason being that both swap cache and page cache is accounted for, so pages do go out to swap upon reclaim (they cannot live in the swap cache). I've test compiled the framework without the controller enabled, tested the code on UML and minimally on a power box. Any test output, feedback, comments, suggestions are welcome! series res_counters_infra.patch mem-control-setup.patch mem-control-accounting-setup.patch mem-control-accounting.patch mem-control-task-migration.patch mem-control-lru-and-reclaim.patch mem-control-out-of-memory.patch -- Warm Regards, Balbir Singh Linux Technology Center IBM, ISTL _______________________________________________ Containers mailing list Containers@lists.linux-foundation.org https://lists.linux-foundation.org/mailman/listinfo/containers
[-mm PATCH 1/8] Memory controller resource counters (v2)
From: Pavel Emelianov <xemul@openvz.org> Introduce generic structures and routines for resource accounting. Each resource accounting container is supposed to aggregate it, container_subsystem_state and its resource-specific members within. Signed-off-by: Pavel Emelianov <xemul@openvz.org> Signed-off-by: Balbir Singh <balbir@linux.vnet.ibm.com> --- include/linux/res_counter.h | 102 +++++++++++++++++++++++++++++++++++++ init/Kconfig | 4 + kernel/Makefile | 1 kernel/res_counter.c | 121 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 228 insertions(+) diff -puN /dev/null include/linux/res_counter.h --- /dev/null 2007-06-01 08:12:04.000000000 -0700 +++ linux-2.6.22-rc6-balbir/include/linux/res_counter.h 2007-07-05 13:45:17.000000000 -0700 @@ -0,0 +1,102 @@ +#ifndef __RES_COUNTER_H__ +#define __RES_COUNTER_H__ + +/* + * resource counters + * contain common data types and routines for resource accounting + * + * Copyright 2007 OpenVZ SWsoft Inc + * + * Author: Pavel Emelianov <xemul@openvz.org> + * + */ + +#include <linux/container.h> + +/* + * the core object. the container that wishes to account for some + * resource may include this counter into its structures and use + * the helpers described beyond + */ + +struct res_counter { + /* + * the current resource consumption level + */ + unsigned long usage; + /* + * the limit that usage cannot exceed + */ + unsigned long limit; + /* + * the number of insuccessful attempts to consume the resource + */ + unsigned long failcnt; + /* + * the lock to protect all of the above. + * the routines below consider this to be IRQ-safe + */ + spinlock_t lock; +}; + +/* + * helpers to interact with userspace + * res_counter_read/_write - put/get the specified fields from the + * res_counter struct to/from the user + * + * @cnt: the counter in question + * @member: the field to work with (see RES_xxx below) + * @buf: the buffer to opeate on,... + * @nbytes: its size... + * @pos: and the offset. + */ + +ssize_t res_counter_read(struct res_counter *cnt, int member, + const char __user *buf, size_t nbytes, loff_t *pos); +ssize_t res_counter_write(struct res_counter *cnt, int member, + const char __user *buf, size_t nbytes, loff_t *pos); + +/* + * the field descriptors. one for each member of res_counter + */ + +enum { + RES_USAGE, + RES_LIMIT, + RES_FAILCNT, +}; + +/* + * helpers for accounting + */ + +void res_counter_init(struct res_counter *cnt); + +/* + * charge - try to consume more resource. + * + * @cnt: the counter + * @val: the amount of the resource. each controller defines its own + * units, e.g. numbers, bytes, Kbytes, etc + * + * returns 0 on success and <0 if the cnt->usage will exceed the cnt->limit + * _locked call expects the cnt->lock to be taken + */ + +int res_counter_charge_locked(struct res_counter *cnt, unsigned long val); +int res_counter_charge(struct res_counter *cnt, unsigned long val); + +/* + * uncharge - tell that some portion of the resource is released + * + * @cnt: the counter + * @val: the amount of the resource + * + * these calls check for usage underflow and show a warning on the console + * _locked call expects the cnt->lock to be taken + */ + +void res_counter_uncharge_locked(struct res_counter *cnt, unsigned long val); +void res_counter_uncharge(struct res_counter *cnt, unsigned long val); + +#endif diff -puN init/Kconfig~res_counters_infra init/Kconfig --- linux-2.6.22-rc6/init/Kconfig~res_counters_infra 2007-07-05 13:45:17.000000000 -0700 +++ linux-2.6.22-rc6-balbir/init/Kconfig 2007-07-05 13:45:17.000000000 -0700 @@ -320,6 +320,10 @@ config CPUSETS Say N if unsure. +config RESOURCE_COUNTERS + bool + select CONTAINERS + config SYSFS_DEPRECATED bool "Create deprecated sysfs files" default y diff -puN kernel/Makefile~res_counters_infra kernel/Makefile --- linux-2.6.22-rc6/kernel/Makefile~res_counters_infra 2007-07-05 13:45:17.000000000 -0700 +++ linux-2.6.22-rc6-balbir/kernel/Makefile 2007-07-05 13:45:17.000000000 -0700 @@ -58,6 +58,7 @@ obj-$(CONFIG_RELAY) += relay.o obj-$(CONFIG_SYSCTL) += utsname_sysctl.o obj-$(CONFIG_TASK_DELAY_ACCT) += delayacct.o obj-$(CONFIG_TASKSTATS) += taskstats.o tsacct.o +obj-$(CONFIG_RESOURCE_COUNTERS) += res_counter.o ifneq ($(CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER),y) # According to Alan Modra <alan@linuxcare.com.au>, the -fno-omit-frame-pointer is diff -puN /dev/null kernel/res_counter.c --- /dev/null 2007-06-01 08:12:04.000000000 -0700 +++ linux-2.6.22-rc6-balbir/kernel/res_counter.c 2007-07-05 13:45:17.000000000 -0700 @@ -0,0 +1,121 @@ +/* + * resource containers + * + * Copyright 2007 OpenVZ SWsoft Inc + * + * Author: Pavel Emelianov <xemul@openvz.org> + * + */ + +#include <linux/types.h> +#include <linux/parser.h> +#include <linux/fs.h> +#include <linux/res_counter.h> +#include <linux/uaccess.h> + +void res_counter_init(struct res_counter *cnt) +{ + spin_lock_init(&cnt->lock); + cnt->limit = (unsigned long)LONG_MAX; +} + +int res_counter_charge_locked(struct res_counter *cnt, unsigned long val) +{ + if (cnt->usage <= cnt->limit - val) { + cnt->usage += val; + return 0; + } + + cnt->failcnt++; + return -ENOMEM; +} + +int res_counter_charge(struct res_counter *cnt, unsigned long val) +{ + int ret; + unsigned long flags; + + spin_lock_irqsave(&cnt->lock, flags); + ret = res_counter_charge_locked(cnt, val); + spin_unlock_irqrestore(&cnt->lock, flags); + return ret; +} + +void res_counter_uncharge_locked(struct res_counter *cnt, unsigned long val) +{ + if (unlikely(cnt->usage < val)) { + WARN_ON(1); + val = cnt->usage; + } + + cnt->usage -= val; +} + +void res_counter_uncharge(struct res_counter *cnt, unsigned long val) +{ + unsigned long flags; + + spin_lock_irqsave(&cnt->lock, flags); + res_counter_uncharge_locked(cnt, val); + spin_unlock_irqrestore(&cnt->lock, flags); +} + + +static inline unsigned long *res_counter_member(struct res_counter *cnt, int member) +{ + switch (member) { + case RES_USAGE: + return &cnt->usage; + case RES_LIMIT: + return &cnt->limit; + case RES_FAILCNT: + return &cnt->failcnt; + }; + + BUG(); + return NULL; +} + +ssize_t res_counter_read(struct res_counter *cnt, int member, + const char __user *userbuf, size_t nbytes, loff_t *pos) +{ + unsigned long *val; + char buf[64], *s; + + s = buf; + val = res_counter_member(cnt, member); + s += sprintf(s, "%lu\n", *val); + return simple_read_from_buffer((void __user *)userbuf, nbytes, + pos, buf, s - buf); +} + +ssize_t res_counter_write(struct res_counter *cnt, int member, + const char __user *userbuf, size_t nbytes, loff_t *pos) +{ + int ret; + char *buf, *end; + unsigned long tmp, *val; + + buf = kmalloc(nbytes + 1, GFP_KERNEL); + ret = -ENOMEM; + if (buf == NULL) + goto out; + + buf[nbytes] = 0; + ret = -EFAULT; + if (copy_from_user(buf, userbuf, nbytes)) + goto out_free; + + ret = -EINVAL; + tmp = simple_strtoul(buf, &end, 10); + if (*end != '\0') + goto out_free; + + val = res_counter_member(cnt, member); + *val = tmp; + ret = nbytes; +out_free: + kfree(buf); +out: + return ret; +} _ -- Warm Regards, Balbir Singh Linux Technology Center IBM, ISTL _______________________________________________ Containers mailing list Containers@lists.linux-foundation.org https://lists.linux-foundation.org/mailman/listinfo/containers
[-mm PATCH 2/8] Memory controller containers setup (v2)
Setup the memory container and add basic hooks and controls to integrate and work with the container. Signed-off-by: Balbir Singh <balbir@linux.vnet.ibm.com> --- include/linux/container_subsys.h | 6 + include/linux/memcontrol.h | 19 +++++ init/Kconfig | 8 ++ mm/Makefile | 1 mm/memcontrol.c | 141 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 175 insertions(+) diff -puN include/linux/container_subsys.h~mem-control-setup include/linux/container_subsys.h --- linux-2.6.22-rc6/include/linux/container_subsys.h~mem-control-setup 2007-07-05 13:45:17.000000000 -0700 +++ linux-2.6.22-rc6-balbir/include/linux/container_subsys.h 2007-07-05 13:45:17.000000000 -0700 @@ -30,3 +30,9 @@ SUBSYS(ns) #endif /* */ + +#ifdef CONFIG_CONTAINER_MEM_CONT +SUBSYS(mem_container) +#endif + +/* */ diff -puN init/Kconfig~mem-control-setup init/Kconfig --- linux-2.6.22-rc6/init/Kconfig~mem-control-setup 2007-07-05 13:45:17.000000000 -0700 +++ linux-2.6.22-rc6-balbir/init/Kconfig 2007-07-05 13:45:17.000000000 -0700 @@ -360,6 +360,14 @@ config CONTAINER_NS for instance virtual servers and checkpoint/restart jobs. +config CONTAINER_MEM_CONT + bool "Memory controller for containers" + select CONTAINERS + select RESOURCE_COUNTERS + help + Provides a memory controller that manages both page cache and + RSS memory. + config PROC_PID_CPUSET bool "Include legacy /proc/<pid>/cpuset file" depends on CPUSETS diff -puN mm/Makefile~mem-control-setup mm/Makefile --- linux-2.6.22-rc6/mm/Makefile~mem-control-setup 2007-07-05 13:45:17.000000000 -0700 +++ linux-2.6.22-rc6-balbir/mm/Makefile 2007-07-05 13:45:17.000000000 -0700 @@ -30,4 +30,5 @@ obj-$(CONFIG_FS_XIP) += filemap_xip.o obj-$(CONFIG_MIGRATION) += migrate.o obj-$(CONFIG_SMP) += allocpercpu.o obj-$(CONFIG_QUICKLIST) += quicklist.o +obj-$(CONFIG_CONTAINER_MEM_CONT) += memcontrol.o diff -puN /dev/null mm/memcontrol.c --- /dev/null 2007-06-01 08:12:04.000000000 -0700 +++ linux-2.6.22-rc6-balbir/mm/memcontrol.c 2007-07-05 13:45:17.000000000 -0700 @@ -0,0 +1,141 @@ +/* memcontrol.c - Memory Controller + * + * Copyright IBM Corporation, 2007 + * Author Balbir Singh <balbir@linux.vnet.ibm.com> + * + * 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/res_counter.h> +#include <linux/memcontrol.h> +#include <linux/container.h> + +struct container_subsys mem_container_subsys; + +/* + * The memory controller data structure. The memory controller controls both + * page cache and RSS per container. We would eventually like to provide + * statistics based on the statistics developed by Rik Van Riel for clock-pro, + * to help the administrator determine what knobs to tune. + * + * TODO: Add a water mark for the memory controller. Reclaim will begin when + * we hit the water mark. + */ +struct mem_container { + struct container_subsys_state css; + /* + * the counter to account for memory usage + */ + struct res_counter res; +}; + +/* + * A meta page is associated with every page descriptor. The meta page + * helps us identify information about the container + */ +struct meta_page { + struct list_head list; /* per container LRU list */ + struct page *page; + struct mem_container *mem_container; +}; + + +static inline struct mem_container *mem_container_from_cont(struct container + *cnt) +{ + return container_of(container_subsys_state(cnt, + mem_container_subsys_id), struct mem_container, + css); +} + +static ssize_t mem_container_read(struct container *cont, struct cftype *cft, + struct file *file, char __user *userbuf, size_t nbytes, + loff_t *ppos) +{ + return res_counter_read(&mem_container_from_cont(cont)->res, + cft->private, userbuf, nbytes, ppos); +} + +static ssize_t mem_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(&mem_container_from_cont(cont)->res, + cft->private, userbuf, nbytes, ppos); +} + +static struct cftype mem_container_usage = { + .name = "mem_usage", + .private = RES_USAGE, + .read = mem_container_read, +}; + +static struct cftype mem_container_limit = { + .name = "mem_limit", + .private = RES_LIMIT, + .write = mem_container_write, + .read = mem_container_read, +}; + +static struct cftype mem_container_failcnt = { + .name = "mem_failcnt", + .private = RES_FAILCNT, + .read = mem_container_read, +}; + +static int mem_container_create(struct container_subsys *ss, + struct container *cont) +{ + struct mem_container *mem; + + mem = kzalloc(sizeof(struct mem_container), GFP_KERNEL); + if (!mem) + return -ENOMEM; + + res_counter_init(&mem->res); + cont->subsys[mem_container_subsys_id] = &mem->css; + mem->css.container = cont; + return 0; +} + +static void mem_container_destroy(struct container_subsys *ss, + struct container *cont) +{ + kfree(mem_container_from_cont(cont)); +} + +static int mem_container_populate(struct container_subsys *ss, + struct container *cont) +{ + int rc = 0; + + rc = container_add_file(cont, &mem_container_usage); + if (rc < 0) + goto err; + + rc = container_add_file(cont, &mem_container_limit); + if (rc < 0) + goto err; + + rc = container_add_file(cont, &mem_container_failcnt); + if (rc < 0) + goto err; + +err: + return rc; +} + +struct container_subsys mem_container_subsys = { + .name = "mem_container", + .subsys_id = mem_container_subsys_id, + .create = mem_container_create, + .destroy = mem_container_destroy, + .populate = mem_container_populate, + .early_init = 0, +}; diff -puN /dev/null include/linux/memcontrol.h --- /dev/null 2007-06-01 08:12:04.000000000 -0700 +++ linux-2.6.22-rc6-balbir/include/linux/memcontrol.h 2007-07-05 13:45:17.000000000 -0700 @@ -0,0 +1,19 @@ +/* memcontrol.h - Memory Controller + * + * Copyright IBM Corporation, 2007 + * Author Balbir Singh <balbir@linux.vnet.ibm.com> + * + * 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_MEMCONTROL_H +#define _LINUX_MEMCONTROL_H + +#endif /* _LINUX_MEMCONTROL_H */ + _ -- Warm Regards, Balbir Singh Linux Technology Center IBM, ISTL _______________________________________________ Containers mailing list Containers@lists.linux-foundation.org https://lists.linux-foundation.org/mailman/listinfo/containers
[-mm PATCH 3/8] Memory controller accounting setup (v2)
Basic setup routines, the mm_struct has a pointer to the container that it belongs to and the the page has a meta_page associated with it. Signed-off-by: Balbir Singh <balbir@linux.vnet.ibm.com> --- include/linux/memcontrol.h | 32 ++++++++++++++++++++++++++++++ include/linux/mm_types.h | 4 +++ include/linux/sched.h | 4 +++ kernel/fork.c | 10 ++++++--- mm/memcontrol.c | 47 ++++++++++++++++++++++++++++++++++++++++++--- 5 files changed, 91 insertions(+), 6 deletions(-) diff -puN include/linux/memcontrol.h~mem-control-accounting-setup include/linux/memcontrol.h --- linux-2.6.22-rc6/include/linux/memcontrol.h~mem-control-accounting-setup 2007-07-05 13:45:17.000000000 -0700 +++ linux-2.6.22-rc6-balbir/include/linux/memcontrol.h 2007-07-05 13:45:17.000000000 -0700 @@ -15,5 +15,37 @@ #ifndef _LINUX_MEMCONTROL_H #define _LINUX_MEMCONTROL_H +struct mem_container; +struct meta_page; + +#ifdef CONFIG_CONTAINER_MEM_CONT + +extern void mm_init_container(struct mm_struct *mm, struct task_struct *p); +extern void mm_free_container(struct mm_struct *mm); +extern void page_assign_meta_page(struct page *page, struct meta_page *mp); +extern struct meta_page *page_get_meta_page(struct page *page); + +#else /* CONFIG_CONTAINER_MEM_CONT */ +static inline void mm_init_container(struct mm_struct *mm, + struct task_struct *p) +{ +} + +static inline void mm_free_container(struct mm_struct *mm) +{ +} + +static inline void page_assign_meta_page(struct page *page, + struct meta_page *mp) +{ +} + +static inline struct meta_page *page_get_meta_page(struct page *page) +{ + return NULL; +} + +#endif /* CONFIG_CONTAINER_MEM_CONT */ + #endif /* _LINUX_MEMCONTROL_H */ diff -puN include/linux/mm_types.h~mem-control-accounting-setup include/linux/mm_types.h --- linux-2.6.22-rc6/include/linux/mm_types.h~mem-control-accounting-setup 2007-07-05 13:45:17.000000000 -0700 +++ linux-2.6.22-rc6-balbir/include/linux/mm_types.h 2007-07-05 13:45:17.000000000 -0700 @@ -5,6 +5,7 @@ #include <linux/threads.h> #include <linux/list.h> #include <linux/spinlock.h> +#include <linux/memcontrol.h> struct address_space; @@ -83,6 +84,9 @@ struct page { unsigned int gfp_mask; unsigned long trace[8]; #endif +#ifdef CONFIG_CONTAINER_MEM_CONT + struct meta_page *meta_page; +#endif }; #endif /* _LINUX_MM_TYPES_H */ diff -puN include/linux/sched.h~mem-control-accounting-setup include/linux/sched.h --- linux-2.6.22-rc6/include/linux/sched.h~mem-control-accounting-setup 2007-07-05 13:45:17.000000000 -0700 +++ linux-2.6.22-rc6-balbir/include/linux/sched.h 2007-07-05 13:45:17.000000000 -0700 @@ -87,6 +87,7 @@ struct sched_param { #include <linux/timer.h> #include <linux/hrtimer.h> #include <linux/task_io_accounting.h> +#include <linux/memcontrol.h> #include <asm/processor.h> @@ -416,6 +417,9 @@ struct mm_struct { /* aio bits */ rwlock_t ioctx_list_lock; struct kioctx *ioctx_list; +#ifdef CONFIG_CONTAINER_MEM_CONT + struct mem_container *mem_container; +#endif }; struct sighand_struct { diff -puN kernel/fork.c~mem-control-accounting-setup kernel/fork.c --- linux-2.6.22-rc6/kernel/fork.c~mem-control-accounting-setup 2007-07-05 13:45:17.000000000 -0700 +++ linux-2.6.22-rc6-balbir/kernel/fork.c 2007-07-05 13:45:17.000000000 -0700 @@ -330,7 +330,7 @@ static inline void mm_free_pgd(struct mm #include <linux/init_task.h> -static struct mm_struct * mm_init(struct mm_struct * mm) +static struct mm_struct * mm_init(struct mm_struct * mm, struct task_struct *p) { atomic_set(&mm->mm_users, 1); atomic_set(&mm->mm_count, 1); @@ -347,11 +347,14 @@ static struct mm_struct * mm_init(struct mm->ioctx_list = NULL; mm->free_area_cache = TASK_UNMAPPED_BASE; mm->cached_hole_size = ~0UL; + mm_init_container(mm, p); if (likely(!mm_alloc_pgd(mm))) { mm->def_flags = 0; return mm; } + + mm_free_container(mm); free_mm(mm); return NULL; } @@ -366,7 +369,7 @@ struct mm_struct * mm_alloc(void) mm = allocate_mm(); if (mm) { memset(mm, 0, sizeof(*mm)); - mm = mm_init(mm); + mm = mm_init(mm, current); } return mm; } @@ -380,6 +383,7 @@ void fastcall __mmdrop(struct mm_struct { BUG_ON(mm == &init_mm); mm_free_pgd(mm); + mm_free_container(mm); destroy_context(mm); free_mm(mm); } @@ -500,7 +504,7 @@ static struct mm_struct *dup_mm(struct t mm->token_priority = 0; mm->last_interval = 0; - if (!mm_init(mm)) + if (!mm_init(mm, tsk)) goto fail_nomem; if (init_new_context(tsk, mm)) diff -puN mm/memcontrol.c~mem-control-accounting-setup mm/memcontrol.c --- linux-2.6.22-rc6/mm/memcontrol.c~mem-control-accounting-setup 2007-07-05 13:45:17.000000000 -0700 +++ linux-2.6.22-rc6-balbir/mm/memcontrol.c 2007-07-05 13:45:17.000000000 -0700 @@ -15,6 +15,7 @@ #include <linux/res_counter.h> #include <linux/memcontrol.h> #include <linux/container.h> +#include <linux/mm.h> struct container_subsys mem_container_subsys; @@ -33,6 +34,13 @@ struct mem_container { * the counter to account for memory usage */ struct res_counter res; + /* + * Per container active and inactive list, similar to the + * per zone LRU lists. + * TODO: Consider making these lists per zone + */ + struct list_head active_list; + struct list_head inactive_list; }; /* @@ -54,6 +62,31 @@ static inline struct mem_container *mem_ css); } +void mm_init_container(struct mm_struct *mm, struct task_struct *p) +{ + struct mem_container *mem; + + mem = mem_container_from_cont(task_container(p, + mem_container_subsys_id)); + css_get(&mem->css); + mm->mem_container = mem; +} + +void mm_free_container(struct mm_struct *mm) +{ + css_put(&mm->mem_container->css); +} + +void page_assign_meta_page(struct page *page, struct meta_page *mp) +{ + page->meta_page = mp; +} + +struct meta_page *page_get_meta_page(struct page *page) +{ + return page->meta_page; +} + static ssize_t mem_container_read(struct container *cont, struct cftype *cft, struct file *file, char __user *userbuf, size_t nbytes, loff_t *ppos) @@ -89,13 +122,21 @@ static struct cftype mem_container_failc .read = mem_container_read, }; +static struct mem_container init_mem_container; + static int mem_container_create(struct container_subsys *ss, struct container *cont) { struct mem_container *mem; - mem = kzalloc(sizeof(struct mem_container), GFP_KERNEL); - if (!mem) + if (unlikely((cont->parent) == NULL)) { + mem = &init_mem_container; + css_get(&mem->css); + init_mm.mem_container = mem; + } else + mem = kzalloc(sizeof(struct mem_container), GFP_KERNEL); + + if (mem == NULL) return -ENOMEM; res_counter_init(&mem->res); @@ -137,5 +178,5 @@ struct container_subsys mem_container_su .create = mem_container_create, .destroy = mem_container_destroy, .populate = mem_container_populate, - .early_init = 0, + .early_init = 1, }; _ -- Warm Regards, Balbir Singh Linux Technology Center IBM, ISTL _______________________________________________ Containers mailing list Containers@lists.linux-foundation.org https://lists.linux-foundation.org/mailman/listinfo/containers
[-mm PATCH 4/8] Memory controller memory accounting (v2)
Add the accounting hooks. The accounting is carried out for RSS and Page Cache (unmapped) pages. There is now a common limit and accounting for both. The RSS accounting is accounted at page_add_*_rmap() and page_remove_rmap() time. Page cache is accounted at add_to_page_cache(), __delete_from_page_cache(). Swap cache is also accounted for. Each page's meta_page is protected with a bit in page flags, this makes handling of race conditions involving simultaneous mappings of a page easier. A reference count is kept in the meta_page to deal with cases where a page might be unmapped from the RSS of all tasks, but still lives in the page cache. Signed-off-by: Balbir Singh <balbir@linux.vnet.ibm.com> --- fs/exec.c | 1 include/linux/memcontrol.h | 11 +++ include/linux/page-flags.h | 3 + mm/filemap.c | 8 ++ mm/memcontrol.c | 132 ++++++++++++++++++++++++++++++++++++++++++++- mm/memory.c | 22 +++++++ mm/migrate.c | 6 ++ mm/page_alloc.c | 3 + mm/rmap.c | 2 mm/swap_state.c | 8 ++ mm/swapfile.c | 40 +++++++------ 11 files changed, 218 insertions(+), 18 deletions(-) diff -puN fs/exec.c~mem-control-accounting fs/exec.c --- linux-2.6.22-rc6/fs/exec.c~mem-control-accounting 2007-07-05 13:45:18.000000000 -0700 +++ linux-2.6.22-rc6-balbir/fs/exec.c 2007-07-05 13:45:18.000000000 -0700 @@ -51,6 +51,7 @@ #include <linux/cn_proc.h> #include <linux/audit.h> #include <linux/signalfd.h> +#include <linux/memcontrol.h> #include <asm/uaccess.h> #include <asm/mmu_context.h> diff -puN include/linux/memcontrol.h~mem-control-accounting include/linux/memcontrol.h --- linux-2.6.22-rc6/include/linux/memcontrol.h~mem-control-accounting 2007-07-05 13:45:18.000000000 -0700 +++ linux-2.6.22-rc6-balbir/include/linux/memcontrol.h 2007-07-05 18:27:26.000000000 -0700 @@ -24,6 +24,8 @@ extern void mm_init_container(struct mm_ extern void mm_free_container(struct mm_struct *mm); extern void page_assign_meta_page(struct page *page, struct meta_page *mp); extern struct meta_page *page_get_meta_page(struct page *page); +extern int mem_container_charge(struct page *page, struct mm_struct *mm); +extern void mem_container_uncharge(struct meta_page *mp); #else /* CONFIG_CONTAINER_MEM_CONT */ static inline void mm_init_container(struct mm_struct *mm, @@ -45,6 +47,15 @@ static inline struct meta_page *page_get return NULL; } +static inline int mem_container_charge(struct page *page, struct mm_struct *mm) +{ + return 0; +} + +static inline void mem_container_uncharge(struct meta_page *mp) +{ +} + #endif /* CONFIG_CONTAINER_MEM_CONT */ #endif /* _LINUX_MEMCONTROL_H */ diff -puN include/linux/page-flags.h~mem-control-accounting include/linux/page-flags.h --- linux-2.6.22-rc6/include/linux/page-flags.h~mem-control-accounting 2007-07-05 13:45:18.000000000 -0700 +++ linux-2.6.22-rc6-balbir/include/linux/page-flags.h 2007-07-05 13:45:18.000000000 -0700 @@ -98,6 +98,9 @@ #define PG_checked PG_owner_priv_1 /* Used by some filesystems */ #define PG_pinned PG_owner_priv_1 /* Xen pinned pagetable */ +#define PG_metapage 21 /* Used for checking if a meta_page */ + /* is associated with a page */ + #if (BITS_PER_LONG > 32) /* * 64-bit-only flags build down from bit 31 diff -puN mm/filemap.c~mem-control-accounting mm/filemap.c --- linux-2.6.22-rc6/mm/filemap.c~mem-control-accounting 2007-07-05 13:45:18.000000000 -0700 +++ linux-2.6.22-rc6-balbir/mm/filemap.c 2007-07-05 18:26:29.000000000 -0700 @@ -31,6 +31,7 @@ #include <linux/syscalls.h> #include <linux/cpuset.h> #include <linux/hardirq.h> /* for BUG_ON(!in_atomic()) only */ +#include <linux/memcontrol.h> #include "internal.h" /* @@ -116,6 +117,7 @@ void __remove_from_page_cache(struct pag { struct address_space *mapping = page->mapping; + mem_container_uncharge(page_get_meta_page(page)); radix_tree_delete(&mapping->page_tree, page->index); page->mapping = NULL; mapping->nrpages--; @@ -442,6 +444,11 @@ int add_to_page_cache(struct page *page, int error = radix_tree_preload(gfp_mask & ~__GFP_HIGHMEM); if (error == 0) { + + error = mem_container_charge(page, current->mm); + if (error) + goto out; + write_lock_irq(&mapping->tree_lock); error = radix_tree_insert(&mapping->page_tree, offset, page); if (!error) { @@ -455,6 +462,7 @@ int add_to_page_cache(struct page *page, write_unlock_irq(&mapping->tree_lock); radix_tree_preload_end(); } +out: return error; } EXPORT_SYMBOL(add_to_page_cache); diff -puN mm/memcontrol.c~mem-control-accounting mm/memcontrol.c --- linux-2.6.22-rc6/mm/memcontrol.c~mem-control-accounting 2007-07-05 13:45:18.000000000 -0700 +++ linux-2.6.22-rc6-balbir/mm/memcontrol.c 2007-07-05 18:27:29.000000000 -0700 @@ -16,6 +16,9 @@ #include <linux/memcontrol.h> #include <linux/container.h> #include <linux/mm.h> +#include <linux/page-flags.h> +#include <linux/bit_spinlock.h> +#include <linux/rcupdate.h> struct container_subsys mem_container_subsys; @@ -26,7 +29,9 @@ struct container_subsys mem_container_su * to help the administrator determine what knobs to tune. * * TODO: Add a water mark for the memory controller. Reclaim will begin when - * we hit the water mark. + * we hit the water mark. May be even add a low water mark, such that + * no reclaim occurs from a container at it's low water mark, this is + * a feature that will be implemented much later in the future. */ struct mem_container { struct container_subsys_state css; @@ -51,6 +56,7 @@ struct meta_page { struct list_head list; /* per container LRU list */ struct page *page; struct mem_container *mem_container; + atomic_t ref_cnt; }; @@ -87,6 +93,128 @@ struct meta_page *page_get_meta_page(str return page->meta_page; } +void __always_inline lock_meta_page(struct page *page) +{ + bit_spin_lock(PG_metapage, &page->flags); +} + +void __always_inline unlock_meta_page(struct page *page) +{ + bit_spin_unlock(PG_metapage, &page->flags); +} + +/* + * Charge the memory controller for page usage. + * Return + * 0 if the charge was successful + * < 0 if the container is over its limit + */ +int mem_container_charge(struct page *page, struct mm_struct *mm) +{ + struct mem_container *mem; + struct meta_page *mp; + + /* + * Should meta_page's go to their own slab? + * One could optimize the performance of the charging routine + * by saving a bit in the page_flags and using it as a lock + * to see if the container page already has a meta_page associated + * with it + */ + lock_meta_page(page); + mp = page_get_meta_page(page); + /* + * The meta_page exists and the page has already been accounted + */ + if (mp) { + atomic_inc(&mp->ref_cnt); + goto done; + } + + unlock_meta_page(page); + + mp = kzalloc(sizeof(struct meta_page), GFP_KERNEL); + if (mp == NULL) + goto err; + + rcu_read_lock(); + /* + * We always charge the container the mm_struct belongs to + * the mm_struct's mem_container changes on task migration if the + * thread group leader migrates. It's possible that mm is not + * set, if so charge the init_mm (happens for pagecache usage). + */ + if (!mm) + mm = &init_mm; + + mem = rcu_dereference(mm->mem_container); + /* + * For every charge from the container, increment reference + * count + */ + css_get(&mem->css); + rcu_read_unlock(); + + /* + * If we created the meta_page, we should free it on exceeding + * the container limit. + */ + if (res_counter_charge(&mem->res, 1)) + goto free_mp; + + lock_meta_page(page); + /* + * Check if somebody else beat us to allocating the meta_page + */ + if (page_get_meta_page(page)) { + atomic_inc(&mp->ref_cnt); + res_counter_uncharge(&mem->res, 1); + goto done; + } + + atomic_set(&mp->ref_cnt, 1); + mp->mem_container = mem; + mp->page = page; + page_assign_meta_page(page, mp); + +done: + unlock_meta_page(page); + return 0; +free_mp: + kfree(mp); + return -ENOMEM; +err: + unlock_meta_page(page); + return -ENOMEM; +} + +/* + * Uncharging is always a welcome operation, we never complain, simply + * uncharge. + */ +void mem_container_uncharge(struct meta_page *mp) +{ + struct mem_container *mem; + struct page *page; + + /* + * This can happen for PAGE_ZERO + */ + if (!mp) + return; + + if (atomic_dec_and_test(&mp->ref_cnt)) { + page = mp->page; + lock_meta_page(page); + mem = mp->mem_container; + css_put(&mem->css); + page_assign_meta_page(page, NULL); + unlock_meta_page(page); + res_counter_uncharge(&mem->res, 1); + kfree(mp); + } +} + static ssize_t mem_container_read(struct container *cont, struct cftype *cft, struct file *file, char __user *userbuf, size_t nbytes, loff_t *ppos) @@ -142,6 +270,8 @@ static int mem_container_create(struct c res_counter_init(&mem->res); cont->subsys[mem_container_subsys_id] = &mem->css; mem->css.container = cont; + INIT_LIST_HEAD(&mem->active_list); + INIT_LIST_HEAD(&mem->inactive_list); return 0; } diff -puN mm/memory.c~mem-control-accounting mm/memory.c --- linux-2.6.22-rc6/mm/memory.c~mem-control-accounting 2007-07-05 13:45:18.000000000 -0700 +++ linux-2.6.22-rc6-balbir/mm/memory.c 2007-07-05 13:45:18.000000000 -0700 @@ -50,6 +50,7 @@ #include <linux/delayacct.h> #include <linux/init.h> #include <linux/writeback.h> +#include <linux/memcontrol.h> #include <asm/pgalloc.h> #include <asm/uaccess.h> @@ -1226,6 +1227,10 @@ static int insert_page(struct mm_struct pte_t *pte; spinlock_t *ptl; + retval = mem_container_charge(page, mm); + if (retval) + goto out; + retval = -EINVAL; if (PageAnon(page)) goto out; @@ -1731,6 +1736,9 @@ gotten: cow_user_page(new_page, old_page, address, vma); } + if (mem_container_charge(new_page, mm)) + goto oom; + /* * Re-check the pte - we dropped the lock */ @@ -2188,6 +2196,11 @@ static int do_swap_page(struct mm_struct } delayacct_clear_flag(DELAYACCT_PF_SWAPIN); + if (mem_container_charge(page, mm)) { + ret = VM_FAULT_OOM; + goto out; + } + mark_page_accessed(page); lock_page(page); @@ -2255,6 +2268,7 @@ static int do_anonymous_page(struct mm_s pte_t entry; if (write_access) { + /* Allocate our own private page. */ pte_unmap(page_table); @@ -2264,6 +2278,9 @@ static int do_anonymous_page(struct mm_s if (!page) goto oom; + if (mem_container_charge(page, mm)) + goto oom; + entry = mk_pte(page, vma->vm_page_prot); entry = maybe_mkwrite(pte_mkdirty(entry), vma); @@ -2397,6 +2414,11 @@ static int __do_fault(struct mm_struct * } + if (mem_container_charge(page, mm)) { + fdata.type = VM_FAULT_OOM; + goto out; + } + page_table = pte_offset_map_lock(mm, pmd, address, &ptl); /* diff -puN mm/migrate.c~mem-control-accounting mm/migrate.c --- linux-2.6.22-rc6/mm/migrate.c~mem-control-accounting 2007-07-05 13:45:18.000000000 -0700 +++ linux-2.6.22-rc6-balbir/mm/migrate.c 2007-07-05 13:45:18.000000000 -0700 @@ -28,6 +28,7 @@ #include <linux/mempolicy.h> #include <linux/vmalloc.h> #include <linux/security.h> +#include <linux/memcontrol.h> #include "internal.h" @@ -157,6 +158,11 @@ static void remove_migration_pte(struct return; } + if (mem_container_charge(new, mm)) { + pte_unmap(ptep); + return; + } + ptl = pte_lockptr(mm, pmd); spin_lock(ptl); pte = *ptep; diff -puN mm/page_alloc.c~mem-control-accounting mm/page_alloc.c --- linux-2.6.22-rc6/mm/page_alloc.c~mem-control-accounting 2007-07-05 13:45:18.000000000 -0700 +++ linux-2.6.22-rc6-balbir/mm/page_alloc.c 2007-07-05 13:45:18.000000000 -0700 @@ -41,6 +41,7 @@ #include <linux/pfn.h> #include <linux/backing-dev.h> #include <linux/fault-inject.h> +#include <linux/memcontrol.h> #include <asm/tlbflush.h> #include <asm/div64.h> @@ -1015,6 +1016,7 @@ static void fastcall free_hot_cold_page( if (!PageHighMem(page)) debug_check_no_locks_freed(page_address(page), PAGE_SIZE); + page_assign_meta_page(page, NULL); arch_free_page(page, 0); kernel_map_pages(page, 1, 0); @@ -2576,6 +2578,7 @@ void __meminit memmap_init_zone(unsigned set_page_links(page, zone, nid, pfn); init_page_count(page); reset_page_mapcount(page); + page_assign_meta_page(page, NULL); SetPageReserved(page); /* diff -puN mm/rmap.c~mem-control-accounting mm/rmap.c --- linux-2.6.22-rc6/mm/rmap.c~mem-control-accounting 2007-07-05 13:45:18.000000000 -0700 +++ linux-2.6.22-rc6-balbir/mm/rmap.c 2007-07-05 13:45:18.000000000 -0700 @@ -643,6 +643,8 @@ void page_remove_rmap(struct page *page, page_clear_dirty(page); set_page_dirty(page); } + + mem_container_uncharge(page_get_meta_page(page)); __dec_zone_page_state(page, PageAnon(page) ? NR_ANON_PAGES : NR_FILE_MAPPED); } diff -puN mm/swapfile.c~mem-control-accounting mm/swapfile.c --- linux-2.6.22-rc6/mm/swapfile.c~mem-control-accounting 2007-07-05 13:45:18.000000000 -0700 +++ linux-2.6.22-rc6-balbir/mm/swapfile.c 2007-07-05 13:45:18.000000000 -0700 @@ -506,9 +506,12 @@ unsigned int count_swap_pages(int type, * just let do_wp_page work it out if a write is requested later - to * force COW, vm_page_prot omits write permission from any private vma. */ -static void unuse_pte(struct vm_area_struct *vma, pte_t *pte, +static int unuse_pte(struct vm_area_struct *vma, pte_t *pte, unsigned long addr, swp_entry_t entry, struct page *page) { + if (mem_container_charge(page, vma->vm_mm)) + return -ENOMEM; + inc_mm_counter(vma->vm_mm, anon_rss); get_page(page); set_pte_at(vma->vm_mm, addr, pte, @@ -520,6 +523,7 @@ static void unuse_pte(struct vm_area_str * immediately swapped out again after swapon. */ activate_page(page); + return 1; } static int unuse_pte_range(struct vm_area_struct *vma, pmd_t *pmd, @@ -529,7 +533,7 @@ static int unuse_pte_range(struct vm_are pte_t swp_pte = swp_entry_to_pte(entry); pte_t *pte; spinlock_t *ptl; - int found = 0; + int ret = 0; pte = pte_offset_map_lock(vma->vm_mm, pmd, addr, &ptl); do { @@ -538,13 +542,12 @@ static int unuse_pte_range(struct vm_are * Test inline before going to call unuse_pte. */ if (unlikely(pte_same(*pte, swp_pte))) { - unuse_pte(vma, pte++, addr, entry, page); - found = 1; + ret = unuse_pte(vma, pte++, addr, entry, page); break; } } while (pte++, addr += PAGE_SIZE, addr != end); pte_unmap_unlock(pte - 1, ptl); - return found; + return ret; } static inline int unuse_pmd_range(struct vm_area_struct *vma, pud_t *pud, @@ -553,14 +556,16 @@ static inline int unuse_pmd_range(struct { pmd_t *pmd; unsigned long next; + int ret; pmd = pmd_offset(pud, addr); do { next = pmd_addr_end(addr, end); if (pmd_none_or_clear_bad(pmd)) continue; - if (unuse_pte_range(vma, pmd, addr, next, entry, page)) - return 1; + ret = unuse_pte_range(vma, pmd, addr, next, entry, page); + if (ret) + return ret; } while (pmd++, addr = next, addr != end); return 0; } @@ -571,14 +576,16 @@ static inline int unuse_pud_range(struct { pud_t *pud; unsigned long next; + int ret; pud = pud_offset(pgd, addr); do { next = pud_addr_end(addr, end); if (pud_none_or_clear_bad(pud)) continue; - if (unuse_pmd_range(vma, pud, addr, next, entry, page)) - return 1; + ret = unuse_pmd_range(vma, pud, addr, next, entry, page); + if (ret) + return ret; } while (pud++, addr = next, addr != end); return 0; } @@ -588,6 +595,7 @@ static int unuse_vma(struct vm_area_stru { pgd_t *pgd; unsigned long addr, end, next; + int ret; if (page->mapping) { addr = page_address_in_vma(page, vma); @@ -605,8 +613,9 @@ static int unuse_vma(struct vm_area_stru next = pgd_addr_end(addr, end); if (pgd_none_or_clear_bad(pgd)) continue; - if (unuse_pud_range(vma, pgd, addr, next, entry, page)) - return 1; + ret = unuse_pud_range(vma, pgd, addr, next, entry, page); + if (ret) + return ret; } while (pgd++, addr = next, addr != end); return 0; } @@ -615,6 +624,7 @@ static int unuse_mm(struct mm_struct *mm swp_entry_t entry, struct page *page) { struct vm_area_struct *vma; + int ret = 0; if (!down_read_trylock(&mm->mmap_sem)) { /* @@ -627,15 +637,11 @@ static int unuse_mm(struct mm_struct *mm lock_page(page); } for (vma = mm->mmap; vma; vma = vma->vm_next) { - if (vma->anon_vma && unuse_vma(vma, entry, page)) + if (vma->anon_vma && (ret = unuse_vma(vma, entry, page))) break; } up_read(&mm->mmap_sem); - /* - * Currently unuse_mm cannot fail, but leave error handling - * at call sites for now, since we change it from time to time. - */ - return 0; + return ret; } /* diff -puN mm/swap_state.c~mem-control-accounting mm/swap_state.c --- linux-2.6.22-rc6/mm/swap_state.c~mem-control-accounting 2007-07-05 13:45:18.000000000 -0700 +++ linux-2.6.22-rc6-balbir/mm/swap_state.c 2007-07-05 18:28:08.000000000 -0700 @@ -17,6 +17,7 @@ #include <linux/backing-dev.h> #include <linux/pagevec.h> #include <linux/migrate.h> +#include <linux/memcontrol.h> #include <asm/pgtable.h> @@ -79,6 +80,11 @@ static int __add_to_swap_cache(struct pa BUG_ON(PagePrivate(page)); error = radix_tree_preload(gfp_mask); if (!error) { + + error = mem_container_charge(page, current->mm); + if (error) + goto out; + write_lock_irq(&swapper_space.tree_lock); error = radix_tree_insert(&swapper_space.page_tree, entry.val, page); @@ -93,6 +99,7 @@ static int __add_to_swap_cache(struct pa write_unlock_irq(&swapper_space.tree_lock); radix_tree_preload_end(); } +out: return error; } @@ -129,6 +136,7 @@ void __delete_from_swap_cache(struct pag BUG_ON(PageWriteback(page)); BUG_ON(PagePrivate(page)); + mem_container_uncharge(page_get_meta_page(page)); radix_tree_delete(&swapper_space.page_tree, page_private(page)); set_page_private(page, 0); ClearPageSwapCache(page); _ -- Warm Regards, Balbir Singh Linux Technology Center IBM, ISTL _______________________________________________ Containers mailing list Containers@lists.linux-foundation.org https://lists.linux-foundation.org/mailman/listinfo/containers
[-mm PATCH 5/8] Memory controller task migration (v2)
Allow tasks to migrate from one container to the other. We migrate mm_struct's mem_container only when the thread group id migrates. Signed-off-by: Balbir Singh <balbir@linux.vnet.ibm.com> --- mm/memcontrol.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff -puN mm/memcontrol.c~mem-control-task-migration mm/memcontrol.c --- linux-2.6.22-rc6/mm/memcontrol.c~mem-control-task-migration 2007-07-05 13:45:18.000000000 -0700 +++ linux-2.6.22-rc6-balbir/mm/memcontrol.c 2007-07-05 13:45:18.000000000 -0700 @@ -302,11 +302,46 @@ err: return rc; } +static void mem_container_move_task(struct container_subsys *ss, + struct container *cont, + struct container *old_cont, + struct task_struct *p) +{ + struct mm_struct *mm; + struct mem_container *mem, *old_mem; + + mm = get_task_mm(p); + if (mm == NULL) + return; + + mem = mem_container_from_cont(cont); + old_mem = mem_container_from_cont(old_cont); + + if (mem == old_mem) + goto out; + + /* + * Only thread group leaders are allowed to migrate, the mm_struct is + * in effect owned by the leader + */ + if (p->tgid != p->pid) + goto out; + + css_get(&mem->css); + rcu_assign_pointer(mm->mem_container, mem); + css_put(&old_mem->css); + +out: + mmput(mm); + return; +} + struct container_subsys mem_container_subsys = { .name = "mem_container", .subsys_id = mem_container_subsys_id, .create = mem_container_create, .destroy = mem_container_destroy, .populate = mem_container_populate, + .attach = mem_container_move_task, .early_init = 1, }; _ -- Warm Regards, Balbir Singh Linux Technology Center IBM, ISTL _______________________________________________ Containers mailing list Containers@lists.linux-foundation.org https://lists.linux-foundation.org/mailman/listinfo/containers
[-mm PATCH 6/8] Memory controller add per container LRU and reclaim (v2)
Add the meta_page to the per container LRU. The reclaim algorithm has been modified to make the isolate_lru_pages() as a pluggable component. The scan_control data structure now accepts the container on behalf of which reclaims are carried out. try_to_free_pages() has been extended to become container aware. Signed-off-by: Balbir Singh <balbir@linux.vnet.ibm.com> --- include/linux/memcontrol.h | 11 +++ include/linux/res_counter.h | 23 ++++++++ include/linux/swap.h | 3 + mm/memcontrol.c | 121 ++++++++++++++++++++++++++++++++++++++++++ mm/swap.c | 2 mm/vmscan.c | 125 +++++++++++++++++++++++++++++++++++--------- 6 files changed, 259 insertions(+), 26 deletions(-) diff -puN include/linux/memcontrol.h~mem-control-lru-and-reclaim include/linux/memcontrol.h --- linux-2.6.22-rc6/include/linux/memcontrol.h~mem-control-lru-and-reclaim 2007-07-05 18:28:12.000000000 -0700 +++ linux-2.6.22-rc6-balbir/include/linux/memcontrol.h 2007-07-05 18:45:57.000000000 -0700 @@ -26,6 +26,13 @@ extern void page_assign_meta_page(struct extern struct meta_page *page_get_meta_page(struct page *page); extern int mem_container_charge(struct page *page, struct mm_struct *mm); extern void mem_container_uncharge(struct meta_page *mp); +extern void mem_container_move_lists(struct meta_page *mp, bool active); +extern unsigned long mem_container_isolate_pages(unsigned long nr_to_scan, + struct list_head *dst, + unsigned long *scanned, int order, + int mode, struct zone *z, + struct mem_container *mem_cont, + int active); #else /* CONFIG_CONTAINER_MEM_CONT */ static inline void mm_init_container(struct mm_struct *mm, @@ -56,6 +63,10 @@ static inline void mem_container_uncharg { } +static inline void mem_container_move_lists(struct meta_page *mp, bool active) +{ +} + #endif /* CONFIG_CONTAINER_MEM_CONT */ #endif /* _LINUX_MEMCONTROL_H */ diff -puN include/linux/swap.h~mem-control-lru-and-reclaim include/linux/swap.h --- linux-2.6.22-rc6/include/linux/swap.h~mem-control-lru-and-reclaim 2007-07-05 18:28:12.000000000 -0700 +++ linux-2.6.22-rc6-balbir/include/linux/swap.h 2007-07-05 18:28:12.000000000 -0700 @@ -6,6 +6,7 @@ #include <linux/mmzone.h> #include <linux/list.h> #include <linux/sched.h> +#include <linux/memcontrol.h> #include <asm/atomic.h> #include <asm/page.h> @@ -191,6 +192,8 @@ extern void swap_setup(void); /* linux/mm/vmscan.c */ extern unsigned long try_to_free_pages(struct zone **zones, int order, gfp_t gfp_mask); +extern unsigned long try_to_free_mem_container_pages(struct mem_container *mem); +extern int __isolate_lru_page(struct page *page, int mode); extern unsigned long shrink_all_memory(unsigned long nr_pages); extern int vm_swappiness; extern int remove_mapping(struct address_space *mapping, struct page *page); diff -puN mm/memcontrol.c~mem-control-lru-and-reclaim mm/memcontrol.c --- linux-2.6.22-rc6/mm/memcontrol.c~mem-control-lru-and-reclaim 2007-07-05 18:28:12.000000000 -0700 +++ linux-2.6.22-rc6-balbir/mm/memcontrol.c 2007-07-05 18:49:32.000000000 -0700 @@ -19,6 +19,8 @@ #include <linux/page-flags.h> #include <linux/bit_spinlock.h> #include <linux/rcupdate.h> +#include <linux/swap.h> +#include <linux/spinlock.h> struct container_subsys mem_container_subsys; @@ -46,6 +48,10 @@ struct mem_container { */ struct list_head active_list; struct list_head inactive_list; + /* + * spin_lock to protect the per container LRU + */ + spinlock_t lru_lock; }; /* @@ -103,6 +109,92 @@ void __always_inline unlock_meta_page(st bit_spin_unlock(PG_metapage, &page->flags); } +unsigned long mem_container_isolate_pages(unsigned long nr_to_scan, + struct list_head *dst, + unsigned long *scanned, int order, + int mode, struct zone *z, + struct mem_container *mem_cont, + int active) +{ + unsigned long nr_taken = 0; + struct page *page; + unsigned long scan; + LIST_HEAD(mp_list); + struct list_head *src; + struct meta_page *mp; + + if (active) + src = &mem_cont->active_list; + else + src = &mem_cont->inactive_list; + + for (scan = 0; scan < nr_to_scan && !list_empty(src); scan++) { + mp = list_entry(src->prev, struct meta_page, list); + page = mp->page; + + if (PageActive(page) && !active) { + mem_container_move_lists(mp, true); + scan--; + continue; + } + if (!PageActive(page) && active) { + mem_container_move_lists(mp, false); + scan--; + continue; + } + + /* + * Reclaim, per zone + * TODO: make the active/inactive lists per zone + */ + if (page_zone(page) != z) + continue; + + spin_lock(&mem_cont->lru_lock); + /* + * Check if the meta page went away from under us + */ + if (!list_empty(&mp->list) + list_move(&mp->list, &mp_list); + else { + spin_unlock(&mem_cont->lru_lock); + continue; + } + spin_unlock(&mem_cont->lru_lock); + + if (__isolate_lru_page(page, mode) == 0) { + list_move(&page->lru, dst); + nr_taken++; + } + } + + spin_lock(&mem_cont->lru_lock); + list_splice(&mp_list, src); + spin_unlock(&mem_cont->lru_lock); + + *scanned = scan; + return nr_taken; +} + +/* + * This routine assumes that the appropriate zone's lru lock is already held + */ +void mem_container_move_lists(struct meta_page *mp, bool active) +{ + struct mem_container *mem; + if (!mp) + return; + + mem = mp->mem_container; + + spin_lock(&mem->lru_lock); + if (active) + list_move(&mp->list, &mp->mem_container->active_list); + else + list_move(&mp->list, &mp->mem_container->inactive_list); + spin_unlock(&mem->lru_lock); +} + /* * Charge the memory controller for page usage. * Return @@ -113,6 +205,7 @@ int mem_container_charge(struct page *pa { struct mem_container *mem; struct meta_page *mp; + unsigned long flags; /* * Should meta_page's go to their own slab? @@ -159,8 +252,22 @@ int mem_container_charge(struct page *pa * If we created the meta_page, we should free it on exceeding * the container limit. */ - if (res_counter_charge(&mem->res, 1)) + while (res_counter_charge(&mem->res, 1)) { + if (try_to_free_mem_container_pages(mem)) + continue; + + /* + * try_to_free_mem_container_pages() might not give us a full + * picture of reclaim. Some pages are reclaimed and might be + * moved to swap cache or just unmapped from the container. + * Check the limit again to see if the reclaim reduced the + * current usage of the container before giving up + */ + if (res_counter_check_under_limit(&mem->res)) + continue; + goto free_mp; + } lock_meta_page(page); /* @@ -177,6 +284,10 @@ int mem_container_charge(struct page *pa mp->page = page; page_assign_meta_page(page, mp); + spin_lock_irqsave(&mem->lru_lock, flags); + list_add(&mp->list, &mem->active_list); + spin_unlock_irqrestore(&mem->lru_lock, flags); + done: unlock_meta_page(page); return 0; @@ -196,6 +307,7 @@ void mem_container_uncharge(struct meta_ { struct mem_container *mem; struct page *page; + unsigned long flags; /* * This can happen for PAGE_ZERO @@ -205,12 +317,18 @@ void mem_container_uncharge(struct meta_ if (atomic_dec_and_test(&mp->ref_cnt)) { page = mp->page; + lock_meta_page(page); mem = mp->mem_container; css_put(&mem->css); page_assign_meta_page(page, NULL); unlock_meta_page(page); + res_counter_uncharge(&mem->res, 1); + + spin_lock_irqsave(&mem->lru_lock, flags); + list_del_init(&mp->list); + spin_unlock_irqrestore(&mem->lru_lock, flags); kfree(mp); } } @@ -272,6 +390,7 @@ static int mem_container_create(struct c mem->css.container = cont; INIT_LIST_HEAD(&mem->active_list); INIT_LIST_HEAD(&mem->inactive_list); + spin_lock_init(&mem->lru_lock); return 0; } diff -puN mm/swap.c~mem-control-lru-and-reclaim mm/swap.c --- linux-2.6.22-rc6/mm/swap.c~mem-control-lru-and-reclaim 2007-07-05 18:28:12.000000000 -0700 +++ linux-2.6.22-rc6-balbir/mm/swap.c 2007-07-05 18:28:12.000000000 -0700 @@ -31,6 +31,7 @@ #include <linux/cpu.h> #include <linux/notifier.h> #include <linux/init.h> +#include <linux/memcontrol.h> /* How many pages do we try to swap or page in/out together? */ int page_cluster; @@ -148,6 +149,7 @@ void fastcall activate_page(struct page SetPageActive(page); add_page_to_active_list(zone, page); __count_vm_event(PGACTIVATE); + mem_container_move_lists(page_get_meta_page(page), true); } spin_unlock_irq(&zone->lru_lock); } diff -puN mm/vmscan.c~mem-control-lru-and-reclaim mm/vmscan.c --- linux-2.6.22-rc6/mm/vmscan.c~mem-control-lru-and-reclaim 2007-07-05 18:28:12.000000000 -0700 +++ linux-2.6.22-rc6-balbir/mm/vmscan.c 2007-07-05 18:28:12.000000000 -0700 @@ -39,6 +39,7 @@ #include <linux/delay.h> #include <linux/kthread.h> #include <linux/freezer.h> +#include <linux/memcontrol.h> #include <asm/tlbflush.h> #include <asm/div64.h> @@ -70,6 +71,15 @@ struct scan_control { int all_unreclaimable; int order; + + /* Which container do we reclaim from */ + struct mem_container *mem_container; + + /* Pluggable isolate pages callback */ + unsigned long (*isolate_pages)(unsigned long nr, struct list_head *dst, + unsigned long *scanned, int order, int mode, + struct zone *z, struct mem_container *mem_cont, + int active); }; #define lru_to_page(_head) (list_entry((_head)->prev, struct page, lru)) @@ -604,7 +614,7 @@ keep: * * returns 0 on success, -ve errno on failure. */ -static int __isolate_lru_page(struct page *page, int mode) +int __isolate_lru_page(struct page *page, int mode) { int ret = -EINVAL; @@ -738,6 +748,21 @@ static unsigned long isolate_lru_pages(u return nr_taken; } +static unsigned long isolate_pages_global(unsigned long nr, + struct list_head *dst, + unsigned long *scanned, int order, + int mode, struct zone *z, + struct mem_container *mem_cont, + int active) +{ + if (active) + return isolate_lru_pages(nr, &z->active_list, dst, + scanned, order, mode); + else + return isolate_lru_pages(nr, &z->inactive_list, dst, + scanned, order, mode); +} + /* * clear_active_flags() is a helper for shrink_active_list(), clearing * any active bits from the pages in the list. @@ -779,11 +804,11 @@ static unsigned long shrink_inactive_lis unsigned long nr_freed; unsigned long nr_active; - nr_taken = isolate_lru_pages(sc->swap_cluster_max, - &zone->inactive_list, + nr_taken = sc->isolate_pages(sc->swap_cluster_max, &page_list, &nr_scan, sc->order, (sc->order > PAGE_ALLOC_COSTLY_ORDER)? - ISOLATE_BOTH : ISOLATE_INACTIVE); + ISOLATE_BOTH : ISOLATE_INACTIVE, + zone, sc->mem_container, 0); nr_active = clear_active_flags(&page_list); __mod_zone_page_state(zone, NR_ACTIVE, -nr_active); @@ -932,8 +957,9 @@ force_reclaim_mapped: lru_add_drain(); spin_lock_irq(&zone->lru_lock); - pgmoved = isolate_lru_pages(nr_pages, &zone->active_list, - &l_hold, &pgscanned, sc->order, ISOLATE_ACTIVE); + pgmoved = sc->isolate_pages(nr_pages, &l_hold, &pgscanned, sc->order, + ISOLATE_ACTIVE, zone, + sc->mem_container, 1); zone->pages_scanned += pgscanned; __mod_zone_page_state(zone, NR_ACTIVE, -pgmoved); spin_unlock_irq(&zone->lru_lock); @@ -968,6 +994,7 @@ force_reclaim_mapped: ClearPageActive(page); list_move(&page->lru, &zone->inactive_list); + mem_container_move_lists(page_get_meta_page(page), false); pgmoved++; if (!pagevec_add(&pvec, page)) { __mod_zone_page_state(zone, NR_INACTIVE, pgmoved); @@ -996,6 +1023,7 @@ force_reclaim_mapped: SetPageLRU(page); VM_BUG_ON(!PageActive(page)); list_move(&page->lru, &zone->active_list); + mem_container_move_lists(page_get_meta_page(page), true); pgmoved++; if (!pagevec_add(&pvec, page)) { __mod_zone_page_state(zone, NR_ACTIVE, pgmoved); @@ -1127,7 +1155,8 @@ static unsigned long shrink_zones(int pr * holds filesystem locks which prevent writeout this might not work, and the * allocation attempt will fail. */ -unsigned long try_to_free_pages(struct zone **zones, int order, gfp_t gfp_mask) +unsigned long do_try_to_free_pages(struct zone **zones, gfp_t gfp_mask, + struct scan_control *sc) { int priority; int ret = 0; @@ -1136,14 +1165,6 @@ unsigned long try_to_free_pages(struct z struct reclaim_state *reclaim_state = current->reclaim_state; unsigned long lru_pages = 0; int i; - struct scan_control sc = { - .gfp_mask = gfp_mask, - .may_writepage = !laptop_mode, - .swap_cluster_max = SWAP_CLUSTER_MAX, - .may_swap = 1, - .swappiness = vm_swappiness, - .order = order, - }; delay_swap_prefetch(); count_vm_event(ALLOCSTALL); @@ -1159,17 +1180,22 @@ unsigned long try_to_free_pages(struct z } for (priority = DEF_PRIORITY; priority >= 0; priority--) { - sc.nr_scanned = 0; + sc->nr_scanned = 0; if (!priority) disable_swap_token(); - nr_reclaimed += shrink_zones(priority, zones, &sc); - shrink_slab(sc.nr_scanned, gfp_mask, lru_pages); + nr_reclaimed += shrink_zones(priority, zones, sc); + /* + * Don't shrink slabs when reclaiming memory from + * over limit containers + */ + if (sc->mem_container == NULL) + shrink_slab(sc->nr_scanned, gfp_mask, lru_pages); if (reclaim_state) { nr_reclaimed += reclaim_state->reclaimed_slab; reclaim_state->reclaimed_slab = 0; } - total_scanned += sc.nr_scanned; - if (nr_reclaimed >= sc.swap_cluster_max) { + total_scanned += sc->nr_scanned; + if (nr_reclaimed >= sc->swap_cluster_max) { ret = 1; goto out; } @@ -1181,18 +1207,18 @@ unsigned long try_to_free_pages(struct z * that's undesirable in laptop mode, where we *want* lumpy * writeout. So in laptop mode, write out the whole world. */ - if (total_scanned > sc.swap_cluster_max + - sc.swap_cluster_max / 2) { + if (total_scanned > sc->swap_cluster_max + + sc->swap_cluster_max / 2) { wakeup_pdflush(laptop_mode ? 0 : total_scanned); - sc.may_writepage = 1; + sc->may_writepage = 1; } /* Take a nap, wait for some writeback to complete */ - if (sc.nr_scanned && priority < DEF_PRIORITY - 2) + if (sc->nr_scanned && priority < DEF_PRIORITY - 2) congestion_wait(WRITE, HZ/10); } /* top priority shrink_caches still had more to do? don't OOM, then */ - if (!sc.all_unreclaimable) + if (!sc->all_unreclaimable && sc->mem_container == NULL) ret = 1; out: /* @@ -1215,6 +1241,53 @@ out: return ret; } +unsigned long try_to_free_pages(struct zone **zones, int order, gfp_t gfp_mask) +{ + struct scan_control sc = { + .gfp_mask = gfp_mask, + .may_writepage = !laptop_mode, + .swap_cluster_max = SWAP_CLUSTER_MAX, + .may_swap = 1, + .swappiness = vm_swappiness, + .order = order, + .mem_container = NULL, + .isolate_pages = isolate_pages_global, + }; + + return do_try_to_free_pages(zones, gfp_mask, &sc); +} + +#ifdef CONFIG_CONTAINER_MEM_CONT + +#ifdef CONFIG_HIGHMEM +#define ZONE_USERPAGES ZONE_HIGHMEM +#else +#define ZONE_USERPAGES ZONE_NORMAL +#endif + +unsigned long try_to_free_mem_container_pages(struct mem_container *mem_cont) +{ + struct scan_control sc = { + .gfp_mask = GFP_KERNEL, + .may_swap = 1, + .swap_cluster_max = SWAP_CLUSTER_MAX, + .swappiness = vm_swappiness, + .order = 1, + .mem_container = mem_cont, + .isolate_pages = mem_container_isolate_pages, + }; + int node; + struct zone **zones; + + for_each_online_node(node) { + zones = NODE_DATA(node)->node_zonelists[ZONE_USERPAGES].zones; + if (do_try_to_free_pages(zones, sc.gfp_mask, &sc)) + return 1; + } + return 0; +} +#endif + /* * For kswapd, balance_pgdat() will work across all this node's zones until * they are all at pages_high. @@ -1250,6 +1323,8 @@ static unsigned long balance_pgdat(pg_da .swap_cluster_max = SWAP_CLUSTER_MAX, .swappiness = vm_swappiness, .order = order, + .mem_container = NULL, + .isolate_pages = isolate_pages_global, }; /* * temp_priority is used to remember the scanning priority at which diff -puN include/linux/res_counter.h~mem-control-lru-and-reclaim include/linux/res_counter.h --- linux-2.6.22-rc6/include/linux/res_counter.h~mem-control-lru-and-reclaim 2007-07-05 18:28:12.000000000 -0700 +++ linux-2.6.22-rc6-balbir/include/linux/res_counter.h 2007-07-05 18:28:12.000000000 -0700 @@ -99,4 +99,27 @@ int res_counter_charge(struct res_counte void res_counter_uncharge_locked(struct res_counter *cnt, unsigned long val); void res_counter_uncharge(struct res_counter *cnt, unsigned long val); +static inline bool res_counter_limit_check_locked(struct res_counter *cnt) +{ + if (cnt->usage < cnt->limit) + return true; + + return false; +} + +/* + * Helper function to detect if the container is within it's limit or + * not. It's currently called from container_rss_prepare() + */ +static inline bool res_counter_check_under_limit(struct res_counter *cnt) +{ + bool ret; + unsigned long flags; + + spin_lock_irqsave(&cnt->lock, flags); + ret = res_counter_limit_check_locked(cnt); + spin_unlock_irqrestore(&cnt->lock, flags); + return ret; +} + #endif _ -- Warm Regards, Balbir Singh Linux Technology Center IBM, ISTL _______________________________________________ Containers mailing list Containers@lists.linux-foundation.org https://lists.linux-foundation.org/mailman/listinfo/containers
[-mm PATCH 7/8] Memory controller OOM handling (v2)
Out of memory handling for containers over their limit. A task from the container over limit is chosen using the existing OOM logic and killed. TODO: 1. As discussed in the OLS BOF session, consider implementing a user space policy for OOM handling. Signed-off-by: Balbir Singh <balbir@linux.vnet.ibm.com> --- include/linux/memcontrol.h | 1 + mm/memcontrol.c | 1 + mm/oom_kill.c | 42 ++++++++++++++++++++++++++++++++++++++---- 3 files changed, 40 insertions(+), 4 deletions(-) diff -puN include/linux/memcontrol.h~mem-control-out-of-memory include/linux/memcontrol.h --- linux-2.6.22-rc6/include/linux/memcontrol.h~mem-control-out-of-memory 2007-07-05 18:49:35.000000000 -0700 +++ linux-2.6.22-rc6-balbir/include/linux/memcontrol.h 2007-07-05 18:49:35.000000000 -0700 @@ -33,6 +33,7 @@ extern unsigned long mem_container_isola int mode, struct zone *z, struct mem_container *mem_cont, int active); +extern void mem_container_out_of_memory(struct mem_container *mem); #else /* CONFIG_CONTAINER_MEM_CONT */ static inline void mm_init_container(struct mm_struct *mm, diff -puN mm/memcontrol.c~mem-control-out-of-memory mm/memcontrol.c --- linux-2.6.22-rc6/mm/memcontrol.c~mem-control-out-of-memory 2007-07-05 18:49:35.000000000 -0700 +++ linux-2.6.22-rc6-balbir/mm/memcontrol.c 2007-07-05 18:49:35.000000000 -0700 @@ -266,6 +266,7 @@ int mem_container_charge(struct page *pa if (res_counter_check_under_limit(&mem->res)) continue; + mem_container_out_of_memory(mem); goto free_mp; } diff -puN mm/oom_kill.c~mem-control-out-of-memory mm/oom_kill.c --- linux-2.6.22-rc6/mm/oom_kill.c~mem-control-out-of-memory 2007-07-05 18:49:35.000000000 -0700 +++ linux-2.6.22-rc6-balbir/mm/oom_kill.c 2007-07-05 18:49:35.000000000 -0700 @@ -24,6 +24,7 @@ #include <linux/cpuset.h> #include <linux/module.h> #include <linux/notifier.h> +#include <linux/memcontrol.h> int sysctl_panic_on_oom; /* #define DEBUG */ @@ -47,7 +48,8 @@ int sysctl_panic_on_oom; * of least surprise ... (be careful when you change it) */ -unsigned long badness(struct task_struct *p, unsigned long uptime) +unsigned long badness(struct task_struct *p, unsigned long uptime, + struct mem_container *mem) { unsigned long points, cpu_time, run_time, s; struct mm_struct *mm; @@ -60,6 +62,13 @@ unsigned long badness(struct task_struct return 0; } +#ifdef CONFIG_CONTAINER_MEM_CONT + if (mem != NULL && mm->mem_container != mem) { + task_unlock(p); + return 0; + } +#endif + /* * The memory size of the process is the basis for the badness. */ @@ -204,7 +213,8 @@ static inline int constrained_alloc(stru * * (not docbooked, we don't want this one cluttering up the manual) */ -static struct task_struct *select_bad_process(unsigned long *ppoints) +static struct task_struct *select_bad_process(unsigned long *ppoints, + struct mem_container *mem) { struct task_struct *g, *p; struct task_struct *chosen = NULL; @@ -258,7 +268,7 @@ static struct task_struct *select_bad_pr if (p->oomkilladj == OOM_DISABLE) continue; - points = badness(p, uptime.tv_sec); + points = badness(p, uptime.tv_sec, mem); if (points > *ppoints || !chosen) { chosen = p; *ppoints = points; @@ -372,6 +382,30 @@ static int oom_kill_process(struct task_ return oom_kill_task(p); } +#ifdef CONFIG_CONTAINER_MEM_CONT +void mem_container_out_of_memory(struct mem_container *mem) +{ + unsigned long points = 0; + struct task_struct *p; + + container_lock(); + rcu_read_lock(); +retry: + p = select_bad_process(&points, mem); + if (PTR_ERR(p) == -1UL) + goto out; + + if (!p) + p = current; + + if (oom_kill_process(p, points, "Memory container out of memory")) + goto retry; +out: + rcu_read_unlock(); + container_unlock(); +} +#endif + static BLOCKING_NOTIFIER_HEAD(oom_notify_list); int register_oom_notifier(struct notifier_block *nb) @@ -444,7 +478,7 @@ retry: * Rambo mode: Shoot down a process and hope it solves whatever * issues we may have. */ - p = select_bad_process(&points); + p = select_bad_process(&points, NULL); if (PTR_ERR(p) == -1UL) goto out; _ -- Warm Regards, Balbir Singh Linux Technology Center IBM, ISTL _______________________________________________ Containers mailing list Containers@lists.linux-foundation.org https://lists.linux-foundation.org/mailman/listinfo/containers
[-mm PATCH 8/8] Add switch to control what type of pages to limit (v2)
Choose if we want cached pages to be accounted or not. By default both are accounted for. A new set of tunables are added. echo -n 1 > mem_control_type switches the accounting to account for only mapped pages echo -n 2 > mem_control_type switches the behaviour back Signed-off-by: Balbir Singh <balbir@linux.vnet.ibm.com> --- include/linux/memcontrol.h | 9 +++ mm/filemap.c | 2 mm/memcontrol.c | 129 ++++++++++++++++++++++++++++++++++++++------- mm/swap_state.c | 2 4 files changed, 122 insertions(+), 20 deletions(-) diff -puN mm/memcontrol.c~mem-control-choose-rss-vs-rss-and-pagecache mm/memcontrol.c --- linux-2.6.22-rc6/mm/memcontrol.c~mem-control-choose-rss-vs-rss-and-pagecache 2007-07-05 20:00:07.000000000 -0700 +++ linux-2.6.22-rc6-balbir/mm/memcontrol.c 2007-07-05 20:09:40.000000000 -0700 @@ -22,6 +22,8 @@ #include <linux/swap.h> #include <linux/spinlock.h> +#include <asm/uaccess.h> + struct container_subsys mem_container_subsys; /* @@ -52,6 +54,7 @@ struct mem_container { * spin_lock to protect the per container LRU */ spinlock_t lru_lock; + unsigned long control_type; /* control RSS or RSS+Pagecache */ }; /* @@ -65,6 +68,14 @@ struct meta_page { atomic_t ref_cnt; }; +enum { + MEM_CONTAINER_TYPE_UNSPEC = 0, + MEM_CONTAINER_TYPE_MAPPED, + MEM_CONTAINER_TYPE_ALL, + MEM_CONTAINER_TYPE_MAX, +} mem_control_type; + +static struct mem_container init_mem_container; static inline struct mem_container *mem_container_from_cont(struct container *cnt) @@ -301,6 +312,22 @@ err: } /* + * See if the cached pages should be charged at all? + */ +int mem_container_cache_charge(struct page *page, struct mm_struct *mm) +{ + struct mem_container *mem; + if (!mm) + mm = &init_mm; + + mem = rcu_dereference(mm->mem_container); + if (mem->control_type & MEM_CONTAINER_TYPE_ALL) + return mem_container_charge(page, mm); + else + return 0; +} + +/* * Uncharging is always a welcome operation, we never complain, simply * uncharge. */ @@ -311,7 +338,9 @@ void mem_container_uncharge(struct meta_ unsigned long flags; /* - * This can happen for PAGE_ZERO + * This can happen for PAGE_ZERO. This can also handle cases when + * a page is not charged at all and we are switching between + * handling the control_type. */ if (!mp) return; @@ -350,26 +379,59 @@ static ssize_t mem_container_write(struc cft->private, userbuf, nbytes, ppos); } -static struct cftype mem_container_usage = { - .name = "mem_usage", - .private = RES_USAGE, - .read = mem_container_read, -}; +static ssize_t mem_control_type_write(struct container *cont, + struct cftype *cft, struct file *file, + const char __user *userbuf, + size_t nbytes, loff_t *pos) +{ + int ret; + char *buf, *end; + unsigned long tmp; + struct mem_container *mem; -static struct cftype mem_container_limit = { - .name = "mem_limit", - .private = RES_LIMIT, - .write = mem_container_write, - .read = mem_container_read, -}; + mem = mem_container_from_cont(cont); + buf = kmalloc(nbytes + 1, GFP_KERNEL); + ret = -ENOMEM; + if (buf == NULL) + goto out; -static struct cftype mem_container_failcnt = { - .name = "mem_failcnt", - .private = RES_FAILCNT, - .read = mem_container_read, -}; + buf[nbytes] = 0; + ret = -EFAULT; + if (copy_from_user(buf, userbuf, nbytes)) + goto out_free; + + ret = -EINVAL; + tmp = simple_strtoul(buf, &end, 10); + if (*end != '\0') + goto out_free; + + if (tmp <= MEM_CONTAINER_TYPE_UNSPEC || tmp >= MEM_CONTAINER_TYPE_MAX) + goto out_free; + + mem->control_type = tmp; + ret = nbytes; +out_free: + kfree(buf); +out: + return ret; +} -static struct mem_container init_mem_container; +static ssize_t mem_control_type_read(struct container *cont, + struct cftype *cft, + struct file *file, char __user *userbuf, + size_t nbytes, loff_t *ppos) +{ + unsigned long val; + char buf[64], *s; + struct mem_container *mem; + + mem = mem_container_from_cont(cont); + s = buf; + val = mem->control_type; + s += sprintf(s, "%lu\n", val); + return simple_read_from_buffer((void __user *)userbuf, nbytes, + ppos, buf, s - buf); +} static int mem_container_create(struct container_subsys *ss, struct container *cont) @@ -392,9 +454,36 @@ static int mem_container_create(struct c INIT_LIST_HEAD(&mem->active_list); INIT_LIST_HEAD(&mem->inactive_list); spin_lock_init(&mem->lru_lock); + mem->control_type = MEM_CONTAINER_TYPE_ALL; return 0; } +static struct cftype mem_container_usage = { + .name = "mem_usage", + .private = RES_USAGE, + .read = mem_container_read, +}; + +static struct cftype mem_container_limit = { + .name = "mem_limit", + .private = RES_LIMIT, + .write = mem_container_write, + .read = mem_container_read, +}; + +static struct cftype mem_container_control_type = { + .name = "mem_control_type", + .write = mem_control_type_write, + .read = mem_control_type_read, +}; + +static struct cftype mem_container_failcnt = { + .name = "mem_failcnt", + .private = RES_FAILCNT, + .read = mem_container_read, +}; + + static void mem_container_destroy(struct container_subsys *ss, struct container *cont) { @@ -418,6 +507,10 @@ static int mem_container_populate(struct if (rc < 0) goto err; + rc = container_add_file(cont, &mem_container_control_type); + if (rc < 0) + goto err; + err: return rc; } diff -puN include/linux/memcontrol.h~mem-control-choose-rss-vs-rss-and-pagecache include/linux/memcontrol.h --- linux-2.6.22-rc6/include/linux/memcontrol.h~mem-control-choose-rss-vs-rss-and-pagecache 2007-07-05 20:00:07.000000000 -0700 +++ linux-2.6.22-rc6-balbir/include/linux/memcontrol.h 2007-07-05 20:00:07.000000000 -0700 @@ -15,6 +15,8 @@ #ifndef _LINUX_MEMCONTROL_H #define _LINUX_MEMCONTROL_H +#include <linux/mm.h> + struct mem_container; struct meta_page; @@ -34,6 +36,7 @@ extern unsigned long mem_container_isola struct mem_container *mem_cont, int active); extern void mem_container_out_of_memory(struct mem_container *mem); +extern int mem_container_cache_charge(struct page *page, struct mm_struct *mm); #else /* CONFIG_CONTAINER_MEM_CONT */ static inline void mm_init_container(struct mm_struct *mm, @@ -68,6 +71,12 @@ static inline void mem_container_move_li { } +static inline int mem_container_cache_charge(struct page *page, + struct mm_struct *mm) +{ + return 0; +} + #endif /* CONFIG_CONTAINER_MEM_CONT */ #endif /* _LINUX_MEMCONTROL_H */ diff -puN mm/swap_state.c~mem-control-choose-rss-vs-rss-and-pagecache mm/swap_state.c --- linux-2.6.22-rc6/mm/swap_state.c~mem-control-choose-rss-vs-rss-and-pagecache 2007-07-05 20:00:07.000000000 -0700 +++ linux-2.6.22-rc6-balbir/mm/swap_state.c 2007-07-05 20:00:07.000000000 -0700 @@ -81,7 +81,7 @@ static int __add_to_swap_cache(struct pa error = radix_tree_preload(gfp_mask); if (!error) { - error = mem_container_charge(page, current->mm); + error = mem_container_cache_charge(page, current->mm); if (error) goto out; diff -puN mm/filemap.c~mem-control-choose-rss-vs-rss-and-pagecache mm/filemap.c --- linux-2.6.22-rc6/mm/filemap.c~mem-control-choose-rss-vs-rss-and-pagecache 2007-07-05 20:00:07.000000000 -0700 +++ linux-2.6.22-rc6-balbir/mm/filemap.c 2007-07-05 20:00:07.000000000 -0700 @@ -445,7 +445,7 @@ int add_to_page_cache(struct page *page, if (error == 0) { - error = mem_container_charge(page, current->mm); + error = mem_container_cache_charge(page, current->mm); if (error) goto out; _ -- Warm Regards, Balbir Singh Linux Technology Center IBM, ISTL _______________________________________________ Containers mailing list Containers@lists.linux-foundation.org https://lists.linux-foundation.org/mailman/listinfo/containers
Re: [-mm PATCH 0/8] Memory controller introduction (v2)
Balbir Singh wrote: > Changelog since version 1 > > 1. Fixed some compile time errors (in mm/migrate.c from Vaidyanathan S) > 2. Fixed a panic seen when LIST_DEBUG is enabled > 3. Added a mechanism to control whether we track page cache or both > page cache and mapped pages (as requested by Pavel) > Here is one combined patch for ease of testing. For those wanting to do a quick test. -- Warm Regards, Balbir Singh Linux Technology Center IBM, ISTL _______________________________________________ Containers mailing list Containers@lists.linux-foundation.org https://lists.linux-foundation.org/mailman/listinfo/containers
Re: [-mm PATCH 6/8] Memory controller add per container LRU and reclaim (v2)
Balbir Singh wrote: > +unsigned long mem_container_isolate_pages(unsigned long nr_to_scan, > + struct list_head *dst, > + unsigned long *scanned, int order, > + int mode, struct zone *z, > + struct mem_container *mem_cont, > + int active) [snip] > +{ > + /* > + * Check if the meta page went away from under us > + */ > + if (!list_empty(&mp->list) There is a small typo here, we need an extra brace at the end (I should have done a refpatch :( ) -- Warm Regards, Balbir Singh Linux Technology Center IBM, ISTL _______________________________________________ Containers mailing list Containers@lists.linux-foundation.org https://lists.linux-foundation.org/mailman/listinfo/containers
Balbir Singh wrote: In mem_container_move_lists() > + /* > + * Check if the meta page went away from under us > + */ > + if (!list_empty(&mp->list) You'll need an extra brace here to get it compile. I forgot to refpatch :( -- Warm Regards, Balbir Singh Linux Technology Center IBM, ISTL _______________________________________________ Containers mailing list Containers@lists.linux-foundation.org https://lists.linux-foundation.org/mailman/listinfo/containers
Re: [-mm PATCH 1/8] Memory controller resource counters (v2)
On Thu, 2007-07-05 at 22:20 -0700, Balbir Singh wrote: > +/* > + * the core object. the container that wishes to account for some > + * resource may include this counter into its structures and use > + * the helpers described beyond > + */ I'm going to nitpick a bit here. Nothing major, I promise. ;) Could we make these comments into nice sentences with capitalization? I think it makes them easier to read in long comments. How about something like this for the comment: /* * A container wishing to account for a resource should include this * structure into one of its own. It may use the helpers below. */ The one above is worded a little bit strangely. > +struct res_counter { > + /* > + * the current resource consumption level > + */ > + unsigned long usage; > + /* > + * the limit that usage cannot exceed > + */ > + unsigned long limit; > + /* > + * the number of insuccessful attempts to consume the resource > + */ unsuccessful > + unsigned long failcnt; > + /* > + * the lock to protect all of the above. > + * the routines below consider this to be IRQ-safe > + */ > + spinlock_t lock; > +}; Do we really need all of these comments? Some of them are a wee bit self-explanatory. I think we mostly know what a limit is. ;) > +/* > + * helpers to interact with userspace > + * res_counter_read/_write - put/get the specified fields from the > + * res_counter struct to/from the user > + * > + * @cnt: the counter in question > + * @member: the field to work with (see RES_xxx below) > + * @buf: the buffer to opeate on,... > + * @nbytes: its size... > + * @pos: and the offset. > + */ > + > +ssize_t res_counter_read(struct res_counter *cnt, int member, > + const char __user *buf, size_t nbytes, loff_t *pos); > +ssize_t res_counter_write(struct res_counter *cnt, int member, > + const char __user *buf, size_t nbytes, loff_t *pos); > + > +/* > + * the field descriptors. one for each member of res_counter > + */ > + > +enum { > + RES_USAGE, > + RES_LIMIT, > + RES_FAILCNT, > +}; > + > +/* > + * helpers for accounting > + */ > + > +void res_counter_init(struct res_counter *cnt); > + > +/* > + * charge - try to consume more resource. > + * > + * @cnt: the counter > + * @val: the amount of the resource. each controller defines its own > + * units, e.g. numbers, bytes, Kbytes, etc > + * > + * returns 0 on success and <0 if the cnt->usage will exceed the cnt->limit > + * _locked call expects the cnt->lock to be taken > + */ > + > +int res_counter_charge_locked(struct res_counter *cnt, unsigned long val); > +int res_counter_charge(struct res_counter *cnt, unsigned long val); > + > +/* > + * uncharge - tell that some portion of the resource is released > + * > + * @cnt: the counter > + * @val: the amount of the resource > + * > + * these calls check for usage underflow and show a warning on the console > + * _locked call expects the cnt->lock to be taken > + */ > + > +void res_counter_uncharge_locked(struct res_counter *cnt, unsigned long val); > +void res_counter_uncharge(struct res_counter *cnt, unsigned long val); > + > +#endif > diff -puN init/Kconfig~res_counters_infra init/Kconfig > --- linux-2.6.22-rc6/init/Kconfig~res_counters_infra 2007-07-05 13:45:17.000000000 -0700 > +++ linux-2.6.22-rc6-balbir/init/Kconfig 2007-07-05 13:45:17.000000000 -0700 > @@ -320,6 +320,10 @@ config CPUSETS > > Say N if unsure. > > +config RESOURCE_COUNTERS > + bool > + select CONTAINERS > + > config SYSFS_DEPRECATED > bool "Create deprecated sysfs files" > default y > diff -puN kernel/Makefile~res_counters_infra kernel/Makefile > --- linux-2.6.22-rc6/kernel/Makefile~res_counters_infra 2007-07-05 13:45:17.000000000 -0700 > +++ linux-2.6.22-rc6-balbir/kernel/Makefile 2007-07-05 13:45:17.000000000 -0700 > @@ -58,6 +58,7 @@ obj-$(CONFIG_RELAY) += relay.o > obj-$(CONFIG_SYSCTL) += utsname_sysctl.o > obj-$(CONFIG_TASK_DELAY_ACCT) += delayacct.o > obj-$(CONFIG_TASKSTATS) += taskstats.o tsacct.o > +obj-$(CONFIG_RESOURCE_COUNTERS) += res_counter.o > > ifneq ($(CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER),y) > # According to Alan Modra <alan@linuxcare.com.au>, the -fno-omit-frame-pointer is > diff -puN /dev/null kernel/res_counter.c > --- /dev/null 2007-06-01 08:12:04.000000000 -0700 > +++ linux-2.6.22-rc6-balbir/kernel/res_counter.c 2007-07-05 13:45:17.000000000 -0700 > @@ -0,0 +1,121 @@ > +/* > + * resource containers > + * > + * Copyright 2007 OpenVZ SWsoft Inc > + * > + * Author: Pavel Emelianov <xemul@openvz.org> > + * > + */ > + > +#include <linux/types.h> > +#include <linux/parser.h> > +#include <linux/fs.h> > +#include <linux/res_counter.h> > +#include <linux/uaccess.h> > + > +void res_counter_init(struct res_counter *cnt) > +{ > + spin_lock_init(&cnt->lock); > + cnt->limit = (unsigned long)LONG_MAX; > +} > + > +int res_counter_charge_locked(struct res_counter *cnt, unsigned long val) > +{ > + if (cnt->usage <= cnt->limit - val) { > + cnt->usage += val; > + return 0; > + } > + > + cnt->failcnt++; > + return -ENOMEM; > +} More nitpicking... Can we leave the normal control flow in the lowest indentation level, and have only errors in the indented if(){} blocks? Something like this: > +int res_counter_charge_locked(struct res_counter *cnt, unsigned long val) > +{ > + if (cnt->usage > cnt->limit - val) { > + cnt->failcnt++; > + return -ENOMEM; > + } > + cnt->usage += val; > + return 0; > +} Also, can you do my poor brain a favor an expand "cnt" to "counter"? You're not saving _that_ much typing ;) > +int res_counter_charge(struct res_counter *cnt, unsigned long val) > +{ > + int ret; > + unsigned long flags; > + > + spin_lock_irqsave(&cnt->lock, flags); > + ret = res_counter_charge_locked(cnt, val); > + spin_unlock_irqrestore(&cnt->lock, flags); > + return ret; > +} > + > +void res_counter_uncharge_locked(struct res_counter *cnt, unsigned long val) > +{ > + if (unlikely(cnt->usage < val)) { > + WARN_ON(1); > + val = cnt->usage; > + } > + > + cnt->usage -= val; > +} It actually looks like the WARN_ON() macros "return" values. You should be able to: if (WARN_ON(cnt->usage < val)) val = count->usage; > +void res_counter_uncharge(struct res_counter *cnt, unsigned long val) > +{ > + unsigned long flags; > + > + spin_lock_irqsave(&cnt->lock, flags); > + res_counter_uncharge_locked(cnt, val); > + spin_unlock_irqrestore(&cnt->lock, flags); > +} > + > + > +static inline unsigned long *res_counter_member(struct res_counter *cnt, int member) > +{ > + switch (member) { > + case RES_USAGE: > + return &cnt->usage; > + case RES_LIMIT: > + return &cnt->limit; > + case RES_FAILCNT: > + return &cnt->failcnt; > + }; > + > + BUG(); > + return NULL; > +} > > +ssize_t res_counter_read(struct res_counter *cnt, int member, > + const char __user *userbuf, size_t nbytes, loff_t *pos) > +{ > + unsigned long *val; > + char buf[64], *s; > + > + s = buf; > + val = res_counter_member(cnt, member); > + s += sprintf(s, "%lu\n", *val); > + return simple_read_from_buffer((void __user *)userbuf, nbytes, > + pos, buf, s - buf); > +} Why do we need that cast? > +ssize_t res_counter_write(struct res_counter *cnt, int member, > + const char __user *userbuf, size_t nbytes, loff_t *pos) > +{ > + int ret; > + char *buf, *end; > + unsigned long tmp, *val; > + > + buf = kmalloc(nbytes + 1, GFP_KERNEL); Do we need some checking on nbytes? Is it sanitized before it gets here? > + ret = -ENOMEM; > + if (buf == NULL) > + goto out; > + > + buf[nbytes] = 0; Please use '\0'. 0 isn't a char. > + ret = -EFAULT; > + if (copy_from_user(buf, userbuf, nbytes)) > + goto out_free; > + > + ret = -EINVAL; > + tmp = simple_strtoul(buf, &end, 10); > + if (*end != '\0') > + goto out_free; > + > + val = res_counter_member(cnt, member); > + *val = tmp; > + ret = nbytes; > +out_free: > + kfree(buf); > +out: > + return ret; > +} > _ > -- Dave _______________________________________________ Containers mailing list Containers@lists.linux-foundation.org https://lists.linux-foundation.org/mailman/listinfo/containers
Re: [-mm PATCH 2/8] Memory controller containers setup (v2)
On Thu, 2007-07-05 at 22:21 -0700, Balbir Singh wrote: > +struct mem_container { > + struct container_subsys_state css; > + /* > + * the counter to account for memory usage > + */ > + struct res_counter res; > +}; How about we call it "memory_usage"? That would kill two birds with one stone: get rid of the comment, and keep people from needing to refer to the comment to figure out what "res" *IS*. > +/* > + * A meta page is associated with every page descriptor. The meta page > + * helps us identify information about the container > + */ > +struct meta_page { > + struct list_head list; /* per container LRU list */ > + struct page *page; > + struct mem_container *mem_container; > +}; Why not just rename "list" to "lru_list" or "container_lru"? > + > +static inline struct mem_container *mem_container_from_cont(struct container > + *cnt) I'd probably break that line up differently: static inline struct mem_container *mem_container_from_cont(struct container *cnt) BTW, do I see "cnt" meaning "container" now instead of "cnt"? ;) Is somebody's favorite dog named "cnt" and you're just trying to remind yourself of them as often as possible? -- Dave _______________________________________________ Containers mailing list Containers@lists.linux-foundation.org https://lists.linux-foundation.org/mailman/listinfo/containers
Dave Hansen wrote: > On Thu, 2007-07-05 at 22:20 -0700, Balbir Singh wrote: >> +/* >> + * the core object. the container that wishes to account for some >> + * resource may include this counter into its structures and use >> + * the helpers described beyond >> + */ > > I'm going to nitpick a bit here. Nothing major, I promise. ;) > > Could we make these comments into nice sentences with capitalization? I > think it makes them easier to read in long comments. > > How about something like this for the comment: > > /* > * A container wishing to account for a resource should include this > * structure into one of its own. It may use the helpers below. > */ > > The one above is worded a little bit strangely. > Hi, Dave, These patches were posted by Pavel, I've carried them forward as is. Suggestions are always welcome. >> +struct res_counter { >> + /* >> + * the current resource consumption level >> + */ >> + unsigned long usage; >> + /* >> + * the limit that usage cannot exceed >> + */ >> + unsigned long limit; >> + /* >> + * the number of insuccessful attempts to consume the resource >> + */ > > unsuccessful > Thanks, fixed. >> + unsigned long failcnt; >> + /* >> + * the lock to protect all of the above. >> + * the routines below consider this to be IRQ-safe >> + */ >> + spinlock_t lock; >> +}; > > Do we really need all of these comments? Some of them are a wee bit > self-explanatory. I think we mostly know what a limit is. ;) > I'll leave the decision on the comments exclusion to Pavel. > > More nitpicking... > > Can we leave the normal control flow in the lowest indentation level, > and have only errors in the indented if(){} blocks? Something like > this: > Sounds good, done! >> +int res_counter_charge_locked(struct res_counter *cnt, unsigned long > val) >> +{ >> + if (cnt->usage > cnt->limit - val) { >> + cnt->failcnt++; >> + return -ENOMEM; >> + } >> + cnt->usage += val; >> + return 0; >> +} > > Also, can you do my poor brain a favor an expand "cnt" to "counter"? > You're not saving _that_ much typing ;) > Done >> +int res_counter_charge(struct res_counter *cnt, unsigned long val) >> +{ >> + int ret; >> + unsigned long flags; >> + >> + spin_lock_irqsave(&cnt->lock, flags); >> + ret = res_counter_charge_locked(cnt, val); >> + spin_unlock_irqrestore(&cnt->lock, flags); >> + return ret; >> +} >> + >> +void res_counter_uncharge_locked(struct res_counter *cnt, unsigned long val) >> +{ >> + if (unlikely(cnt->usage < val)) { >> + WARN_ON(1); >> + val = cnt->usage; >> + } >> + >> + cnt->usage -= val; >> +} > > It actually looks like the WARN_ON() macros "return" values. You should > be able to: > > if (WARN_ON(cnt->usage < val)) > val = count->usage; > I think, thats better, will change it >> +void res_counter_uncharge(struct res_counter *cnt, unsigned long val) >> +{ >> + unsigned long flags; >> + >> + spin_lock_irqsave(&cnt->lock, flags); >> + res_counter_uncharge_locked(cnt, val); >> + spin_unlock_irqrestore(&cnt->lock, flags); >> +} >> + >> + >> +static inline unsigned long *res_counter_member(struct res_counter *cnt, int member) >> +{ >> + switch (member) { >> + case RES_USAGE: >> + return &cnt->usage; >> + case RES_LIMIT: >> + return &cnt->limit; >> + case RES_FAILCNT: >> + return &cnt->failcnt; >> + }; >> + >> + BUG(); >> + return NULL; >> +} >> >> +ssize_t res_counter_read(struct res_counter *cnt, int member, >> + const char __user *userbuf, size_t nbytes, loff_t *pos) >> +{ >> + unsigned long *val; >> + char buf[64], *s; >> + >> + s = buf; >> + val = res_counter_member(cnt, member); >> + s += sprintf(s, "%lu\n", *val); >> + return simple_read_from_buffer((void __user *)userbuf, nbytes, >> + pos, buf, s - buf); >> +} > > Why do we need that cast? > u mean the __user? If I remember correctly it's a attribute for sparse. >> +ssize_t res_counter_write(struct res_counter *cnt, int member, >> + const char __user *userbuf, size_t nbytes, loff_t *pos) >> +{ >> + int ret; >> + char *buf, *end; >> + unsigned long tmp, *val; >> + >> + buf = kmalloc(nbytes + 1, GFP_KERNEL); > > Do we need some checking on nbytes? Is it sanitized before it gets > here? > I think the container infrastructure should handle that. >> + ret = -ENOMEM; >> + if (buf == NULL) >> + goto out; >> + >> + buf[nbytes] = 0; > > Please use '\0'. 0 isn't a char. > Yep, will do. >> + ret = -EFAULT; >> + if (copy_from_user(buf, userbuf, nbytes)) >> + goto out_free; >> + >> + ret = -EINVAL; >> + tmp = simple_strtoul(buf, &end, 10); >> + if (*end != '\0') >> + goto out_free; >> + >> + val = res_counter_member(cnt, member); >> + *val = tmp; >> + ret = nbytes; >> +out_free: >> + kfree(buf); >> +out: >> + return ret; >> +} >> _ >> > -- Dave > -- Thanks, Balbir Singh Linux Technology Center IBM, ISTL _______________________________________________ Containers mailing list Containers@lists.linux-foundation.org https://lists.linux-foundation.org/mailman/listinfo/containers
Dave Hansen wrote: > On Thu, 2007-07-05 at 22:21 -0700, Balbir Singh wrote: >> +struct mem_container { >> + struct container_subsys_state css; >> + /* >> + * the counter to account for memory usage >> + */ >> + struct res_counter res; >> +}; > > How about we call it "memory_usage"? That would kill two birds with one > stone: get rid of the comment, and keep people from needing to refer to > the comment to figure out what "res" *IS*. > Hmm.. res is the closest to resource counter. res_cnt is confusing. res is a generic resource definition to indicate that we are dealing with generic resource counters. >> +/* >> + * A meta page is associated with every page descriptor. The meta page >> + * helps us identify information about the container >> + */ >> +struct meta_page { >> + struct list_head list; /* per container LRU list */ >> + struct page *page; >> + struct mem_container *mem_container; >> +}; > > Why not just rename "list" to "lru_list" or "container_lru"? > I think just lru might be fine, meta_page->lru == container LRU. >> + >> +static inline struct mem_container *mem_container_from_cont(struct container >> + *cnt) > > I'd probably break that line up differently: > > static inline > struct mem_container *mem_container_from_cont(struct container *cnt) > Yes, that's better. > BTW, do I see "cnt" meaning "container" now instead of "cnt"? ;) > Nope, I'll fix it to be cont > Is somebody's favorite dog named "cnt" and you're just trying to remind > yourself of them as often as possible? > It's an easy shorthands to use, like i or ref, num. > -- Dave > -- Warm Regards, Balbir Singh Linux Technology Center IBM, ISTL _______________________________________________ Containers mailing list Containers@lists.linux-foundation.org https://lists.linux-foundation.org/mailman/listinfo/containers
On Fri, 2007-07-06 at 14:03 -0700, Balbir Singh wrote: > > >> +ssize_t res_counter_read(struct res_counter *cnt, int member, > >> + const char __user *userbuf, size_t nbytes, loff_t > *pos) > >> +{ > >> + unsigned long *val; > >> + char buf[64], *s; > >> + > >> + s = buf; > >> + val = res_counter_member(cnt, member); > >> + s += sprintf(s, "%lu\n", *val); > >> + return simple_read_from_buffer((void __user *)userbuf, nbytes, > >> + pos, buf, s - buf); > >> +} > > > > Why do we need that cast? > > > > u mean the __user? If I remember correctly it's a attribute for > sparse. The userbuf is already __user. This just appears to be making a 'const char *' into a 'void *'. I wondered what the reason for that part is. -- Dave _______________________________________________ Containers mailing list Containers@lists.linux-foundation.org https://lists.linux-foundation.org/mailman/listinfo/containers
Dave Hansen wrote: > On Fri, 2007-07-06 at 14:03 -0700, Balbir Singh wrote: >>>> +ssize_t res_counter_read(struct res_counter *cnt, int member, >>>> + const char __user *userbuf, size_t nbytes, loff_t >> *pos) >>>> +{ >>>> + unsigned long *val; >>>> + char buf[64], *s; >>>> + >>>> + s = buf; >>>> + val = res_counter_member(cnt, member); >>>> + s += sprintf(s, "%lu\n", *val); >>>> + return simple_read_from_buffer((void __user *)userbuf, nbytes, >>>> + pos, buf, s - buf); >>>> +} >>> Why do we need that cast? >>> >> u mean the __user? If I remember correctly it's a attribute for >> sparse. > > The userbuf is already __user. This just appears to be making a 'const > char *' into a 'void *'. I wondered what the reason for that part is. > Aah.. yes.. good point. I'll look into it. > -- Dave > > -- > 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: email@kvack.org -- Warm Regards, Balbir Singh Linux Technology Center IBM, ISTL _______________________________________________ Containers mailing list Containers@lists.linux-foundation.org https://lists.linux-foundation.org/mailman/listinfo/containers
Dave Hansen wrote: > On Thu, 2007-07-05 at 22:20 -0700, Balbir Singh wrote: >> +/* >> + * the core object. the container that wishes to account for some >> + * resource may include this counter into its structures and use >> + * the helpers described beyond >> + */ > > I'm going to nitpick a bit here. Nothing major, I promise. ;) > > Could we make these comments into nice sentences with capitalization? I > think it makes them easier to read in long comments. > > How about something like this for the comment: > > /* > * A container wishing to account for a resource should include this > * structure into one of its own. It may use the helpers below. > */ > > The one above is worded a little bit strangely. > >> +struct res_counter { >> + /* >> + * the current resource consumption level >> + */ >> + unsigned long usage; >> + /* >> + * the limit that usage cannot exceed >> + */ >> + unsigned long limit; >> + /* >> + * the number of insuccessful attempts to consume the resource >> + */ > > unsuccessful > >> + unsigned long failcnt; >> + /* >> + * the lock to protect all of the above. >> + * the routines below consider this to be IRQ-safe >> + */ >> + spinlock_t lock; >> +}; > > Do we really need all of these comments? Some of them are a wee bit > self-explanatory. I think we mostly know what a limit is. ;) Since this is a new entities in the kernel and not many people deal with the resource management, I think that nothing bad in having them. page->_count, signal_struct->shared_pending, mm_struct->mm_users and others do not bother anyone with their comments either. >> +/* >> + * helpers to interact with userspace >> + * res_counter_read/_write - put/get the specified fields from the >> + * res_counter struct to/from the user >> + * >> + * @cnt: the counter in question >> + * @member: the field to work with (see RES_xxx below) >> + * @buf: the buffer to opeate on,... >> + * @nbytes: its size... >> + * @pos: and the offset. >> + */ >> + >> +ssize_t res_counter_read(struct res_counter *cnt, int member, >> + const char __user *buf, size_t nbytes, loff_t *pos); >> +ssize_t res_counter_write(struct res_counter *cnt, int member, >> + const char __user *buf, size_t nbytes, loff_t *pos); >> + >> +/* >> + * the field descriptors. one for each member of res_counter >> + */ >> + >> +enum { >> + RES_USAGE, >> + RES_LIMIT, >> + RES_FAILCNT, >> +}; >> + [snip] >> diff -puN /dev/null kernel/res_counter.c >> --- /dev/null 2007-06-01 08:12:04.000000000 -0700 >> +++ linux-2.6.22-rc6-balbir/kernel/res_counter.c 2007-07-05 13:45:17.000000000 -0700 >> @@ -0,0 +1,121 @@ >> +/* >> + * resource containers >> + * >> + * Copyright 2007 OpenVZ SWsoft Inc >> + * >> + * Author: Pavel Emelianov <xemul@openvz.org> >> + * >> + */ >> + >> +#include <linux/types.h> >> +#include <linux/parser.h> >> +#include <linux/fs.h> >> +#include <linux/res_counter.h> >> +#include <linux/uaccess.h> >> + >> +void res_counter_init(struct res_counter *cnt) >> +{ >> + spin_lock_init(&cnt->lock); >> + cnt->limit = (unsigned long)LONG_MAX; >> +} >> + >> +int res_counter_charge_locked(struct res_counter *cnt, unsigned long val) >> +{ >> + if (cnt->usage <= cnt->limit - val) { >> + cnt->usage += val; >> + return 0; >> + } >> + >> + cnt->failcnt++; >> + return -ENOMEM; >> +} > > More nitpicking... > > Can we leave the normal control flow in the lowest indentation level, > and have only errors in the indented if(){} blocks? Something like > this: As far as I know gcc usually makes the "true" branch to be in the straight code flow and in general case this does not trash the CPU pipeline. >> +int res_counter_charge_locked(struct res_counter *cnt, unsigned long > val) >> +{ >> + if (cnt->usage > cnt->limit - val) { >> + cnt->failcnt++; >> + return -ENOMEM; >> + } >> + cnt->usage += val; >> + return 0; >> +} > > Also, can you do my poor brain a favor an expand "cnt" to "counter"? > You're not saving _that_ much typing ;) Good catch. We use cnt for booth container and counter :) >> +int res_counter_charge(struct res_counter *cnt, unsigned long val) >> +{ >> + int ret; >> + unsigned long flags; >> + >> + spin_lock_irqsave(&cnt->lock, flags); >> + ret = res_counter_charge_locked(cnt, val); >> + spin_unlock_irqrestore(&cnt->lock, flags); >> + return ret; >> +} >> + >> +void res_counter_uncharge_locked(struct res_counter *cnt, unsigned long val) >> +{ >> + if (unlikely(cnt->usage < val)) { >> + WARN_ON(1); >> + val = cnt->usage; >> + } >> + >> + cnt->usage -= val; >> +} > > It actually looks like the WARN_ON() macros "return" values. You should > be able to: > > if (WARN_ON(cnt->usage < val)) > val = count->usage; Oh.. I do not trust these macros actually. One day some guy will make CONFIG_OPTIMIZE_WARN_ON and will remove all these checks out. Consider me a paranoiac. >> +void res_counter_uncharge(struct res_counter *cnt, unsigned long val) >> +{ >> + unsigned long flags; >> + >> + spin_lock_irqsave(&cnt->lock, flags); >> + res_counter_uncharge_locked(cnt, val); >> + spin_unlock_irqrestore(&cnt->lock, flags); >> +} >> + >> + >> +static inline unsigned long *res_counter_member(struct res_counter *cnt, int member) >> +{ >> + switch (member) { >> + case RES_USAGE: >> + return &cnt->usage; >> + case RES_LIMIT: >> + return &cnt->limit; >> + case RES_FAILCNT: >> + return &cnt->failcnt; >> + }; >> + >> + BUG(); >> + return NULL; >> +} >> >> +ssize_t res_counter_read(struct res_counter *cnt, int member, >> + const char __user *userbuf, size_t nbytes, loff_t *pos) >> +{ >> + unsigned long *val; >> + char buf[64], *s; >> + >> + s = buf; >> + val = res_counter_member(cnt, member); >> + s += sprintf(s, "%lu\n", *val); >> + return simple_read_from_buffer((void __user *)userbuf, nbytes, >> + pos, buf, s - buf); >> +} > > Why do we need that cast? simple_read_from_buffer do not take const char * as the 1st arg >> +ssize_t res_counter_write(struct res_counter *cnt, int member, >> + const char __user *userbuf, size_t nbytes, loff_t *pos) >> +{ >> + int ret; >> + char *buf, *end; >> + unsigned long tmp, *val; >> + >> + buf = kmalloc(nbytes + 1, GFP_KERNEL); > > Do we need some checking on nbytes? Is it sanitized before it gets > here? I think we need some kind of simple_strtol_from_user() and simple_strtol_to_user() instead. Since this code is the only user of it I didn't make a separate patch for these yet. >> + ret = -ENOMEM; >> + if (buf == NULL) >> + goto out; >> + >> + buf[nbytes] = 0; > > Please use '\0'. 0 isn't a char. > >> + ret = -EFAULT; >> + if (copy_from_user(buf, userbuf, nbytes)) >> + goto out_free; >> + >> + ret = -EINVAL; >> + tmp = simple_strtoul(buf, &end, 10); >> + if (*end != '\0') >> + goto out_free; >> + >> + val = res_counter_member(cnt, member); >> + *val = tmp; >> + ret = nbytes; >> +out_free: >> + kfree(buf); >> +out: >> + return ret; >> +} >> _ >> > -- Dave > > - > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ > _______________________________________________ Containers mailing list Containers@lists.linux-foundation.org https://lists.linux-foundation.org/mailman/listinfo/containers
On Mon, 2007-07-09 at 11:16 +0400, Pavel Emelianov wrote: > Dave Hansen wrote: > > On Thu, 2007-07-05 at 22:20 -0700, Balbir Singh wrote: > >> +/* > >> + * the core object. the container that wishes to account for some > >> + * resource may include this counter into its structures and use > >> + * the helpers described beyond > >> + */ > > > > I'm going to nitpick a bit here. Nothing major, I promise. ;) > > > > Could we make these comments into nice sentences with capitalization? I > > think it makes them easier to read in long comments. > > > > How about something like this for the comment: > > > > /* > > * A container wishing to account for a resource should include this > > * structure into one of its own. It may use the helpers below. > > */ > > > > The one above is worded a little bit strangely. > > > >> +struct res_counter { > >> + /* > >> + * the current resource consumption level > >> + */ > >> + unsigned long usage; > >> + /* > >> + * the limit that usage cannot exceed > >> + */ > >> + unsigned long limit; > >> + /* > >> + * the number of insuccessful attempts to consume the resource > >> + */ > > > > unsuccessful > > > >> + unsigned long failcnt; > >> + /* > >> + * the lock to protect all of the above. > >> + * the routines below consider this to be IRQ-safe > >> + */ > >> + spinlock_t lock; > >> +}; > > > > Do we really need all of these comments? Some of them are a wee bit > > self-explanatory. I think we mostly know what a limit is. ;) > > Since this is a new entities in the kernel and not many people > deal with the resource management, I think that nothing bad in > having them. They waste space. It makes the code harder to read. > >> +/* > >> + * helpers to interact with userspace > >> + * res_counter_read/_write - put/get the specified fields from the > >> + * res_counter struct to/from the user > >> + * > >> + * @cnt: the counter in question > >> + * @member: the field to work with (see RES_xxx below) > >> + * @buf: the buffer to opeate on,... > >> + * @nbytes: its size... > >> + * @pos: and the offset. > >> + */ > >> + > >> +ssize_t res_counter_read(struct res_counter *cnt, int member, > >> + const char __user *buf, size_t nbytes, loff_t *pos); > >> +ssize_t res_counter_write(struct res_counter *cnt, int member, > >> + const char __user *buf, size_t nbytes, loff_t *pos); > >> + > >> +/* > >> + * the field descriptors. one for each member of res_counter > >> + */ > >> + > >> +enum { > >> + RES_USAGE, > >> + RES_LIMIT, > >> + RES_FAILCNT, > >> +}; > >> + > > [snip] > > >> diff -puN /dev/null kernel/res_counter.c > >> --- /dev/null 2007-06-01 08:12:04.000000000 -0700 > >> +++ linux-2.6.22-rc6-balbir/kernel/res_counter.c 2007-07-05 13:45:17.000000000 -0700 > >> @@ -0,0 +1,121 @@ > >> +/* > >> + * resource containers > >> + * > >> + * Copyright 2007 OpenVZ SWsoft Inc > >> + * > >> + * Author: Pavel Emelianov <xemul@openvz.org> > >> + * > >> + */ > >> + > >> +#include <linux/types.h> > >> +#include <linux/parser.h> > >> +#include <linux/fs.h> > >> +#include <linux/res_counter.h> > >> +#include <linux/uaccess.h> > >> + > >> +void res_counter_init(struct res_counter *cnt) > >> +{ > >> + spin_lock_init(&cnt->lock); > >> + cnt->limit = (unsigned long)LONG_MAX; > >> +} > >> + > >> +int res_counter_charge_locked(struct res_counter *cnt, unsigned long val) > >> +{ > >> + if (cnt->usage <= cnt->limit - val) { > >> + cnt->usage += val; > >> + return 0; > >> + } > >> + > >> + cnt->failcnt++; > >> + return -ENOMEM; > >> +} > > > > More nitpicking... > > > > Can we leave the normal control flow in the lowest indentation level, > > and have only errors in the indented if(){} blocks? Something like > > this: > > As far as I know gcc usually makes the "true" branch to be > in the straight code flow and in general case this does not > trash the CPU pipeline. It's not a big deal either way, but that's a pretty weak reason for doing it that way. Can you actually demonstrate a performance difference? If not, we should defer to the most readable form. > >> +void res_counter_uncharge(struct res_counter *cnt, unsigned long val) > >> +{ > >> + unsigned long flags; > >> + > >> + spin_lock_irqsave(&cnt->lock, flags); > >> + res_counter_uncharge_locked(cnt, val); > >> + spin_unlock_irqrestore(&cnt->lock, flags); > >> +} > >> + > >> + > >> +static inline unsigned long *res_counter_member(struct res_counter *cnt, int member) > >> +{ > >> + switch (member) { > >> + case RES_USAGE: > >> + return &cnt->usage; > >> + case RES_LIMIT: > >> + return &cnt->limit; > >> + case RES_FAILCNT: > >> + return &cnt->failcnt; > >> + }; > >> + > >> + BUG(); > >> + return NULL; > >> +} > >> > >> +ssize_t res_counter_read(struct res_counter *cnt, int member, > >> + const char __user *userbuf, size_t nbytes, loff_t *pos) > >> +{ > >> + unsigned long *val; > >> + char buf[64], *s; > >> + > >> + s = buf; > >> + val = res_counter_member(cnt, member); > >> + s += sprintf(s, "%lu\n", *val); > >> + return simple_read_from_buffer((void __user *)userbuf, nbytes, > >> + pos, buf, s - buf); > >> +} > > > > Why do we need that cast? > > simple_read_from_buffer do not take const char * as the 1st arg True, but we can pass char* to a function taking void* without a problem and without an explicit cast. What's the actual problem? The "const"? We're effectively throwing away the information here that res_counter_read() expects userbuf to be constant. If simple_read_from_buffer() ever decided to write to userbuf, we'd be in trouble. If simple_read_from_buffer() will never write, then _it_ should have a const first argument. Also, what if "userbuf" changes type? We'll never see warnings, just weird runtime bugs. I just worry that these kinds of casts shut up warnings that _are_ valid and might find real bugs. -- Dave - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ _______________________________________________ Containers mailing list Containers@lists.linux-foundation.org https://lists.linux-foundation.org/mailman/listinfo/containers
Re: [-mm PATCH 4/8] Memory controller memory accounting (v2)
hi, > diff -puN mm/memory.c~mem-control-accounting mm/memory.c > --- linux-2.6.22-rc6/mm/memory.c~mem-control-accounting 2007-07-05 13:45:18.000000000 -0700 > +++ linux-2.6.22-rc6-balbir/mm/memory.c 2007-07-05 13:45:18.000000000 -0700 > @@ -1731,6 +1736,9 @@ gotten: > cow_user_page(new_page, old_page, address, vma); > } > > + if (mem_container_charge(new_page, mm)) > + goto oom; > + > /* > * Re-check the pte - we dropped the lock > */ it seems that the page will be leaked on error. > @@ -2188,6 +2196,11 @@ static int do_swap_page(struct mm_struct > } > > delayacct_clear_flag(DELAYACCT_PF_SWAPIN); > + if (mem_container_charge(page, mm)) { > + ret = VM_FAULT_OOM; > + goto out; > + } > + > mark_page_accessed(page); > lock_page(page); > ditto. > @@ -2264,6 +2278,9 @@ static int do_anonymous_page(struct mm_s > if (!page) > goto oom; > > + if (mem_container_charge(page, mm)) > + goto oom; > + > entry = mk_pte(page, vma->vm_page_prot); > entry = maybe_mkwrite(pte_mkdirty(entry), vma); > ditto. can you check the rest of the patch by yourself? thanks. YAMAMOTO Takashi _______________________________________________ Containers mailing list Containers@lists.linux-foundation.org https://lists.linux-foundation.org/mailman/listinfo/containers
On 7/10/07, YAMAMOTO Takashi <yamamoto@valinux.co.jp> wrote: > hi, > > > diff -puN mm/memory.c~mem-control-accounting mm/memory.c > > --- linux-2.6.22-rc6/mm/memory.c~mem-control-accounting 2007-07-05 13:45:18.000000000 -0700 > > +++ linux-2.6.22-rc6-balbir/mm/memory.c 2007-07-05 13:45:18.000000000 -0700 > > > @@ -1731,6 +1736,9 @@ gotten: > > cow_user_page(new_page, old_page, address, vma); > > } > > > > + if (mem_container_charge(new_page, mm)) > > + goto oom; > > + > > /* > > * Re-check the pte - we dropped the lock > > */ > > it seems that the page will be leaked on error. You mean meta_page right? > > > @@ -2188,6 +2196,11 @@ static int do_swap_page(struct mm_struct > > } > > > > delayacct_clear_flag(DELAYACCT_PF_SWAPIN); > > + if (mem_container_charge(page, mm)) { > > + ret = VM_FAULT_OOM; > > + goto out; > > + } > > + > > mark_page_accessed(page); > > lock_page(page); > > > > ditto. > > > @@ -2264,6 +2278,9 @@ static int do_anonymous_page(struct mm_s > > if (!page) > > goto oom; > > > > + if (mem_container_charge(page, mm)) > > + goto oom; > > + > > entry = mk_pte(page, vma->vm_page_prot); > > entry = maybe_mkwrite(pte_mkdirty(entry), vma); > > > > ditto. > > can you check the rest of the patch by yourself? thanks. > Excellent catch! I'll review the accounting framework and post the updated version soon Balbir _______________________________________________ Containers mailing list Containers@lists.linux-foundation.org https://lists.linux-foundation.org/mailman/listinfo/containers
> Add the meta_page to the per container LRU. The reclaim algorithm has been > modified to make the isolate_lru_pages() as a pluggable component. The > scan_control data structure now accepts the container on behalf of which > reclaims are carried out. try_to_free_pages() has been extended to become > container aware. > > Signed-off-by: Balbir Singh <balbir@linux.vnet.ibm.com> it seems that the number of pages to scan (nr_active/nr_inactive in shrink_zone) is calculated from NR_ACTIVE and NR_INACTIVE of the zone, even in the case of per-container reclaim. is it intended? YAMAMOTO Takashi _______________________________________________ Containers mailing list Containers@lists.linux-foundation.org https://lists.linux-foundation.org/mailman/listinfo/containers
> On 7/10/07, YAMAMOTO Takashi <yamamoto@valinux.co.jp> wrote: > > hi, > > > > > diff -puN mm/memory.c~mem-control-accounting mm/memory.c > > > --- linux-2.6.22-rc6/mm/memory.c~mem-control-accounting 2007-07-05 13:45:18.000000000 -0700 > > > +++ linux-2.6.22-rc6-balbir/mm/memory.c 2007-07-05 13:45:18.000000000 -0700 > > > > > @@ -1731,6 +1736,9 @@ gotten: > > > cow_user_page(new_page, old_page, address, vma); > > > } > > > > > > + if (mem_container_charge(new_page, mm)) > > > + goto oom; > > > + > > > /* > > > * Re-check the pte - we dropped the lock > > > */ > > > > it seems that the page will be leaked on error. > > You mean meta_page right? no. i meant 'new_page'. YAMAMOTO Takashi _______________________________________________ Containers mailing list Containers@lists.linux-foundation.org https://lists.linux-foundation.org/mailman/listinfo/containers
YAMAMOTO Takashi wrote: >> Add the meta_page to the per container LRU. The reclaim algorithm has been >> modified to make the isolate_lru_pages() as a pluggable component. The >> scan_control data structure now accepts the container on behalf of which >> reclaims are carried out. try_to_free_pages() has been extended to become >> container aware. >> >> Signed-off-by: Balbir Singh <balbir@linux.vnet.ibm.com> > > it seems that the number of pages to scan (nr_active/nr_inactive > in shrink_zone) is calculated from NR_ACTIVE and NR_INACTIVE of the zone, > even in the case of per-container reclaim. is it intended? > > YAMAMOTO Takashi Good catch again! We do that for now since the per zone LRU is a superset of the container LRU. I see this as an important TODO item for us -- to move to reclaim statistics based on per container nr_active and nr_inactive (to be added). -- Warm Regards, Balbir Singh Linux Technology Center IBM, ISTL _______________________________________________ Containers mailing list Containers@lists.linux-foundation.org https://lists.linux-foundation.org/mailman/listinfo/containers
YAMAMOTO Takashi wrote: >> On 7/10/07, YAMAMOTO Takashi <yamamoto@valinux.co.jp> wrote: >>> hi, >>> >>>> diff -puN mm/memory.c~mem-control-accounting mm/memory.c >>>> --- linux-2.6.22-rc6/mm/memory.c~mem-control-accounting 2007-07-05 13:45:18.000000000 -0700 >>>> +++ linux-2.6.22-rc6-balbir/mm/memory.c 2007-07-05 13:45:18.000000000 -0700 >>>> @@ -1731,6 +1736,9 @@ gotten: >>>> cow_user_page(new_page, old_page, address, vma); >>>> } >>>> >>>> + if (mem_container_charge(new_page, mm)) >>>> + goto oom; >>>> + >>>> /* >>>> * Re-check the pte - we dropped the lock >>>> */ >>> it seems that the page will be leaked on error. >> You mean meta_page right? > > no. i meant 'new_page'. > > YAMAMOTO Takashi Yes, I see. Thanks for clarifying. -- Warm Regards, Balbir Singh Linux Technology Center IBM, ISTL _______________________________________________ Containers mailing list Containers@lists.linux-foundation.org https://lists.linux-foundation.org/mailman/listinfo/containers