[PATCH 1.5/4] cgroup: delay populate css id

[KAMEZAWA Hiroyuki]

On Tue, 20 Jan 2009 11:58:32 +0900
KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx> wrote:
> > +               if (ss->use_id)
> > +                       if (alloc_css_id(ss, parent, cgrp))
> > +                               goto err_destroy;
> > +               /* At error, ->destroy() callback has to free assigned ID. */
> >        }
> 
> Should I delay to set css_id->css pointer to valid value until the end of
> populate() ? (add populage_css_id() call after cgroup_populate_dir()).
> 
> I'd like to write add-on patch to the patch [1/4]. (or update it.)
> css_id->css == NULL case is handled now, anyway.
> 

How about this ?
==
From: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx>

When CSS ID is attached, it's not guaranteed that the cgroup will
be finally populated out. (some failure in create())

But, scan by CSS ID can find CSS which is not fully initialized.
This patch tries to prevent that by delaying to fill id->css pointer.

Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx>
---
 kernel/cgroup.c |   22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

Index: mmotm-2.6.29-Jan16/kernel/cgroup.c
===================================================================
--- mmotm-2.6.29-Jan16.orig/kernel/cgroup.c
+++ mmotm-2.6.29-Jan16/kernel/cgroup.c
@@ -569,6 +569,7 @@ static struct backing_dev_info cgroup_ba
 	.capabilities	= BDI_CAP_NO_ACCT_AND_WRITEBACK,
 };
 
+static void populate_css_id(struct cgroup_subsys_state *id);
 static int alloc_css_id(struct cgroup_subsys *ss,
 			struct cgroup *parent, struct cgroup *child);
 
@@ -2329,6 +2330,12 @@ static int cgroup_populate_dir(struct cg
 		if (ss->populate && (err = ss->populate(ss, cgrp)) < 0)
 			return err;
 	}
+	/* This cgroup is ready now */
+	for_each_subsys(cgrp->root, ss) {
+		struct cgroup_subsys_state *css = cgrp->subsys[ss->subsys_id];
+		if (ss->use_id)
+			populate_css_id(css);
+	}
 
 	return 0;
 }
@@ -3252,8 +3259,9 @@ __setup("cgroup_disable=", cgroup_disabl
  */
 struct css_id {
 	/*
-	 * The css to which this ID points. If cgroup is removed, this will
-	 * be NULL. This pointer is expected to be RCU-safe because destroy()
+	 * The css to which this ID points. This pointer is set to valid value
+	 * after cgroup is populated. If cgroup is removed, this will be NULL.
+	 * This pointer is expected to be RCU-safe because destroy()
 	 * is called after synchronize_rcu(). But for safe use, css_is_removed()
 	 * css_tryget() should be used for avoiding race.
 	 */
@@ -3401,6 +3409,13 @@ static int __init cgroup_subsys_init_idr
 	return 0;
 }
 
+static void populate_css_id(struct cgroup_subsys_state *css)
+{
+	struct css_id *id = rcu_dereference(css->id);
+	if (id)
+		rcu_assign_pointer(id->css, css);
+}
+
 static int alloc_css_id(struct cgroup_subsys *ss, struct cgroup *parent,
 			struct cgroup *child)
 {
@@ -3421,8 +3436,7 @@ static int alloc_css_id(struct cgroup_su
 	for (i = 0; i < depth; i++)
 		child_id->stack[i] = parent_id->stack[i];
 	child_id->stack[depth] = child_id->id;
-
-	rcu_assign_pointer(child_id->css, child_css);
+	/* child_id->css pointer will be set after this cgroup is available */
 	rcu_assign_pointer(child_css->id, child_id);
 
 	return 0;

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/