Revert "cgroup: Make operations on the cgroup root_list RCU safe"

This reverts commit dd9542a which is
commit d23b5c5 upstream.

It breaks the Android kernel abi and can be brought back in the future
in an abi-safe way if it is really needed.

Bug: 161946584
Change-Id: Ia7245694cbdf47e4bf9410f21ff4676f2f5ac528
Signed-off-by: Greg Kroah-Hartman <[email protected]>

Author: gregkh

include/linux/cgroup-defs.h

@@ -575,7 +575,6 @@ struct cgroup_root {
 
 	/* A list running through the active hierarchies */
 	struct list_head root_list;
-	struct rcu_head rcu;
 
 	/* Hierarchy-specific flags */
 	unsigned int flags;

kernel/cgroup/cgroup-internal.h

@@ -170,8 +170,7 @@ extern struct list_head cgroup_roots;
 
 /* iterate across the hierarchies */
 #define for_each_root(root)						\
-	list_for_each_entry_rcu((root), &cgroup_roots, root_list,	\
-				lockdep_is_held(&cgroup_mutex))
+	list_for_each_entry((root), &cgroup_roots, root_list)
 
 /**
  * for_each_subsys - iterate all enabled cgroup subsystems

kernel/cgroup/cgroup.c

@@ -1317,7 +1317,7 @@ static void cgroup_exit_root_id(struct cgroup_root *root)
 
 void cgroup_free_root(struct cgroup_root *root)
 {
-	kfree_rcu(root, rcu);
+	kfree(root);
 }
 
 static void cgroup_destroy_root(struct cgroup_root *root)
@@ -1350,7 +1350,7 @@ static void cgroup_destroy_root(struct cgroup_root *root)
 	spin_unlock_irq(&css_set_lock);
 
 	if (!list_empty(&root->root_list)) {
-		list_del_rcu(&root->root_list);
+		list_del(&root->root_list);
 		cgroup_root_count--;
 	}
 
@@ -1390,15 +1390,7 @@ static inline struct cgroup *__cset_cgroup_from_root(struct css_set *cset,
 		}
 	}
 
-	/*
-	 * If cgroup_mutex is not held, the cgrp_cset_link will be freed
-	 * before we remove the cgroup root from the root_list. Consequently,
-	 * when accessing a cgroup root, the cset_link may have already been
-	 * freed, resulting in a NULL res_cgroup. However, by holding the
-	 * cgroup_mutex, we ensure that res_cgroup can't be NULL.
-	 * If we don't hold cgroup_mutex in the caller, we must do the NULL
-	 * check.
-	 */
+	BUG_ON(!res_cgroup);
 	return res_cgroup;
 }
 
@@ -1457,16 +1449,15 @@ static struct cgroup *current_cgns_cgroup_dfl(void)
 static struct cgroup *cset_cgroup_from_root(struct css_set *cset,
 					    struct cgroup_root *root)
 {
+	lockdep_assert_held(&cgroup_mutex);
 	lockdep_assert_held(&css_set_lock);
 
 	return __cset_cgroup_from_root(cset, root);
 }
 
 /*
  * Return the cgroup for "task" from the given hierarchy. Must be
- * called with css_set_lock held to prevent task's groups from being modified.
- * Must be called with either cgroup_mutex or rcu read lock to prevent the
- * cgroup root from being destroyed.
+ * called with cgroup_mutex and css_set_lock held.
  */
 struct cgroup *task_cgroup_from_root(struct task_struct *task,
 				     struct cgroup_root *root)
@@ -2027,7 +2018,7 @@ void init_cgroup_root(struct cgroup_fs_context *ctx)
 	struct cgroup_root *root = ctx->root;
 	struct cgroup *cgrp = &root->cgrp;
 
-	INIT_LIST_HEAD_RCU(&root->root_list);
+	INIT_LIST_HEAD(&root->root_list);
 	atomic_set(&root->nr_cgrps, 1);
 	cgrp->root = root;
 	init_cgroup_housekeeping(cgrp);
@@ -2110,7 +2101,7 @@ int cgroup_setup_root(struct cgroup_root *root, u16 ss_mask)
 	 * care of subsystems' refcounts, which are explicitly dropped in
 	 * the failure exit path.
 	 */
-	list_add_rcu(&root->root_list, &cgroup_roots);
+	list_add(&root->root_list, &cgroup_roots);
 	cgroup_root_count++;
 
 	/*