Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1346893 > unrolled thread
| Started by | Parav Pandit <pandit.parav@gmail.com> |
|---|---|
| First post | 2016-03-01 20:10 +0100 |
| Last post | 2016-03-03 09:40 +0100 |
| Articles | 6 — 2 participants |
Back to article view | Back to linux.kernel
This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by
below is the oldest one visible, not the original post.
[PATCHv9 1/3] rdmacg: Added rdma cgroup controller Parav Pandit <pandit.parav@gmail.com> - 2016-03-01 20:10 +0100
Re: [PATCHv9 1/3] rdmacg: Added rdma cgroup controller Tejun Heo <tj@kernel.org> - 2016-03-02 18:50 +0100
Re: [PATCHv9 1/3] rdmacg: Added rdma cgroup controller Parav Pandit <pandit.parav@gmail.com> - 2016-03-02 21:00 +0100
Re: [PATCHv9 1/3] rdmacg: Added rdma cgroup controller Parav Pandit <pandit.parav@gmail.com> - 2016-03-03 03:50 +0100
Re: [PATCHv9 1/3] rdmacg: Added rdma cgroup controller Parav Pandit <pandit.parav@gmail.com> - 2016-03-03 04:20 +0100
Re: [PATCHv9 1/3] rdmacg: Added rdma cgroup controller Parav Pandit <pandit.parav@gmail.com> - 2016-03-03 09:40 +0100
| From | Parav Pandit <pandit.parav@gmail.com> |
|---|---|
| Date | 2016-03-01 20:10 +0100 |
| Subject | [PATCHv9 1/3] rdmacg: Added rdma cgroup controller |
| Message-ID | <r7XQd-4Tj-1@gated-at.bofh.it> |
Added rdma cgroup controller that does accounting, limit enforcement
on rdma/IB verbs and hw resources.
Added rdma cgroup header file which defines its APIs to perform
charing/uncharing functionality and device registration which will
participate in controller functions of accounting and limit
enforcements. It also define rdmacg_device structure to bind IB stack
and RDMA cgroup controller.
RDMA resources are tracked using resource pool. Resource pool is per
device, per cgroup entity which allows setting up accounting limits
on per device basis.
Resources are not defined by the RDMA cgroup, instead they are defined
by the external module IB stack. This allows extending IB stack
without changing kernel, as IB stack is going through changes
and enhancements.
Resource pool is created/destroyed dynamically whenever
charging/uncharging occurs respectively and whenever user
configuration is done. Its a tradeoff of memory vs little more code
space that creates resource pool whenever necessary,
instead of creating them during cgroup creation and device registration
time.
Signed-off-by: Parav Pandit <pandit.parav@gmail.com>
Reviewed-by: Haggai Eran <haggaie@mellanox.com>
---
include/linux/cgroup_rdma.h | 50 +++
include/linux/cgroup_subsys.h | 4 +
init/Kconfig | 10 +
kernel/Makefile | 1 +
kernel/cgroup_rdma.c | 760 ++++++++++++++++++++++++++++++++++++++++++
5 files changed, 825 insertions(+)
create mode 100644 include/linux/cgroup_rdma.h
create mode 100644 kernel/cgroup_rdma.c
diff --git a/include/linux/cgroup_rdma.h b/include/linux/cgroup_rdma.h
new file mode 100644
index 0000000..2da3d6c
--- /dev/null
+++ b/include/linux/cgroup_rdma.h
@@ -0,0 +1,50 @@
+#ifndef _CGROUP_RDMA_H
+#define _CGROUP_RDMA_H
+
+#include <linux/cgroup.h>
+
+#ifdef CONFIG_CGROUP_RDMA
+
+struct rdma_cgroup {
+ struct cgroup_subsys_state css;
+
+ spinlock_t rpool_list_lock; /* protects resource pool list */
+ struct list_head rpool_head; /* head to keep track of all resource
+ * pools that belongs to this cgroup.
+ */
+};
+
+struct rdmacg_pool_info {
+ const char **resource_name_table;
+ int table_len;
+};
+
+struct rdmacg_device {
+ struct rdmacg_pool_info pool_info;
+ struct list_head rdmacg_list;
+ struct list_head rpool_head;
+ /* protects resource pool list */
+ spinlock_t rpool_lock;
+ char *name;
+};
+
+/* APIs for RDMA/IB stack to publish when a device wants to
+ * participate in resource accounting
+ */
+int rdmacg_register_device(struct rdmacg_device *device);
+void rdmacg_unregister_device(struct rdmacg_device *device);
+
+/* APIs for RDMA/IB stack to charge/uncharge pool specific resources */
+int rdmacg_try_charge(struct rdma_cgroup **rdmacg,
+ struct rdmacg_device *device,
+ int resource_index,
+ int num);
+void rdmacg_uncharge(struct rdma_cgroup *cg,
+ struct rdmacg_device *device,
+ int resource_index,
+ int num);
+void rdmacg_query_limit(struct rdmacg_device *device,
+ int *limits);
+
+#endif /* CONFIG_CGROUP_RDMA */
+#endif /* _CGROUP_RDMA_H */
diff --git a/include/linux/cgroup_subsys.h b/include/linux/cgroup_subsys.h
index 0df0336a..d0e597c 100644
--- a/include/linux/cgroup_subsys.h
+++ b/include/linux/cgroup_subsys.h
@@ -56,6 +56,10 @@ SUBSYS(hugetlb)
SUBSYS(pids)
#endif
+#if IS_ENABLED(CONFIG_CGROUP_RDMA)
+SUBSYS(rdma)
+#endif
+
/*
* The following subsystems are not supported on the default hierarchy.
*/
diff --git a/init/Kconfig b/init/Kconfig
index 2232080..0d3efe0 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1054,6 +1054,16 @@ config CGROUP_PIDS
since the PIDs limit only affects a process's ability to fork, not to
attach to a cgroup.
+config CGROUP_RDMA
+ bool "RDMA controller"
+ help
+ Provides enforcement of RDMA resources defined by IB stack.
+ It is fairly easy for consumers to exhaust RDMA resources, which
+ can result into resource unavailability to other consumers.
+ RDMA controller is designed to stop this from happening.
+ Attaching processes with active RDMA resources to the cgroup
+ hierarchy is allowed even if can cross the hierarchy's limit.
+
config CGROUP_FREEZER
bool "Freezer controller"
help
diff --git a/kernel/Makefile b/kernel/Makefile
index 53abf00..26e413c 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -57,6 +57,7 @@ obj-$(CONFIG_COMPAT) += compat.o
obj-$(CONFIG_CGROUPS) += cgroup.o
obj-$(CONFIG_CGROUP_FREEZER) += cgroup_freezer.o
obj-$(CONFIG_CGROUP_PIDS) += cgroup_pids.o
+obj-$(CONFIG_CGROUP_RDMA) += cgroup_rdma.o
obj-$(CONFIG_CPUSETS) += cpuset.o
obj-$(CONFIG_UTS_NS) += utsname.o
obj-$(CONFIG_USER_NS) += user_namespace.o
diff --git a/kernel/cgroup_rdma.c b/kernel/cgroup_rdma.c
new file mode 100644
index 0000000..75c996a
--- /dev/null
+++ b/kernel/cgroup_rdma.c
@@ -0,0 +1,760 @@
+/*
+ * This file is subject to the terms and conditions of version 2 of the GNU
+ * General Public License. See the file COPYING in the main directory of the
+ * Linux distribution for more details.
+ */
+
+#include <linux/kernel.h>
+#include <linux/slab.h>
+#include <linux/spinlock.h>
+#include <linux/atomic.h>
+#include <linux/seq_file.h>
+#include <linux/hashtable.h>
+#include <linux/cgroup.h>
+#include <linux/parser.h>
+#include <linux/cgroup_rdma.h>
+
+#define RDMACG_MAX_STR "max"
+
+static DEFINE_MUTEX(dev_mutex);
+static LIST_HEAD(dev_list_head);
+
+enum rdmacg_file_type {
+ RDMACG_RESOURCE_MAX,
+ RDMACG_RESOURCE_STAT,
+};
+
+/* resource tracker per resource for rdma cgroup */
+struct rdmacg_resource {
+ int max;
+ int usage;
+};
+
+/**
+ * resource pool object which represents, per cgroup, per device
+ * resources. There are multiple instance
+ * of this object per cgroup, therefore it cannot be embedded within
+ * rdma_cgroup structure. It is maintained as list.
+ */
+struct rdmacg_resource_pool {
+ struct list_head cg_list;
+ struct list_head dev_list;
+
+ struct rdmacg_device *device;
+ struct rdmacg_resource *resources;
+ struct rdma_cgroup *cg; /* owner cg used during device cleanup */
+
+ int refcnt; /* count active user tasks of this pool */
+ int num_max_cnt; /* total number counts which are set to max */
+};
+
+static struct rdma_cgroup *css_rdmacg(struct cgroup_subsys_state *css)
+{
+ return container_of(css, struct rdma_cgroup, css);
+}
+
+static struct rdma_cgroup *parent_rdmacg(struct rdma_cgroup *cg)
+{
+ return css_rdmacg(cg->css.parent);
+}
+
+static inline struct rdma_cgroup *task_rdmacg(struct task_struct *task)
+{
+ return css_rdmacg(task_css(task, rdma_cgrp_id));
+}
+
+static inline void set_resource_limit(struct rdmacg_resource_pool *rpool,
+ int index, int new_max)
+{
+ if (new_max == S32_MAX) {
+ if (rpool->resources[index].max != S32_MAX)
+ rpool->num_max_cnt++;
+ } else {
+ if (rpool->resources[index].max == S32_MAX)
+ rpool->num_max_cnt--;
+ }
+ rpool->resources[index].max = new_max;
+}
+
+static void set_all_resource_max_limit(struct rdmacg_resource_pool *rpool)
+{
+ struct rdmacg_pool_info *pool_info = &rpool->device->pool_info;
+ int i;
+
+ for (i = 0; i < pool_info->table_len; i++)
+ set_resource_limit(rpool, i, S32_MAX);
+}
+
+static void free_cg_rpool_mem(struct rdmacg_resource_pool *rpool)
+{
+ kfree(rpool->resources);
+ kfree(rpool);
+}
+
+static void free_cg_rpool(struct rdmacg_resource_pool *rpool)
+{
+ spin_lock(&rpool->device->rpool_lock);
+ list_del(&rpool->dev_list);
+ spin_unlock(&rpool->device->rpool_lock);
+
+ free_cg_rpool_mem(rpool);
+}
+
+static struct rdmacg_resource_pool*
+find_cg_rpool_locked(struct rdma_cgroup *cg,
+ struct rdmacg_device *device)
+
+{
+ struct rdmacg_resource_pool *pool;
+
+ lockdep_assert_held(&cg->rpool_list_lock);
+
+ list_for_each_entry(pool, &cg->rpool_head, cg_list)
+ if (pool->device == device)
+ return pool;
+
+ return NULL;
+}
+
+static int
+alloc_cg_rpool(struct rdma_cgroup *cg, struct rdmacg_device *device)
+{
+ struct rdmacg_resource_pool *rpool, *other_rpool;
+ struct rdmacg_pool_info *pool_info = &device->pool_info;
+ int ret;
+
+ rpool = kzalloc(sizeof(*rpool), GFP_KERNEL);
+ if (!rpool) {
+ ret = -ENOMEM;
+ goto err;
+ }
+ rpool->resources = kcalloc(pool_info->table_len,
+ sizeof(*rpool->resources),
+ GFP_KERNEL);
+ if (!rpool->resources) {
+ ret = -ENOMEM;
+ goto alloc_err;
+ }
+
+ rpool->device = device;
+ rpool->cg = cg;
+ INIT_LIST_HEAD(&rpool->cg_list);
+ INIT_LIST_HEAD(&rpool->dev_list);
+ spin_lock_init(&device->rpool_lock);
+ set_all_resource_max_limit(rpool);
+
+ spin_lock(&cg->rpool_list_lock);
+
+ other_rpool = find_cg_rpool_locked(cg, device);
+
+ /*
+ * if other task added resource pool for this device for this cgroup
+ * than free up which was recently created and use the one we found.
+ */
+ if (other_rpool) {
+ spin_unlock(&cg->rpool_list_lock);
+ free_cg_rpool(rpool);
+ return 0;
+ }
+
+ list_add_tail(&rpool->cg_list, &cg->rpool_head);
+
+ spin_lock(&device->rpool_lock);
+ list_add_tail(&rpool->dev_list, &device->rpool_head);
+ spin_unlock(&device->rpool_lock);
+
+ spin_unlock(&cg->rpool_list_lock);
+ return 0;
+
+alloc_err:
+ kfree(rpool);
+err:
+ return ret;
+}
+
+/**
+ * uncharge_cg_resource - uncharge resource for rdma cgroup
+ * @cg: pointer to cg to uncharge and all parents in hierarchy
+ * @device: pointer to ib device
+ * @index: index of the resource to uncharge in cg (resource pool)
+ * @num: the number of rdma resource to uncharge
+ *
+ * It also frees the resource pool which was created as part of
+ * charging operation when there are no resources attached to
+ * resource pool.
+ */
+static void uncharge_cg_resource(struct rdma_cgroup *cg,
+ struct rdmacg_device *device,
+ int index, int num)
+{
+ struct rdmacg_resource_pool *rpool;
+ struct rdmacg_pool_info *pool_info = &device->pool_info;
+
+ spin_lock(&cg->rpool_list_lock);
+ rpool = find_cg_rpool_locked(cg, device);
+
+ /*
+ * rpool cannot be null at this stage. Let kernel operate in case
+ * if there a bug in IB stack or rdma controller,
+ * instead of crashing the system.
+ */
+ if (unlikely(!rpool)) {
+ spin_unlock(&cg->rpool_list_lock);
+ pr_warn("Invalid device %p or rdma cgroup %p\n", cg, device);
+ return;
+ }
+
+ rpool->resources[index].usage -= num;
+
+ /*
+ * A negative count (or overflow) is invalid,
+ * it indicates a bug in the rdma controller.
+ */
+ WARN_ON_ONCE(rpool->resources[index].usage < 0);
+ rpool->refcnt--;
+ if (rpool->refcnt == 0 && rpool->num_max_cnt == pool_info->table_len) {
+ /*
+ * No user of the rpool and all entries are set to max, so
+ * safe to delete this rpool.
+ */
+ list_del(&rpool->cg_list);
+ spin_unlock(&cg->rpool_list_lock);
+
+ free_cg_rpool(rpool);
+ } else {
+ spin_unlock(&cg->rpool_list_lock);
+ }
+}
+
+/**
+ * rdmacg_uncharge_resource - hierarchically uncharge rdma resource count
+ * @device: pointer to rdmacg device
+ * @index: index of the resource to uncharge in cg in given resource pool
+ * @num: the number of rdma resource to uncharge
+ *
+ */
+void rdmacg_uncharge(struct rdma_cgroup *cg,
+ struct rdmacg_device *device,
+ int index, int num)
+{
+ struct rdma_cgroup *p;
+
+ for (p = cg; p; p = parent_rdmacg(p))
+ uncharge_cg_resource(p, device, index, num);
+
+ css_put(&cg->css);
+}
+EXPORT_SYMBOL(rdmacg_uncharge);
+
+/**
+ * charge_cg_resource - charge resource for rdma cgroup
+ * @cg: pointer to cg to charge
+ * @device: pointer to rdmacg device
+ * @index: index of the resource to charge in cg (resource pool)
+ * @num: the number of rdma resource to charge
+ */
+static int charge_cg_resource(struct rdma_cgroup *cg,
+ struct rdmacg_device *device,
+ int index, int num)
+{
+ struct rdmacg_resource_pool *rpool;
+ s64 new;
+ int ret = 0;
+
+retry:
+ spin_lock(&cg->rpool_list_lock);
+ rpool = find_cg_rpool_locked(cg, device);
+ if (!rpool) {
+ spin_unlock(&cg->rpool_list_lock);
+ ret = alloc_cg_rpool(cg, device);
+ if (ret)
+ goto err;
+ else
+ goto retry;
+ }
+ new = num + rpool->resources[index].usage;
+ if (new > rpool->resources[index].max) {
+ ret = -EAGAIN;
+ } else {
+ rpool->refcnt++;
+ rpool->resources[index].usage = new;
+ }
+ spin_unlock(&cg->rpool_list_lock);
+err:
+ return ret;
+}
+
+/**
+ * rdmacg_try_charge_resource - hierarchically try to charge the rdma resource
+ * @device: pointer to rdmacg device
+ * @rdmacg: pointer to rdma cgroup which will own this resource
+ * @index: index of the resource to charge in cg (resource pool)
+ * @num: the number of rdma resource to charge
+ *
+ * This function follows charging resource in hierarchical way.
+ * It will fail if the charge would cause the new value to exceed the
+ * hierarchical limit.
+ * Returns 0 if the charge succeded, otherwise -EAGAIN, -ENOMEM or -EINVAL.
+ * Returns pointer to rdmacg for this resource.
+ *
+ * Charger needs to account resources on three criteria.
+ * (a) per cgroup & (b) per device resource usage.
+ * Per cgroup resource usage ensures that tasks of cgroup doesn't cross
+ * the configured limits.
+ * Per device provides granular configuration in multi device usage.
+ * It allocates resource pool in the hierarchy for each parent it come
+ * across for first resource. Later on resource pool will be available.
+ * Therefore it will be much faster thereon to charge/uncharge.
+ */
+int rdmacg_try_charge(struct rdma_cgroup **rdmacg,
+ struct rdmacg_device *device,
+ int index, int num)
+{
+ struct rdma_cgroup *cg, *p, *q;
+ int ret;
+
+ cg = task_rdmacg(current);
+
+ for (p = cg; p; p = parent_rdmacg(p)) {
+ ret = charge_cg_resource(p, device, index, num);
+ if (ret)
+ goto err;
+ }
+ /*
+ * hold on to css, as cgroup can be removed but resource
+ * accounting happens on css.
+ */
+ css_get(&cg->css);
+ *rdmacg = cg;
+ return 0;
+
+err:
+ for (q = cg; q != p; q = parent_rdmacg(q))
+ uncharge_cg_resource(q, device, index, num);
+ return ret;
+}
+EXPORT_SYMBOL(rdmacg_try_charge);
+
+/**
+ * rdmacg_register_rdmacg_device - register rdmacg device to rdma controller.
+ * @device: pointer to rdmacg device whose resources need to be accounted.
+ *
+ * If IB stack wish a device to participate in rdma cgroup resource
+ * tracking, it must invoke this API to register with rdma cgroup before
+ * any user space application can start using the RDMA resources.
+ * Returns 0 on success or EINVAL when table length given is beyond
+ * supported size.
+ */
+int rdmacg_register_device(struct rdmacg_device *device)
+{
+ if (device->pool_info.table_len > 64)
+ return -EINVAL;
+
+ INIT_LIST_HEAD(&device->rdmacg_list);
+ INIT_LIST_HEAD(&device->rpool_head);
+ spin_lock_init(&device->rpool_lock);
+
+ mutex_lock(&dev_mutex);
+ list_add_tail(&device->rdmacg_list, &dev_list_head);
+ mutex_unlock(&dev_mutex);
+ return 0;
+}
+EXPORT_SYMBOL(rdmacg_register_device);
+
+/**
+ * rdmacg_unregister_rdmacg_device - unregister the rdmacg device
+ * from rdma controller.
+ * @device: pointer to rdmacg device which was previously registered with rdma
+ * controller using rdmacg_register_device().
+ *
+ * IB stack must invoke this after all the resources of the IB device
+ * are destroyed and after ensuring that no more resources will be created
+ * when this API is invoked.
+ */
+void rdmacg_unregister_device(struct rdmacg_device *device)
+{
+ struct rdmacg_resource_pool *rpool, *tmp;
+ struct rdma_cgroup *cg;
+
+ /*
+ * Synchronize with any active resource settings,
+ * usage query happening via configfs.
+ * At this stage, there should not be any active resource pools
+ * for this device, as RDMA/IB stack is expected to shutdown,
+ * tear down all the applications and free up resources.
+ */
+ mutex_lock(&dev_mutex);
+ list_del_init(&device->rdmacg_list);
+ mutex_unlock(&dev_mutex);
+
+ /*
+ * Now that this device off the cgroup list, its safe to free
+ * all the rpool resources.
+ */
+ list_for_each_entry_safe(rpool, tmp, &device->rpool_head, dev_list) {
+ list_del_init(&rpool->dev_list);
+ cg = rpool->cg;
+
+ spin_lock(&cg->rpool_list_lock);
+ list_del_init(&rpool->cg_list);
+ spin_unlock(&cg->rpool_list_lock);
+
+ free_cg_rpool_mem(rpool);
+ }
+}
+EXPORT_SYMBOL(rdmacg_unregister_device);
+
+/**
+ * rdmacg_query_limit - query the resource limits that
+ * might have been configured by the user.
+ * @device: pointer to ib device
+ * @type: the type of resource pool to know the limits of.
+ * @limits: pointer to an array of limits where rdma cg will provide
+ * the configured limits of the cgroup.
+ *
+ * This function follows charging resource in hierarchical way.
+ * It will fail if the charge would cause the new value to exceed the
+ * hierarchical limit.
+ */
+void rdmacg_query_limit(struct rdmacg_device *device,
+ int *limits)
+{
+ struct rdma_cgroup *cg, *p;
+ struct rdmacg_resource_pool *rpool;
+ struct rdmacg_pool_info *pool_info;
+ int i;
+
+ cg = task_rdmacg(current);
+ pool_info = &device->pool_info;
+
+ for (i = 0; i < pool_info->table_len; i++)
+ limits[i] = S32_MAX;
+
+ /*
+ * Check in hirerchy which pool get the least amount of
+ * resource limits.
+ */
+ for (p = cg; p; p = parent_rdmacg(p)) {
+ spin_lock(&cg->rpool_list_lock);
+ rpool = find_cg_rpool_locked(cg, device);
+ if (rpool) {
+ for (i = 0; i < pool_info->table_len; i++)
+ limits[i] = min_t(int, limits[i],
+ rpool->resources[i].max);
+ }
+ spin_unlock(&cg->rpool_list_lock);
+ }
+}
+EXPORT_SYMBOL(rdmacg_query_limit);
+
+static int parse_resource(char *c, struct rdmacg_pool_info *pool_info,
+ int *intval)
+{
+ substring_t argstr;
+ const char **table = pool_info->resource_name_table;
+ char *name, *value = c;
+ size_t len;
+ int ret, i = 0;
+
+ name = strsep(&value, "=");
+ if (!name || !value)
+ return -EINVAL;
+
+ len = strlen(value);
+
+ for (i = 0; i < pool_info->table_len; i++) {
+ if (strcmp(table[i], name))
+ continue;
+
+ argstr.from = value;
+ argstr.to = value + len;
+
+ ret = match_int(&argstr, intval);
+ if (ret >= 0) {
+ if (*intval < 0)
+ break;
+ return i;
+ }
+ if (strncmp(value, RDMACG_MAX_STR, len) == 0) {
+ *intval = S32_MAX;
+ return i;
+ }
+ break;
+ }
+ return -EINVAL;
+}
+
+static int rdmacg_parse_limits(char *options,
+ struct rdmacg_pool_info *pool_info,
+ int *new_limits, u64 *enables)
+{
+ char *c;
+ int err = -EINVAL;
+
+ /* parse resource options */
+ while ((c = strsep(&options, " ")) != NULL) {
+ int index, intval;
+
+ index = parse_resource(c, pool_info, &intval);
+ if (index < 0)
+ goto err;
+
+ new_limits[index] = intval;
+ *enables |= BIT(index);
+ }
+ return 0;
+
+err:
+ return err;
+}
+
+static struct rdmacg_device *rdmacg_get_device_locked(const char *name)
+{
+ struct rdmacg_device *device;
+
+ list_for_each_entry(device, &dev_list_head, rdmacg_list)
+ if (!strcmp(name, device->name))
+ return device;
+
+ return NULL;
+}
+
+static ssize_t rdmacg_resource_set_max(struct kernfs_open_file *of,
+ char *buf, size_t nbytes, loff_t off)
+{
+ struct rdma_cgroup *cg = css_rdmacg(of_css(of));
+ const char *dev_name;
+ struct rdmacg_resource_pool *rpool;
+ struct rdmacg_device *device;
+ char *options = strstrip(buf);
+ struct rdmacg_pool_info *pool_info;
+ u64 enables = 0;
+ int *new_limits;
+ int i = 0, ret = 0;
+
+ /* extract the device name first */
+ dev_name = strsep(&options, " ");
+ if (!dev_name) {
+ ret = -EINVAL;
+ goto err;
+ }
+
+ /* acquire lock to synchronize with hot plug devices */
+ mutex_lock(&dev_mutex);
+
+ device = rdmacg_get_device_locked(dev_name);
+ if (!device) {
+ ret = -ENODEV;
+ goto parse_err;
+ }
+
+ pool_info = &device->pool_info;
+
+ new_limits = kcalloc(pool_info->table_len, sizeof(int), GFP_KERNEL);
+ if (!new_limits) {
+ ret = -ENOMEM;
+ goto parse_err;
+ }
+
+ ret = rdmacg_parse_limits(options, pool_info, new_limits, &enables);
+ if (ret)
+ goto opt_err;
+
+retry:
+ spin_lock(&cg->rpool_list_lock);
+ rpool = find_cg_rpool_locked(cg, device);
+ if (!rpool) {
+ spin_unlock(&cg->rpool_list_lock);
+ ret = alloc_cg_rpool(cg, device);
+ if (ret)
+ goto opt_err;
+ else
+ goto retry;
+ }
+
+ /* now set the new limits of the rpool */
+ while (enables) {
+ /* if user set the limit, enables bit is set */
+ if (enables & BIT(i)) {
+ enables &= ~BIT(i);
+ set_resource_limit(rpool, i, new_limits[i]);
+ }
+ i++;
+ }
+
+ if (rpool->refcnt == 0 && rpool->num_max_cnt == pool_info->table_len) {
+ /*
+ * No user of the rpool and all entries are set to max, so
+ * safe to delete this rpool.
+ */
+ list_del(&rpool->cg_list);
+ spin_unlock(&cg->rpool_list_lock);
+
+ free_cg_rpool(rpool);
+ } else {
+ spin_unlock(&cg->rpool_list_lock);
+ }
+
+opt_err:
+ kfree(new_limits);
+parse_err:
+ mutex_unlock(&dev_mutex);
+err:
+ return ret ?: nbytes;
+}
+
+static u32 *get_cg_rpool_values(struct rdma_cgroup *cg,
+ struct rdmacg_device *device,
+ enum rdmacg_file_type sf_type,
+ int count)
+{
+ struct rdmacg_resource_pool *rpool;
+ u32 *value_tbl;
+ int i, ret;
+
+ value_tbl = kcalloc(count, sizeof(u32), GFP_KERNEL);
+ if (!value_tbl) {
+ ret = -ENOMEM;
+ goto err;
+ }
+
+ spin_lock(&cg->rpool_list_lock);
+
+ rpool = find_cg_rpool_locked(cg, device);
+
+ for (i = 0; i < count; i++) {
+ if (sf_type == RDMACG_RESOURCE_MAX) {
+ if (rpool)
+ value_tbl[i] = rpool->resources[i].max;
+ else
+ value_tbl[i] = S32_MAX;
+ } else {
+ if (rpool)
+ value_tbl[i] = rpool->resources[i].usage;
+ }
+ }
+
+ spin_unlock(&cg->rpool_list_lock);
+
+ return value_tbl;
+
+err:
+ return ERR_PTR(ret);
+}
+
+static void print_rpool_values(struct seq_file *sf,
+ struct rdmacg_pool_info *pool_info,
+ u32 *value_tbl)
+{
+ int i;
+
+ for (i = 0; i < pool_info->table_len; i++) {
+ seq_puts(sf, pool_info->resource_name_table[i]);
+ seq_putc(sf, '=');
+ if (value_tbl[i] == S32_MAX)
+ seq_puts(sf, RDMACG_MAX_STR);
+ else
+ seq_printf(sf, "%d", value_tbl[i]);
+ seq_putc(sf, ' ');
+ }
+}
+
+static int rdmacg_resource_read(struct seq_file *sf, void *v)
+{
+ struct rdmacg_device *device;
+ struct rdma_cgroup *cg = css_rdmacg(seq_css(sf));
+ struct rdmacg_pool_info *pool_info;
+ u32 *value_tbl;
+ int ret = 0;
+
+ mutex_lock(&dev_mutex);
+
+ list_for_each_entry(device, &dev_list_head, rdmacg_list) {
+ pool_info = &device->pool_info;
+
+ /* get the value from resource pool */
+ value_tbl = get_cg_rpool_values(cg, device,
+ seq_cft(sf)->private,
+ pool_info->table_len);
+ if (IS_ERR_OR_NULL(value_tbl)) {
+ ret = -ENOMEM;
+ break;
+ }
+
+ seq_printf(sf, "%s ", device->name);
+ print_rpool_values(sf, pool_info, value_tbl);
+ seq_putc(sf, '\n');
+ kfree(value_tbl);
+ }
+
+ mutex_unlock(&dev_mutex);
+ return ret;
+}
+
+static struct cftype rdmacg_files[] = {
+ {
+ .name = "max",
+ .write = rdmacg_resource_set_max,
+ .seq_show = rdmacg_resource_read,
+ .private = RDMACG_RESOURCE_MAX,
+ .flags = CFTYPE_NOT_ON_ROOT,
+ },
+ {
+ .name = "current",
+ .seq_show = rdmacg_resource_read,
+ .private = RDMACG_RESOURCE_STAT,
+ .flags = CFTYPE_NOT_ON_ROOT,
+ },
+ { } /* terminate */
+};
+
+static struct cgroup_subsys_state *
+rdmacg_css_alloc(struct cgroup_subsys_state *parent)
+{
+ struct rdma_cgroup *cg;
+
+ cg = kzalloc(sizeof(*cg), GFP_KERNEL);
+ if (!cg)
+ return ERR_PTR(-ENOMEM);
+
+ INIT_LIST_HEAD(&cg->rpool_head);
+ spin_lock_init(&cg->rpool_list_lock);
+ return &cg->css;
+}
+
+static void rdmacg_css_free(struct cgroup_subsys_state *css)
+{
+ struct rdma_cgroup *cg = css_rdmacg(css);
+
+ kfree(cg);
+}
+
+/**
+ * rdmacg_css_offline - cgroup css_offline callback
+ * @css: css of interest
+ *
+ * This function is called when @css is about to go away and responsible
+ * for shooting down all rdmacg associated with @css. As part of that it
+ * marks all the resource pool entries to max value, so that when resources are
+ * uncharged, associated resource pool can be freed as well.
+ */
+static void rdmacg_css_offline(struct cgroup_subsys_state *css)
+{
+ struct rdma_cgroup *cg = css_rdmacg(css);
+ struct rdmacg_resource_pool *rpool;
+
+ spin_lock(&cg->rpool_list_lock);
+
+ list_for_each_entry(rpool, &cg->rpool_head, cg_list)
+ set_all_resource_max_limit(rpool);
+
+ spin_unlock(&cg->rpool_list_lock);
+}
+
+struct cgroup_subsys rdma_cgrp_subsys = {
+ .css_alloc = rdmacg_css_alloc,
+ .css_free = rdmacg_css_free,
+ .css_offline = rdmacg_css_offline,
+ .legacy_cftypes = rdmacg_files,
+ .dfl_cftypes = rdmacg_files,
+};
--
1.8.3.1
[toc] | [next] | [standalone]
| From | Tejun Heo <tj@kernel.org> |
|---|---|
| Date | 2016-03-02 18:50 +0100 |
| Message-ID | <r8j4l-2TR-1@gated-at.bofh.it> |
| In reply to | #1346893 |
Hello,
On Wed, Mar 02, 2016 at 12:35:35AM +0530, Parav Pandit wrote:
> diff --git a/include/linux/cgroup_rdma.h b/include/linux/cgroup_rdma.h
> new file mode 100644
> index 0000000..2da3d6c
> --- /dev/null
> +++ b/include/linux/cgroup_rdma.h
> @@ -0,0 +1,50 @@
> +#ifndef _CGROUP_RDMA_H
> +#define _CGROUP_RDMA_H
> +
> +#include <linux/cgroup.h>
> +
> +#ifdef CONFIG_CGROUP_RDMA
> +
> +struct rdma_cgroup {
> + struct cgroup_subsys_state css;
> +
> + spinlock_t rpool_list_lock; /* protects resource pool list */
> + struct list_head rpool_head; /* head to keep track of all resource
> + * pools that belongs to this cgroup.
> + */
I think we usually don't tail wing these comments.
> +};
> +
> +struct rdmacg_pool_info {
> + const char **resource_name_table;
> + int table_len;
Align fields consistently? I've said this multiple times now but
please make the available resources constant and document them in
Documentation/cgroup-v2.txt.
> +};
> +
> +struct rdmacg_device {
> + struct rdmacg_pool_info pool_info;
> + struct list_head rdmacg_list;
> + struct list_head rpool_head;
> + /* protects resource pool list */
> + spinlock_t rpool_lock;
> + char *name;
> +};
> +
> +/* APIs for RDMA/IB stack to publish when a device wants to
> + * participate in resource accounting
> + */
Please follow CodingStyle. Wasn't this pointed out a couple times
already?
> +enum rdmacg_file_type {
> + RDMACG_RESOURCE_MAX,
> + RDMACG_RESOURCE_STAT,
> +};
Heh, usually not a good sign. If you're using this to call into a
common function and then switch out on the file type, just switch out
at the method level and factor out common part into helpers.
> +/* resource tracker per resource for rdma cgroup */
> +struct rdmacg_resource {
> + int max;
> + int usage;
> +};
Align fields?
> +/**
The above indicates kerneldoc comments, which this isn't.
> + * resource pool object which represents, per cgroup, per device
> + * resources. There are multiple instance
> + * of this object per cgroup, therefore it cannot be embedded within
> + * rdma_cgroup structure. It is maintained as list.
Consistent paragraph fill?
> + */
> +struct rdmacg_resource_pool {
> + struct list_head cg_list;
> + struct list_head dev_list;
> +
> + struct rdmacg_device *device;
> + struct rdmacg_resource *resources;
> + struct rdma_cgroup *cg; /* owner cg used during device cleanup */
> +
> + int refcnt; /* count active user tasks of this pool */
> + int num_max_cnt; /* total number counts which are set to max */
> +};
Formatting.
> +static inline void set_resource_limit(struct rdmacg_resource_pool *rpool,
> + int index, int new_max)
Is inline necessary? Compiler can figure out these.
> +static struct rdmacg_resource_pool*
^
space
> +find_cg_rpool_locked(struct rdma_cgroup *cg,
> + struct rdmacg_device *device)
...
> +static void uncharge_cg_resource(struct rdma_cgroup *cg,
> + struct rdmacg_device *device,
> + int index, int num)
> +{
...
> + rpool->refcnt--;
> + if (rpool->refcnt == 0 && rpool->num_max_cnt == pool_info->table_len) {
If the caller charges 2 and then uncharges 1 two times, the refcnt
underflows? Why not just track how many usages are zero?
...
> +void rdmacg_uncharge(struct rdma_cgroup *cg,
> + struct rdmacg_device *device,
> + int index, int num)
> +{
> + struct rdma_cgroup *p;
> +
> + for (p = cg; p; p = parent_rdmacg(p))
> + uncharge_cg_resource(p, device, index, num);
> +
> + css_put(&cg->css);
> +}
> +EXPORT_SYMBOL(rdmacg_uncharge);
So, I suppose the code is trying to save lock contention with
fine-grained locking; however, as the code is currently structured,
it's just increasing the number of lock ops and it'd be highly likely
to cheaper to simply use a single lock. If you're working up the tree
grabbing lock at each level, per-node locking doesn't save you
anything. Also, it introduces conditions where charges are spuriously
denied when there are racing requestors. If scalability becomes an
issue, the right way to address is adding percpu front cache.
> +void rdmacg_query_limit(struct rdmacg_device *device,
> + int *limits)
> +{
> + struct rdma_cgroup *cg, *p;
> + struct rdmacg_resource_pool *rpool;
> + struct rdmacg_pool_info *pool_info;
> + int i;
> +
> + cg = task_rdmacg(current);
> + pool_info = &device->pool_info;
Nothing seems to prevent @cg from going away if this races with
@current being migrated to a different cgroup. Have you run this with
lockdep and rcu debugging enabled? This should have triggered a
warning.
...
> + for (p = cg; p; p = parent_rdmacg(p)) {
> + spin_lock(&cg->rpool_list_lock);
> + rpool = find_cg_rpool_locked(cg, device);
> + if (rpool) {
> + for (i = 0; i < pool_info->table_len; i++)
> + limits[i] = min_t(int, limits[i],
> + rpool->resources[i].max);
So, the O complexity wise, things like the above are pretty bad and
the above pattern is used in hot paths. I suppose there can only be a
handful of devices per system?
Thanks.
--
tejun
[toc] | [prev] | [next] | [standalone]
| From | Parav Pandit <pandit.parav@gmail.com> |
|---|---|
| Date | 2016-03-02 21:00 +0100 |
| Message-ID | <r8l6a-4lm-19@gated-at.bofh.it> |
| In reply to | #1348356 |
On Wed, Mar 2, 2016 at 11:09 PM, Tejun Heo <tj@kernel.org> wrote:
> Hello,
>
>> +struct rdma_cgroup {
>> + struct cgroup_subsys_state css;
>> +
>> + spinlock_t rpool_list_lock; /* protects resource pool list */
>> + struct list_head rpool_head; /* head to keep track of all resource
>> + * pools that belongs to this cgroup.
>> + */
>
> I think we usually don't tail wing these comments.
ok. I will put comments in separate line.
>
>> +};
>> +
>> +struct rdmacg_pool_info {
>> + const char **resource_name_table;
>> + int table_len;
>
> Align fields consistently? I've said this multiple times now but
> please make the available resources constant and document them in
> Documentation/cgroup-v2.txt.
o.k. I will align them.
o.k. I will document the resource constants defined by IB stack in
cgroup-v2.txt.
>> +
>> +/* APIs for RDMA/IB stack to publish when a device wants to
>> + * participate in resource accounting
>> + */
>
> Please follow CodingStyle. Wasn't this pointed out a couple times
> already?
Yes. You did. I fixed at few places. I missed this out. Sorry. I am doing now.
>
>> +enum rdmacg_file_type {
>> + RDMACG_RESOURCE_MAX,
>> + RDMACG_RESOURCE_STAT,
>> +};
>
> Heh, usually not a good sign. If you're using this to call into a
> common function and then switch out on the file type, just switch out
> at the method level and factor out common part into helpers.
>
Methods for both the constants are same. Code changes between two file
type is hardly 4 lines of code.
So there is no need of additional helper functions.
So in currently defined functions rdmacg_resource_read() and
rdmacg_resource_set_max() works on file type.
>> +/* resource tracker per resource for rdma cgroup */
>> +struct rdmacg_resource {
>> + int max;
>> + int usage;
>> +};
>
> Align fields?
Above one seems to be aligned. Not sure what am I missing.
I am aligning all the structures anyways.
>
>> +/**
>
> The above indicates kerneldoc comments, which this isn't.
Fixed for this comment.
>
>> + * resource pool object which represents, per cgroup, per device
>> + * resources. There are multiple instance
>> + * of this object per cgroup, therefore it cannot be embedded within
>> + * rdma_cgroup structure. It is maintained as list.
>
> Consistent paragraph fill?
Fixed.
>
>> + */
>> +struct rdmacg_resource_pool {
>> + struct list_head cg_list;
>> + struct list_head dev_list;
>> +
>> + struct rdmacg_device *device;
>> + struct rdmacg_resource *resources;
>> + struct rdma_cgroup *cg; /* owner cg used during device cleanup */
>> +
>> + int refcnt; /* count active user tasks of this pool */
>> + int num_max_cnt; /* total number counts which are set to max */
>> +};
>
> Formatting.
Aligning all the fields now in next patch.
>
>> +static inline void set_resource_limit(struct rdmacg_resource_pool *rpool,
>> + int index, int new_max)
>
> Is inline necessary? Compiler can figure out these.
Yes. Removed.
>
>> +static struct rdmacg_resource_pool*
> ^
> space
>
>> +find_cg_rpool_locked(struct rdma_cgroup *cg,
>> + struct rdmacg_device *device)
> ...
>> +static void uncharge_cg_resource(struct rdma_cgroup *cg,
>> + struct rdmacg_device *device,
>> + int index, int num)
>> +{
> ...
>> + rpool->refcnt--;
>> + if (rpool->refcnt == 0 && rpool->num_max_cnt == pool_info->table_len) {
>
> If the caller charges 2 and then uncharges 1 two times, the refcnt
> underflows? Why not just track how many usages are zero?
>
This is certainly must fix bug. Changed refcnt to usage_sum and changed to do
usage_sum -= num during uncharging
and
usage_sum += num during charing.
> ...
>> +void rdmacg_uncharge(struct rdma_cgroup *cg,
>> + struct rdmacg_device *device,
>> + int index, int num)
>> +{
>> + struct rdma_cgroup *p;
>> +
>> + for (p = cg; p; p = parent_rdmacg(p))
>> + uncharge_cg_resource(p, device, index, num);
>> +
>> + css_put(&cg->css);
>> +}
>> +EXPORT_SYMBOL(rdmacg_uncharge);
>
> So, I suppose the code is trying to save lock contention with
> fine-grained locking;
Yes.
> however, as the code is currently structured,
> it's just increasing the number of lock ops and it'd be highly likely
> to cheaper to simply use a single lock.
Single lock per subsystem? I understood that you were ok to have per
cgroup fine grain lock.
> If you're working up the tree
> grabbing lock at each level, per-node locking doesn't save you
> anything. Also, it introduces conditions where charges are spuriously
> denied when there are racing requestors. If scalability becomes an
> issue, the right way to address is adding percpu front cache.
>
>> +void rdmacg_query_limit(struct rdmacg_device *device,
>> + int *limits)
>> +{
>> + struct rdma_cgroup *cg, *p;
>> + struct rdmacg_resource_pool *rpool;
>> + struct rdmacg_pool_info *pool_info;
>> + int i;
>> +
>> + cg = task_rdmacg(current);
>> + pool_info = &device->pool_info;
>
> Nothing seems to prevent @cg from going away if this races with
> @current being migrated to a different cgroup. Have you run this with
> lockdep and rcu debugging enabled? This should have triggered a
> warning.
No. debugging was disabled. I will enable and run.
Help me little to understand,
Even if above function races with migration, do you mean cg can be
freed before css_get is executed?
If yes, than I guess I need subsystem level lock under which I need to
perform css_get()?
If not, whatever cg was returned, that should be ok as long as cg
reference is hold.
May be I am missing something here.
>
> ...
>> + for (p = cg; p; p = parent_rdmacg(p)) {
>> + spin_lock(&cg->rpool_list_lock);
>> + rpool = find_cg_rpool_locked(cg, device);
>> + if (rpool) {
>> + for (i = 0; i < pool_info->table_len; i++)
>> + limits[i] = min_t(int, limits[i],
>> + rpool->resources[i].max);
>
> So, the O complexity wise, things like the above are pretty bad and
> the above pattern is used in hot paths.
No. Its hot path. Typically applications do query configuration once
is their life cycle and allocate resources more often.
> I suppose there can only be a handful of devices per system?
Right. I have described that in the document as well. Typically there
are 1 to 4 devices in system and since the lock is per cgroup, though
this loop appears to be heavy on O complexity wise, its not that bad.
Hierarchical limit honoring is anyway default behavior we are adhering to.
>
> Thanks.
>
> --
> tejun
[toc] | [prev] | [next] | [standalone]
| From | Parav Pandit <pandit.parav@gmail.com> |
|---|---|
| Date | 2016-03-03 03:50 +0100 |
| Message-ID | <r8ruV-ms-5@gated-at.bofh.it> |
| In reply to | #1348436 |
Hi Tejun, Haggai,
On Thu, Mar 3, 2016 at 1:28 AM, Parav Pandit <pandit.parav@gmail.com> wrote:
>>> + rpool->refcnt--;
>>> + if (rpool->refcnt == 0 && rpool->num_max_cnt == pool_info->table_len) {
>>
>> If the caller charges 2 and then uncharges 1 two times, the refcnt
>> underflows? Why not just track how many usages are zero?
>>
> This is certainly must fix bug. Changed refcnt to usage_sum and changed to do
> usage_sum -= num during uncharging
> and
> usage_sum += num during charing.
This is not sufficient as css_get() and put are done only once per
call, which leads to similar problem as of refcnt.
As I think more, I realised that this particular test is missing that
resulted in this related bug, I realize that we don't have use case to
have "num" field from the IB stack side.
For bulk free IB stack will have to keep track of different or same
rdmacg returned values to call uncharge() with right number of
resources, all of that complexity just doesn't make sense and not
required.
So as first step to further simplify this, I am removing "num" input
field from charge and uncharge API.
[toc] | [prev] | [next] | [standalone]
| From | Parav Pandit <pandit.parav@gmail.com> |
|---|---|
| Date | 2016-03-03 04:20 +0100 |
| Message-ID | <r8rXZ-Ry-29@gated-at.bofh.it> |
| In reply to | #1348436 |
On Thu, Mar 3, 2016 at 1:28 AM, Parav Pandit <pandit.parav@gmail.com> wrote: > On Wed, Mar 2, 2016 at 11:09 PM, Tejun Heo <tj@kernel.org> wrote: >> Nothing seems to prevent @cg from going away if this races with >> @current being migrated to a different cgroup. Have you run this with >> lockdep and rcu debugging enabled? This should have triggered a >> warning. I am able to reproduce this race. Looking into how to address it.
[toc] | [prev] | [next] | [standalone]
| From | Parav Pandit <pandit.parav@gmail.com> |
|---|---|
| Date | 2016-03-03 09:40 +0100 |
| Message-ID | <r8wXG-4lu-41@gated-at.bofh.it> |
| In reply to | #1348735 |
On Thu, Mar 3, 2016 at 1:44 PM, Haggai Eran <haggaie@mellanox.com> wrote: > On 03/03/2016 05:18, Parav Pandit wrote: >> On Thu, Mar 3, 2016 at 1:28 AM, Parav Pandit <pandit.parav@gmail.com> wrote: >>> On Wed, Mar 2, 2016 at 11:09 PM, Tejun Heo <tj@kernel.org> wrote: >>>> Nothing seems to prevent @cg from going away if this races with >>>> @current being migrated to a different cgroup. Have you run this with >>>> lockdep and rcu debugging enabled? This should have triggered a >>>> warning. >> I am able to reproduce this race. Looking into how to address it. > > If I understand correctly, task_css() requires rcu read lock being held. > Is task_get_css() suitable here? Yes. Its suitable if we continue with newer API to drop "num" entries. Or I will have make minor modification to support that in cgroup.h. There is no variation as task_get_css_many, but its minor change anyway. I saw slept off yesterday night, saw today morning. Will test over weekend and wait for Tejun's opinion if there is any.
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web