Add callbacks to allocate and free instances of the controller as the
hierarchy of resource groups is modified.
Signed-off-by: Balbir Singh <[email protected]>
---
kernel/res_group/memctlr.c | 58 ++++++++++++++++++++++++++++++++++++++++++---
1 file changed, 55 insertions(+), 3 deletions(-)
diff -puN kernel/res_group/memctlr.c~container-memctlr-callbacks kernel/res_group/memctlr.c
--- linux-2.6.19-rc2/kernel/res_group/memctlr.c~container-memctlr-callbacks 2006-11-09 21:42:35.000000000 +0530
+++ linux-2.6.19-rc2-balbir/kernel/res_group/memctlr.c 2006-11-09 21:42:35.000000000 +0530
@@ -34,6 +34,8 @@
static const char res_ctlr_name[] = "memctlr";
static struct resource_group *root_rgroup;
+static const char version[] = "0.01";
+static struct memctlr *memctlr_root;
struct mem_counter {
atomic_long_t rss;
@@ -64,14 +66,64 @@ static struct memctlr *get_memctlr(struc
&memctlr_rg));
}
+static void memctlr_init_new(struct memctlr *res)
+{
+ res->shares.min_shares = SHARE_DONT_CARE;
+ res->shares.max_shares = SHARE_DONT_CARE;
+ res->shares.child_shares_divisor = SHARE_DEFAULT_DIVISOR;
+ res->shares.unused_min_shares = SHARE_DEFAULT_DIVISOR;
+}
+
+static struct res_shares *memctlr_alloc_instance(struct resource_group *rgroup)
+{
+ struct memctlr *res;
+
+ res = kzalloc(sizeof(struct memctlr), GFP_KERNEL);
+ if (!res)
+ return NULL;
+ res->rgroup = rgroup;
+ memctlr_init_new(res);
+ if (is_res_group_root(rgroup)) {
+ root_rgroup = rgroup;
+ memctlr_root = res;
+ printk("Memory Controller version %s\n", version);
+ }
+ return &res->shares;
+}
+
+static void memctlr_free_instance(struct res_shares *shares)
+{
+ struct memctlr *res, *parres;
+
+ res = get_memctlr_from_shares(shares);
+ BUG_ON(!res);
+ /*
+ * Containers do not allow removal of groups that have tasks
+ * associated with them. To free a container, it must be empty.
+ * Handle transfer of charges in the move_task notification
+ */
+ kfree(res);
+}
+
+static ssize_t memctlr_show_stats(struct res_shares *shares, char *buf,
+ size_t len)
+{
+ int i = 0;
+
+ i += snprintf(buf, len, "Accounting will be added soon\n");
+ buf += i;
+ len -= i;
+ return i;
+}
+
struct res_controller memctlr_rg = {
.name = res_ctlr_name,
.ctlr_id = NO_RES_ID,
- .alloc_shares_struct = NULL,
- .free_shares_struct = NULL,
+ .alloc_shares_struct = memctlr_alloc_instance,
+ .free_shares_struct = memctlr_free_instance,
.move_task = NULL,
.shares_changed = NULL,
- .show_stats = NULL,
+ .show_stats = memctlr_show_stats,
};
int __init memctlr_init(void)
_
--
Balbir Singh,
Linux Technology Center,
IBM Software Labs
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
