Merge branch 'for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup

Pull cgroup changes from Tejun Heo:
 "Mostly changes to get the v2 interface ready.  The core features are
  mostly ready now and I think it's reasonable to expect to drop the
  devel mask in one or two devel cycles at least for a subset of
  controllers.

   - cgroup added a controller dependency mechanism so that block cgroup
     can depend on memory cgroup.  This will be used to finally support
     IO provisioning on the writeback traffic, which is currently being
     implemented.

   - The v2 interface now uses a separate table so that the interface
     files for the new interface are explicitly declared in one place.
     Each controller will explicitly review and add the files for the
     new interface.

   - cpuset is getting ready for the hierarchical behavior which is in
     the similar style with other controllers so that an ancestor's
     configuration change doesn't change the descendants' configurations
     irreversibly and processes aren't silently migrated when a CPU or
     node goes down.

  All the changes are to the new interface and no behavior changed for
  the multiple hierarchies"

* 'for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup: (29 commits)
  cpuset: fix the WARN_ON() in update_nodemasks_hier()
  cgroup: initialize cgrp_dfl_root_inhibit_ss_mask from !->dfl_files test
  cgroup: make CFTYPE_ONLY_ON_DFL and CFTYPE_NO_ internal to cgroup core
  cgroup: distinguish the default and legacy hierarchies when handling cftypes
  cgroup: replace cgroup_add_cftypes() with cgroup_add_legacy_cftypes()
  cgroup: rename cgroup_subsys->base_cftypes to ->legacy_cftypes
  cgroup: split cgroup_base_files[] into cgroup_{dfl|legacy}_base_files[]
  cpuset: export effective masks to userspace
  cpuset: allow writing offlined masks to cpuset.cpus/mems
  cpuset: enable onlined cpu/node in effective masks
  cpuset: refactor cpuset_hotplug_update_tasks()
  cpuset: make cs->{cpus, mems}_allowed as user-configured masks
  cpuset: apply cs->effective_{cpus,mems}
  cpuset: initialize top_cpuset's configured masks at mount
  cpuset: use effective cpumask to build sched domains
  cpuset: inherit ancestor's masks if effective_{cpus, mems} becomes empty
  cpuset: update cs->effective_{cpus, mems} when config changes
  cpuset: update cpuset->effective_{cpus,mems} at hotplug
  cpuset: add cs->effective_cpus and cs->effective_mems
  cgroup: clean up sane_behavior handling
  ...

2 files changed, 14 insertions, 5 deletions

diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c
index 28d227c5ca77..e17da947f6bd 100644
--- a/block/blk-cgroup.c
+++ b/block/blk-cgroup.c
@@ -928,7 +928,15 @@ struct cgroup_subsys blkio_cgrp_subsys = {
         .css_offline = blkcg_css_offline,
         .css_free = blkcg_css_free,
         .can_attach = blkcg_can_attach,
-        .base_cftypes = blkcg_files,
+        .legacy_cftypes = blkcg_files,
+#ifdef CONFIG_MEMCG
+        /*
+         * This ensures that, if available, memcg is automatically enabled
+         * together on the default hierarchy so that the owner cgroup can
+         * be retrieved from writeback pages.
+         */
+        .depends_on = 1 << memory_cgrp_id,
+#endif
 };
 EXPORT_SYMBOL_GPL(blkio_cgrp_subsys);
 
@@ -1120,7 +1128,8 @@ int blkcg_policy_register(struct blkcg_policy *pol)
 
         /* everything is in place, add intf files for the new policy */
         if (pol->cftypes)
-                WARN_ON(cgroup_add_cftypes(&blkio_cgrp_subsys, pol->cftypes));
+                WARN_ON(cgroup_add_legacy_cftypes(&blkio_cgrp_subsys,
+                                                  pol->cftypes));
         ret = 0;
 out_unlock:
         mutex_unlock(&blkcg_pol_mutex);
diff --git a/block/blk-throttle.c b/block/blk-throttle.c
index 3fdb21a390c1..9273d0969ebd 100644
--- a/block/blk-throttle.c
+++ b/block/blk-throttle.c
@@ -412,13 +412,13 @@ static void throtl_pd_init(struct blkcg_gq *blkg)
         int rw;
 
         /*
-         * If sane_hierarchy is enabled, we switch to properly hierarchical
+         * If on the default hierarchy, we switch to properly hierarchical
          * behavior where limits on a given throtl_grp are applied to the
          * whole subtree rather than just the group itself.  e.g. If 16M
          * read_bps limit is set on the root group, the whole system can't
          * exceed 16M for the device.
          *
-         * If sane_hierarchy is not enabled, the broken flat hierarchy
+         * If not on the default hierarchy, the broken flat hierarchy
          * behavior is retained where all throtl_grps are treated as if
          * they're all separate root groups right below throtl_data.
          * Limits of a group don't interact with limits of other groups
@@ -426,7 +426,7 @@ static void throtl_pd_init(struct blkcg_gq *blkg)
          */
         parent_sq = &td->service_queue;
 
-        if (cgroup_sane_behavior(blkg->blkcg->css.cgroup) && blkg->parent)
+        if (cgroup_on_dfl(blkg->blkcg->css.cgroup) && blkg->parent)
                 parent_sq = &blkg_to_tg(blkg->parent)->service_queue;
 
         throtl_service_queue_init(&tg->service_queue, parent_sq);