* [PATCH RFC v0 0/3] cgroup notifications API and memory thresholds @ 2009-11-26 16:27 Kirill A. Shutemov 2009-11-26 16:27 ` [PATCH RFC v0 1/3] cgroup: implement eventfd-based generic API for notifications Kirill A. Shutemov 2009-11-26 17:02 ` [PATCH RFC v0 0/3] cgroup notifications API and " Daniel Lezcano 0 siblings, 2 replies; 13+ messages in thread From: Kirill A. Shutemov @ 2009-11-26 16:27 UTC (permalink / raw) To: containers, linux-mm Cc: Paul Menage, Li Zefan, Andrew Morton, KAMEZAWA Hiroyuki, Balbir Singh, Pavel Emelyanov, linux-kernel, Kirill A. Shutemov It's my first attempt to implement cgroup notifications API and memory thresholds on top of it. The idea of API was proposed by Paul Menage. It lacks some important features and need more testing, but I want publish it as soon as possible to get feedback from community. TODO: - memory thresholds on root cgroup; - memsw support; - documentation. Kirill A. Shutemov (3): cgroup: implement eventfd-based generic API for notifications res_counter: implement thresholds memcg: implement memory thresholds include/linux/cgroup.h | 8 ++ include/linux/res_counter.h | 44 +++++++++++ kernel/cgroup.c | 181 ++++++++++++++++++++++++++++++++++++++++++- kernel/res_counter.c | 4 + mm/memcontrol.c | 149 +++++++++++++++++++++++++++++++++++ 5 files changed, 385 insertions(+), 1 deletions(-) -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> ^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH RFC v0 1/3] cgroup: implement eventfd-based generic API for notifications 2009-11-26 16:27 [PATCH RFC v0 0/3] cgroup notifications API and memory thresholds Kirill A. Shutemov @ 2009-11-26 16:27 ` Kirill A. Shutemov 2009-11-26 16:27 ` [PATCH RFC v0 2/3] res_counter: implement thresholds Kirill A. Shutemov 2009-11-26 17:02 ` [PATCH RFC v0 0/3] cgroup notifications API and " Daniel Lezcano 1 sibling, 1 reply; 13+ messages in thread From: Kirill A. Shutemov @ 2009-11-26 16:27 UTC (permalink / raw) To: containers, linux-mm Cc: Paul Menage, Li Zefan, Andrew Morton, KAMEZAWA Hiroyuki, Balbir Singh, Pavel Emelyanov, linux-kernel, Kirill A. Shutemov This patch introduces write-only file "cgroup.event_control" in every cgroup. To register new notification handler you need: - create an eventfd; - open a control file to be monitored. Callbacks register_event() and unregister_event() must be defined for the control file; - write "<event_fd> <control_fd> <args>" to cgroup.event_control. Interpretation of args is defined by control file implementation; eventfd will be woken up by control file implementation or when the cgroup is removed. To unregister notification handler just close eventfd. Signed-off-by: Kirill A. Shutemov <kirill@shutemov.name> -- 1.6.5.3 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> ^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH RFC v0 2/3] res_counter: implement thresholds 2009-11-26 16:27 ` [PATCH RFC v0 1/3] cgroup: implement eventfd-based generic API for notifications Kirill A. Shutemov @ 2009-11-26 16:27 ` Kirill A. Shutemov 2009-11-26 16:27 ` [PATCH RFC v0 3/3] memcg: implement memory thresholds Kirill A. Shutemov 0 siblings, 1 reply; 13+ messages in thread From: Kirill A. Shutemov @ 2009-11-26 16:27 UTC (permalink / raw) To: containers, linux-mm Cc: Paul Menage, Li Zefan, Andrew Morton, KAMEZAWA Hiroyuki, Balbir Singh, Pavel Emelyanov, linux-kernel, Kirill A. Shutemov It allows to setup two thresholds: one above current usage and one below. Callback threshold_notifier() will be called if a threshold is crossed. Signed-off-by: Kirill A. Shutemov <kirill@shutemov.name> -- 1.6.5.3 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> ^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH RFC v0 3/3] memcg: implement memory thresholds 2009-11-26 16:27 ` [PATCH RFC v0 2/3] res_counter: implement thresholds Kirill A. Shutemov @ 2009-11-26 16:27 ` Kirill A. Shutemov 2009-11-26 17:03 ` Balbir Singh 0 siblings, 1 reply; 13+ messages in thread From: Kirill A. Shutemov @ 2009-11-26 16:27 UTC (permalink / raw) To: containers, linux-mm Cc: Paul Menage, Li Zefan, Andrew Morton, KAMEZAWA Hiroyuki, Balbir Singh, Pavel Emelyanov, linux-kernel, Kirill A. Shutemov It allows to register multiple memory thresholds and gets notifications when it crosses. To register a threshold application need: - create an eventfd; - open file memory.usage_in_bytes of a cgroup - write string "<event_fd> <memory.usage_in_bytes> <threshold>" to cgroup.event_control. Application will be notified through eventfd when memory usage crosses threshold in any direction. Signed-off-by: Kirill A. Shutemov <kirill@shutemov.name> -- 1.6.5.3 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH RFC v0 3/3] memcg: implement memory thresholds 2009-11-26 16:27 ` [PATCH RFC v0 3/3] memcg: implement memory thresholds Kirill A. Shutemov @ 2009-11-26 17:03 ` Balbir Singh 2009-11-26 17:11 ` Kirill A. Shutemov 0 siblings, 1 reply; 13+ messages in thread From: Balbir Singh @ 2009-11-26 17:03 UTC (permalink / raw) To: Kirill A. Shutemov Cc: containers, linux-mm, Paul Menage, Li Zefan, Andrew Morton, KAMEZAWA Hiroyuki, Pavel Emelyanov, linux-kernel On Thu, Nov 26, 2009 at 9:57 PM, Kirill A. Shutemov <kirill@shutemov.name> wrote: > It allows to register multiple memory thresholds and gets notifications > when it crosses. > > To register a threshold application need: > - create an eventfd; > - open file memory.usage_in_bytes of a cgroup > - write string "<event_fd> <memory.usage_in_bytes> <threshold>" to > cgroup.event_control. > > Application will be notified through eventfd when memory usage crosses > threshold in any direction. > > Signed-off-by: Kirill A. Shutemov <kirill@shutemov.name> > I don't see the patches attached or inlined in the emails that follow Balbir -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH RFC v0 3/3] memcg: implement memory thresholds 2009-11-26 17:03 ` Balbir Singh @ 2009-11-26 17:11 ` Kirill A. Shutemov 0 siblings, 0 replies; 13+ messages in thread From: Kirill A. Shutemov @ 2009-11-26 17:11 UTC (permalink / raw) To: Balbir Singh Cc: containers, linux-mm, Paul Menage, Li Zefan, Andrew Morton, KAMEZAWA Hiroyuki, Pavel Emelyanov, linux-kernel On Thu, Nov 26, 2009 at 7:03 PM, Balbir Singh <balbir@linux.vnet.ibm.com> wrote: > On Thu, Nov 26, 2009 at 9:57 PM, Kirill A. Shutemov > <kirill@shutemov.name> wrote: >> It allows to register multiple memory thresholds and gets notifications >> when it crosses. >> >> To register a threshold application need: >> - create an eventfd; >> - open file memory.usage_in_bytes of a cgroup >> - write string "<event_fd> <memory.usage_in_bytes> <threshold>" to >> cgroup.event_control. >> >> Application will be notified through eventfd when memory usage crosses >> threshold in any direction. >> >> Signed-off-by: Kirill A. Shutemov <kirill@shutemov.name> >> > > I don't see the patches attached or inlined in the emails that follow Sorry. Resent. -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH RFC v0 0/3] cgroup notifications API and memory thresholds 2009-11-26 16:27 [PATCH RFC v0 0/3] cgroup notifications API and memory thresholds Kirill A. Shutemov 2009-11-26 16:27 ` [PATCH RFC v0 1/3] cgroup: implement eventfd-based generic API for notifications Kirill A. Shutemov @ 2009-11-26 17:02 ` Daniel Lezcano 2009-11-26 18:38 ` Kirill A. Shutemov 1 sibling, 1 reply; 13+ messages in thread From: Daniel Lezcano @ 2009-11-26 17:02 UTC (permalink / raw) To: Kirill A. Shutemov Cc: containers, linux-mm, linux-kernel, Paul Menage, Balbir Singh, Andrew Morton, Pavel Emelyanov Kirill A. Shutemov wrote: > It's my first attempt to implement cgroup notifications API and memory > thresholds on top of it. The idea of API was proposed by Paul Menage. > > It lacks some important features and need more testing, but I want publish > it as soon as possible to get feedback from community. > > TODO: > - memory thresholds on root cgroup; > - memsw support; > - documentation. > Maybe it would be interesting to do that for the /cgroup/<name>/tasks by sending in the event the number of tasks in the cgroup when it changes, so it more easy to detect 0 process event and then remove the cgroup directory, no ? -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH RFC v0 0/3] cgroup notifications API and memory thresholds 2009-11-26 17:02 ` [PATCH RFC v0 0/3] cgroup notifications API and " Daniel Lezcano @ 2009-11-26 18:38 ` Kirill A. Shutemov 0 siblings, 0 replies; 13+ messages in thread From: Kirill A. Shutemov @ 2009-11-26 18:38 UTC (permalink / raw) To: Daniel Lezcano Cc: containers, linux-mm, linux-kernel, Paul Menage, Balbir Singh, Andrew Morton, Pavel Emelyanov On Thu, Nov 26, 2009 at 7:02 PM, Daniel Lezcano <daniel.lezcano@free.fr> wrote: > Kirill A. Shutemov wrote: >> >> It's my first attempt to implement cgroup notifications API and memory >> thresholds on top of it. The idea of API was proposed by Paul Menage. >> >> It lacks some important features and need more testing, but I want publish >> it as soon as possible to get feedback from community. >> >> TODO: >> - memory thresholds on root cgroup; >> - memsw support; >> - documentation. >> > > Maybe it would be interesting to do that for the /cgroup/<name>/tasks by > sending in the event the number of tasks in the cgroup when it changes, so > it more easy to detect 0 process event and then remove the cgroup directory, > no ? I'll do it later. -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> ^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH RFC v0 0/3] cgroup notifications API and memory thresholds @ 2009-11-26 17:11 Kirill A. Shutemov 2009-11-26 17:11 ` [PATCH RFC v0 1/3] cgroup: implement eventfd-based generic API for notifications Kirill A. Shutemov 0 siblings, 1 reply; 13+ messages in thread From: Kirill A. Shutemov @ 2009-11-26 17:11 UTC (permalink / raw) To: containers, linux-mm Cc: Paul Menage, Li Zefan, Andrew Morton, KAMEZAWA Hiroyuki, Balbir Singh, Pavel Emelyanov, linux-kernel, Kirill A. Shutemov It's my first attempt to implement cgroup notifications API and memory thresholds on top of it. The idea of API was proposed by Paul Menage. It lacks some important features and need more testing, but I want publish it as soon as possible to get feedback from community. TODO: - memory thresholds on root cgroup; - memsw support; - documentation. Kirill A. Shutemov (3): cgroup: implement eventfd-based generic API for notifications res_counter: implement thresholds memcg: implement memory thresholds include/linux/cgroup.h | 8 ++ include/linux/res_counter.h | 44 +++++++++++ kernel/cgroup.c | 181 ++++++++++++++++++++++++++++++++++++++++++- kernel/res_counter.c | 4 + mm/memcontrol.c | 149 +++++++++++++++++++++++++++++++++++ 5 files changed, 385 insertions(+), 1 deletions(-) -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> ^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH RFC v0 1/3] cgroup: implement eventfd-based generic API for notifications 2009-11-26 17:11 Kirill A. Shutemov @ 2009-11-26 17:11 ` Kirill A. Shutemov 2009-11-26 17:11 ` [PATCH RFC v0 2/3] res_counter: implement thresholds Kirill A. Shutemov 0 siblings, 1 reply; 13+ messages in thread From: Kirill A. Shutemov @ 2009-11-26 17:11 UTC (permalink / raw) To: containers, linux-mm Cc: Paul Menage, Li Zefan, Andrew Morton, KAMEZAWA Hiroyuki, Balbir Singh, Pavel Emelyanov, linux-kernel, Kirill A. Shutemov This patch introduces write-only file "cgroup.event_control" in every cgroup. To register new notification handler you need: - create an eventfd; - open a control file to be monitored. Callbacks register_event() and unregister_event() must be defined for the control file; - write "<event_fd> <control_fd> <args>" to cgroup.event_control. Interpretation of args is defined by control file implementation; eventfd will be woken up by control file implementation or when the cgroup is removed. To unregister notification handler just close eventfd. Signed-off-by: Kirill A. Shutemov <kirill@shutemov.name> --- include/linux/cgroup.h | 8 ++ kernel/cgroup.c | 181 +++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 188 insertions(+), 1 deletions(-) diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h index 0008dee..285eaff 100644 --- a/include/linux/cgroup.h +++ b/include/linux/cgroup.h @@ -220,6 +220,9 @@ struct cgroup { /* For RCU-protected deletion */ struct rcu_head rcu_head; + + struct list_head event_list; + struct mutex event_list_mutex; }; /* @@ -362,6 +365,11 @@ struct cftype { int (*trigger)(struct cgroup *cgrp, unsigned int event); int (*release)(struct inode *inode, struct file *file); + + int (*register_event)(struct cgroup *cgrp, struct cftype *cft, + struct eventfd_ctx *eventfd, const char *args); + int (*unregister_event)(struct cgroup *cgrp, struct cftype *cft, + struct eventfd_ctx *eventfd); }; struct cgroup_scanner { diff --git a/kernel/cgroup.c b/kernel/cgroup.c index 0249f4b..5438d46 100644 --- a/kernel/cgroup.c +++ b/kernel/cgroup.c @@ -4,6 +4,10 @@ * Based originally on the cpuset system, extracted by Paul Menage * Copyright (C) 2006 Google, Inc * + * Notifiactions support + * Copyright (C) 2009 Nokia Corporation + * Author: Kirill A. Shutemov + * * Copyright notices from the original cpuset code: * -------------------------------------------------- * Copyright (C) 2003 BULL SA. @@ -51,6 +55,8 @@ #include <linux/pid_namespace.h> #include <linux/idr.h> #include <linux/vmalloc.h> /* TODO: replace with more sophisticated array */ +#include <linux/eventfd.h> +#include <linux/poll.h> #include <asm/atomic.h> @@ -146,6 +152,16 @@ struct css_id { unsigned short stack[0]; /* Array of Length (depth+1) */ }; +struct cgroup_event { + struct cgroup *cgrp; + struct cftype *cft; + struct eventfd_ctx *eventfd; + struct list_head list; + poll_table pt; + wait_queue_head_t *wqh; + wait_queue_t wait; +}; +static int cgroup_event_remove(struct cgroup_event *event); /* The list of hierarchy roots */ @@ -734,14 +750,26 @@ static struct inode *cgroup_new_inode(mode_t mode, struct super_block *sb) static int cgroup_call_pre_destroy(struct cgroup *cgrp) { struct cgroup_subsys *ss; + struct cgroup_event *event, *tmp; int ret = 0; for_each_subsys(cgrp->root, ss) if (ss->pre_destroy) { ret = ss->pre_destroy(ss, cgrp); if (ret) - break; + goto out; } + + mutex_lock(&cgrp->event_list_mutex); + list_for_each_entry_safe(event, tmp, &cgrp->event_list, list) { + ret = cgroup_event_remove(event); + if (ret) + break; + eventfd_signal(event->eventfd, 1); + } + mutex_unlock(&cgrp->event_list_mutex); + +out: return ret; } @@ -1136,6 +1164,8 @@ static void init_cgroup_housekeeping(struct cgroup *cgrp) INIT_LIST_HEAD(&cgrp->release_list); INIT_LIST_HEAD(&cgrp->pidlists); mutex_init(&cgrp->pidlist_mutex); + INIT_LIST_HEAD(&cgrp->event_list); + mutex_init(&cgrp->event_list_mutex); } static void init_cgroup_root(struct cgroupfs_root *root) @@ -1935,6 +1965,13 @@ static const struct inode_operations cgroup_dir_inode_operations = { .rename = cgroup_rename, }; +static inline struct cftype *__file_cft(struct file *file) +{ + if (file->f_dentry->d_inode->i_fop != &cgroup_file_operations) + return ERR_PTR(-EINVAL); + return __d_cft(file->f_dentry); +} + static int cgroup_create_file(struct dentry *dentry, mode_t mode, struct super_block *sb) { @@ -2789,6 +2826,143 @@ static int cgroup_write_notify_on_release(struct cgroup *cgrp, return 0; } +static int cgroup_event_remove(struct cgroup_event *event) +{ + struct cgroup *cgrp = event->cgrp; + int ret; + + BUG_ON(!mutex_is_locked(&cgrp->event_list_mutex)); + ret = event->cft->unregister_event(cgrp, event->cft, event->eventfd); + eventfd_ctx_put(event->eventfd); + remove_wait_queue(event->wqh, &event->wait); + list_del(&event->list); + kfree(event); + + return ret; +} + +static int cgroup_event_wake(wait_queue_t *wait, unsigned mode, + int sync, void *key) +{ + struct cgroup_event *event = container_of(wait, + struct cgroup_event, wait); + struct cgroup *cgrp = event->cgrp; + unsigned long flags = (unsigned long)key; + int ret; + + if (!(flags & POLLHUP)) + return 0; + + mutex_lock(&cgrp->event_list_mutex); + ret = cgroup_event_remove(event); + mutex_unlock(&cgrp->event_list_mutex); + + return ret; +} + +static void cgroup_event_ptable_queue_proc(struct file *file, + wait_queue_head_t *wqh, poll_table *pt) +{ + struct cgroup_event *event = container_of(pt, + struct cgroup_event, pt); + + event->wqh = wqh; + add_wait_queue(wqh, &event->wait); +} + +static int cgroup_write_event_control(struct cgroup *cont, struct cftype *cft, + const char *buffer) +{ + struct cgroup_event *event = NULL; + unsigned int efd, cfd; + struct file *efile = NULL; + struct file *cfile = NULL; + char *endp; + int ret; + + efd = simple_strtoul(buffer, &endp, 10); + if (*endp != ' ') + return -EINVAL; + buffer = endp + 1; + + cfd = simple_strtoul(buffer, &endp, 10); + if ((*endp != ' ') && (*endp != '\0')) + return -EINVAL; + buffer = endp + 1; + + event = kzalloc(sizeof(*event), GFP_KERNEL); + if (!event) + return -ENOMEM; + event->cgrp = cont; + INIT_LIST_HEAD(&event->list); + init_poll_funcptr(&event->pt, cgroup_event_ptable_queue_proc); + init_waitqueue_func_entry(&event->wait, cgroup_event_wake); + + efile = eventfd_fget(efd); + if (IS_ERR(efile)) { + ret = PTR_ERR(efile); + goto fail; + } + + event->eventfd = eventfd_ctx_fileget(efile); + if (IS_ERR(event->eventfd)) { + ret = PTR_ERR(event->eventfd); + goto fail; + } + + cfile = fget(cfd); + if (!cfile) { + ret = -EBADF; + goto fail; + } + + ret = file_permission(cfile, MAY_READ); + if (ret < 0) + goto fail; + + event->cft = __file_cft(cfile); + if (IS_ERR(event->cft)) { + ret = PTR_ERR(event->cft); + goto fail; + } + + if (!event->cft->register_event || !event->cft->unregister_event) { + ret = -EINVAL; + goto fail; + } + + ret = event->cft->register_event(cont, event->cft, + event->eventfd, buffer); + if (ret) + goto fail; + + efile->f_op->poll(efile, &event->pt); + + mutex_lock(&cont->event_list_mutex); + list_add(&event->list, &cont->event_list); + mutex_unlock(&cont->event_list_mutex); + + fput(cfile); + fput(efile); + + return 0; + +fail: + if (!IS_ERR(cfile)) + fput(cfile); + + if (event && event->eventfd && !IS_ERR(event->eventfd)) + eventfd_ctx_put(event->eventfd); + + if (!IS_ERR(efile)) + fput(efile); + + if (event) + kfree(event); + + return ret; +} + /* * for the common functions, 'private' gives the type of file */ @@ -2814,6 +2988,11 @@ static struct cftype files[] = { .read_u64 = cgroup_read_notify_on_release, .write_u64 = cgroup_write_notify_on_release, }, + { + .name = CGROUP_FILE_GENERIC_PREFIX "event_control", + .write_string = cgroup_write_event_control, + .mode = S_IWUGO, + }, }; static struct cftype cft_release_agent = { -- 1.6.5.3 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> ^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH RFC v0 2/3] res_counter: implement thresholds 2009-11-26 17:11 ` [PATCH RFC v0 1/3] cgroup: implement eventfd-based generic API for notifications Kirill A. Shutemov @ 2009-11-26 17:11 ` Kirill A. Shutemov 2009-11-27 0:20 ` Daisuke Nishimura 0 siblings, 1 reply; 13+ messages in thread From: Kirill A. Shutemov @ 2009-11-26 17:11 UTC (permalink / raw) To: containers, linux-mm Cc: Paul Menage, Li Zefan, Andrew Morton, KAMEZAWA Hiroyuki, Balbir Singh, Pavel Emelyanov, linux-kernel, Kirill A. Shutemov It allows to setup two thresholds: one above current usage and one below. Callback threshold_notifier() will be called if a threshold is crossed. Signed-off-by: Kirill A. Shutemov <kirill@shutemov.name> --- include/linux/res_counter.h | 44 +++++++++++++++++++++++++++++++++++++++++++ kernel/res_counter.c | 4 +++ 2 files changed, 48 insertions(+), 0 deletions(-) diff --git a/include/linux/res_counter.h b/include/linux/res_counter.h index fcb9884..bca99a5 100644 --- a/include/linux/res_counter.h +++ b/include/linux/res_counter.h @@ -9,6 +9,10 @@ * * Author: Pavel Emelianov <xemul@openvz.org> * + * Thresholds support + * Copyright (C) 2009 Nokia Corporation + * Author: Kirill A. Shutemov + * * See Documentation/cgroups/resource_counter.txt for more * info about what this counter is. */ @@ -42,6 +46,13 @@ struct res_counter { * the number of unsuccessful attempts to consume the resource */ unsigned long long failcnt; + + unsigned long long threshold_above; + unsigned long long threshold_below; + void (*threshold_notifier)(struct res_counter *counter, + unsigned long long usage, + unsigned long long threshold); + /* * the lock to protect all of the above. * the routines below consider this to be IRQ-safe @@ -145,6 +156,20 @@ static inline bool res_counter_soft_limit_check_locked(struct res_counter *cnt) return false; } +static inline void res_counter_threshold_notify_locked(struct res_counter *cnt) +{ + if (cnt->usage >= cnt->threshold_above) { + cnt->threshold_notifier(cnt, cnt->usage, cnt->threshold_above); + return; + } + + if (cnt->usage < cnt->threshold_below) { + cnt->threshold_notifier(cnt, cnt->usage, cnt->threshold_below); + return; + } +} + + /** * Get the difference between the usage and the soft limit * @cnt: The counter @@ -238,4 +263,23 @@ res_counter_set_soft_limit(struct res_counter *cnt, return 0; } +static inline int +res_counter_set_thresholds(struct res_counter *cnt, + unsigned long long threshold_above, + unsigned long long threshold_below) +{ + unsigned long flags; + int ret = -EINVAL; + + spin_lock_irqsave(&cnt->lock, flags); + if ((cnt->usage < threshold_above) && + (cnt->usage >= threshold_below)) { + cnt->threshold_above = threshold_above; + cnt->threshold_below = threshold_below; + ret = 0; + } + spin_unlock_irqrestore(&cnt->lock, flags); + return ret; +} + #endif diff --git a/kernel/res_counter.c b/kernel/res_counter.c index bcdabf3..646c29c 100644 --- a/kernel/res_counter.c +++ b/kernel/res_counter.c @@ -20,6 +20,8 @@ void res_counter_init(struct res_counter *counter, struct res_counter *parent) spin_lock_init(&counter->lock); counter->limit = RESOURCE_MAX; counter->soft_limit = RESOURCE_MAX; + counter->threshold_above = RESOURCE_MAX; + counter->threshold_below = 0ULL; counter->parent = parent; } @@ -33,6 +35,7 @@ int res_counter_charge_locked(struct res_counter *counter, unsigned long val) counter->usage += val; if (counter->usage > counter->max_usage) counter->max_usage = counter->usage; + res_counter_threshold_notify_locked(counter); return 0; } @@ -73,6 +76,7 @@ void res_counter_uncharge_locked(struct res_counter *counter, unsigned long val) val = counter->usage; counter->usage -= val; + res_counter_threshold_notify_locked(counter); } void res_counter_uncharge(struct res_counter *counter, unsigned long val) -- 1.6.5.3 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH RFC v0 2/3] res_counter: implement thresholds 2009-11-26 17:11 ` [PATCH RFC v0 2/3] res_counter: implement thresholds Kirill A. Shutemov @ 2009-11-27 0:20 ` Daisuke Nishimura 2009-11-27 2:45 ` KAMEZAWA Hiroyuki 0 siblings, 1 reply; 13+ messages in thread From: Daisuke Nishimura @ 2009-11-27 0:20 UTC (permalink / raw) To: Kirill A. Shutemov Cc: containers, linux-mm, Paul Menage, Li Zefan, Andrew Morton, KAMEZAWA Hiroyuki, Balbir Singh, Pavel Emelyanov, linux-kernel, Daisuke Nishimura Hi. On Thu, 26 Nov 2009 19:11:16 +0200, "Kirill A. Shutemov" <kirill@shutemov.name> wrote: > It allows to setup two thresholds: one above current usage and one > below. Callback threshold_notifier() will be called if a threshold is > crossed. > > Signed-off-by: Kirill A. Shutemov <kirill@shutemov.name> > --- > include/linux/res_counter.h | 44 +++++++++++++++++++++++++++++++++++++++++++ > kernel/res_counter.c | 4 +++ > 2 files changed, 48 insertions(+), 0 deletions(-) > > diff --git a/include/linux/res_counter.h b/include/linux/res_counter.h > index fcb9884..bca99a5 100644 > --- a/include/linux/res_counter.h > +++ b/include/linux/res_counter.h > @@ -9,6 +9,10 @@ > * > * Author: Pavel Emelianov <xemul@openvz.org> > * > + * Thresholds support > + * Copyright (C) 2009 Nokia Corporation > + * Author: Kirill A. Shutemov > + * > * See Documentation/cgroups/resource_counter.txt for more > * info about what this counter is. > */ > @@ -42,6 +46,13 @@ struct res_counter { > * the number of unsuccessful attempts to consume the resource > */ > unsigned long long failcnt; > + > + unsigned long long threshold_above; > + unsigned long long threshold_below; > + void (*threshold_notifier)(struct res_counter *counter, > + unsigned long long usage, > + unsigned long long threshold); > + > /* > * the lock to protect all of the above. > * the routines below consider this to be IRQ-safe > @@ -145,6 +156,20 @@ static inline bool res_counter_soft_limit_check_locked(struct res_counter *cnt) > return false; > } > > +static inline void res_counter_threshold_notify_locked(struct res_counter *cnt) > +{ > + if (cnt->usage >= cnt->threshold_above) { > + cnt->threshold_notifier(cnt, cnt->usage, cnt->threshold_above); > + return; > + } > + > + if (cnt->usage < cnt->threshold_below) { > + cnt->threshold_notifier(cnt, cnt->usage, cnt->threshold_below); > + return; > + } > +} > + > + > /** > * Get the difference between the usage and the soft limit > * @cnt: The counter > @@ -238,4 +263,23 @@ res_counter_set_soft_limit(struct res_counter *cnt, > return 0; > } > > +static inline int > +res_counter_set_thresholds(struct res_counter *cnt, > + unsigned long long threshold_above, > + unsigned long long threshold_below) > +{ > + unsigned long flags; > + int ret = -EINVAL; > + > + spin_lock_irqsave(&cnt->lock, flags); > + if ((cnt->usage < threshold_above) && > + (cnt->usage >= threshold_below)) { > + cnt->threshold_above = threshold_above; > + cnt->threshold_below = threshold_below; > + ret = 0; > + } > + spin_unlock_irqrestore(&cnt->lock, flags); > + return ret; > +} > + > #endif > diff --git a/kernel/res_counter.c b/kernel/res_counter.c > index bcdabf3..646c29c 100644 > --- a/kernel/res_counter.c > +++ b/kernel/res_counter.c > @@ -20,6 +20,8 @@ void res_counter_init(struct res_counter *counter, struct res_counter *parent) > spin_lock_init(&counter->lock); > counter->limit = RESOURCE_MAX; > counter->soft_limit = RESOURCE_MAX; > + counter->threshold_above = RESOURCE_MAX; > + counter->threshold_below = 0ULL; > counter->parent = parent; > } > > @@ -33,6 +35,7 @@ int res_counter_charge_locked(struct res_counter *counter, unsigned long val) > counter->usage += val; > if (counter->usage > counter->max_usage) > counter->max_usage = counter->usage; > + res_counter_threshold_notify_locked(counter); > return 0; > } > > @@ -73,6 +76,7 @@ void res_counter_uncharge_locked(struct res_counter *counter, unsigned long val) > val = counter->usage; > > counter->usage -= val; > + res_counter_threshold_notify_locked(counter); > } > hmm.. this adds new checks to hot-path of process life cycle. Do you have any number on performance impact of these patches(w/o setting any threshold)? IMHO, it might be small enough to be ignored because KAMEZAWA-san's coalesce charge/uncharge patches have decreased charge/uncharge for res_counter itself, but I want to know just to make sure. Regards, Daisuke Nishimura. -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH RFC v0 2/3] res_counter: implement thresholds 2009-11-27 0:20 ` Daisuke Nishimura @ 2009-11-27 2:45 ` KAMEZAWA Hiroyuki 2009-11-27 3:08 ` Balbir Singh 0 siblings, 1 reply; 13+ messages in thread From: KAMEZAWA Hiroyuki @ 2009-11-27 2:45 UTC (permalink / raw) To: Daisuke Nishimura Cc: Kirill A. Shutemov, containers, linux-mm, Paul Menage, Li Zefan, Andrew Morton, Balbir Singh, Pavel Emelyanov, linux-kernel On Fri, 27 Nov 2009 09:20:35 +0900 Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp> wrote: > Hi. > > > > @@ -73,6 +76,7 @@ void res_counter_uncharge_locked(struct res_counter *counter, unsigned long val) > > val = counter->usage; > > > > counter->usage -= val; > > + res_counter_threshold_notify_locked(counter); > > } > > > hmm.. this adds new checks to hot-path of process life cycle. > > Do you have any number on performance impact of these patches(w/o setting any threshold)? > IMHO, it might be small enough to be ignored because KAMEZAWA-san's coalesce charge/uncharge > patches have decreased charge/uncharge for res_counter itself, but I want to know just to make sure. > Another concern is to support root cgroup, you need another notifier hook in memcg because root cgroup doesn't use res_counter now. Can't this be implemented in a way like softlimit check ? Filter by the number of event will be good for notifier behavior, for avoiding too much wake up, too. Thanks, -Kame -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH RFC v0 2/3] res_counter: implement thresholds 2009-11-27 2:45 ` KAMEZAWA Hiroyuki @ 2009-11-27 3:08 ` Balbir Singh 2009-11-27 7:08 ` Kirill A. Shutemov 0 siblings, 1 reply; 13+ messages in thread From: Balbir Singh @ 2009-11-27 3:08 UTC (permalink / raw) To: KAMEZAWA Hiroyuki Cc: Daisuke Nishimura, Kirill A. Shutemov, containers, linux-mm, Paul Menage, Li Zefan, Andrew Morton, Pavel Emelyanov, linux-kernel, Dan Malek, Vladislav Buzov On Fri, Nov 27, 2009 at 8:15 AM, KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> wrote: > On Fri, 27 Nov 2009 09:20:35 +0900 > Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp> wrote: > >> Hi. >> > >> > @@ -73,6 +76,7 @@ void res_counter_uncharge_locked(struct res_counter *counter, unsigned long val) >> > val = counter->usage; >> > >> > counter->usage -= val; >> > + res_counter_threshold_notify_locked(counter); >> > } >> > >> hmm.. this adds new checks to hot-path of process life cycle. >> >> Do you have any number on performance impact of these patches(w/o setting any threshold)? >> IMHO, it might be small enough to be ignored because KAMEZAWA-san's coalesce charge/uncharge >> patches have decreased charge/uncharge for res_counter itself, but I want to know just to make sure. >> > Another concern is to support root cgroup, you need another notifier hook in > memcg because root cgroup doesn't use res_counter now. > > Can't this be implemented in a way like softlimit check ? > Filter by the number of event will be good for notifier behavior, for avoiding > too much wake up, too. I guess the semantics would vary then, they would become activity semantics. I think we should avoid threshold notification for root, since we have no limits in root anymore. BTW, Kirill, I've been meaning to write this layer on top of cgroupstats, is there anything that prevents us from using that today? CC'ing Dan Malek and Vladslav Buzov who worked on similar patches earlier. Balbir Singh. -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH RFC v0 2/3] res_counter: implement thresholds 2009-11-27 3:08 ` Balbir Singh @ 2009-11-27 7:08 ` Kirill A. Shutemov 0 siblings, 0 replies; 13+ messages in thread From: Kirill A. Shutemov @ 2009-11-27 7:08 UTC (permalink / raw) To: Balbir Singh, KAMEZAWA Hiroyuki, Daisuke Nishimura Cc: containers, linux-mm, Paul Menage, Li Zefan, Andrew Morton, Pavel Emelyanov, linux-kernel, Dan Malek, Vladislav Buzov On Fri, Nov 27, 2009 at 5:08 AM, Balbir Singh <balbir@linux.vnet.ibm.com> wrote: > On Fri, Nov 27, 2009 at 8:15 AM, KAMEZAWA Hiroyuki > <kamezawa.hiroyu@jp.fujitsu.com> wrote: >> On Fri, 27 Nov 2009 09:20:35 +0900 >> Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp> wrote: >> >>> Hi. >>> > >>> > @@ -73,6 +76,7 @@ void res_counter_uncharge_locked(struct res_counter *counter, unsigned long val) >>> > val = counter->usage; >>> > >>> > counter->usage -= val; >>> > + res_counter_threshold_notify_locked(counter); >>> > } >>> > >>> hmm.. this adds new checks to hot-path of process life cycle. >>> >>> Do you have any number on performance impact of these patches(w/o setting any threshold)? No, I don't. I did only functional testing on this stage. >>> IMHO, it might be small enough to be ignored because KAMEZAWA-san's coalesce charge/uncharge >>> patches have decreased charge/uncharge for res_counter itself, but I want to know just to make sure. >>> >> Another concern is to support root cgroup, you need another notifier hook in >> memcg because root cgroup doesn't use res_counter now. >> >> Can't this be implemented in a way like softlimit check ? I'll investigate it. >> Filter by the number of event will be good for notifier behavior, for avoiding >> too much wake up, too. Good idea, thanks. > I guess the semantics would vary then, they would become activity > semantics. I think we should avoid threshold notification for root, > since we have no limits in root anymore. Threshold notifications for root cgroup is really needed on embedded systems to avid OOM-killer. > > BTW, Kirill, I've been meaning to write this layer on top of > cgroupstats, is there anything that prevents us from using that today? I'll investigate it. > CC'ing Dan Malek and Vladslav Buzov who worked on similar patches > earlier. > > Balbir Singh. > -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> ^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2009-11-27 7:08 UTC | newest] Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2009-11-26 16:27 [PATCH RFC v0 0/3] cgroup notifications API and memory thresholds Kirill A. Shutemov 2009-11-26 16:27 ` [PATCH RFC v0 1/3] cgroup: implement eventfd-based generic API for notifications Kirill A. Shutemov 2009-11-26 16:27 ` [PATCH RFC v0 2/3] res_counter: implement thresholds Kirill A. Shutemov 2009-11-26 16:27 ` [PATCH RFC v0 3/3] memcg: implement memory thresholds Kirill A. Shutemov 2009-11-26 17:03 ` Balbir Singh 2009-11-26 17:11 ` Kirill A. Shutemov 2009-11-26 17:02 ` [PATCH RFC v0 0/3] cgroup notifications API and " Daniel Lezcano 2009-11-26 18:38 ` Kirill A. Shutemov 2009-11-26 17:11 Kirill A. Shutemov 2009-11-26 17:11 ` [PATCH RFC v0 1/3] cgroup: implement eventfd-based generic API for notifications Kirill A. Shutemov 2009-11-26 17:11 ` [PATCH RFC v0 2/3] res_counter: implement thresholds Kirill A. Shutemov 2009-11-27 0:20 ` Daisuke Nishimura 2009-11-27 2:45 ` KAMEZAWA Hiroyuki 2009-11-27 3:08 ` Balbir Singh 2009-11-27 7:08 ` Kirill A. Shutemov
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox