From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753007AbdGRV5x (ORCPT ); Tue, 18 Jul 2017 17:57:53 -0400 Received: from mail-qk0-f195.google.com ([209.85.220.195]:33627 "EHLO mail-qk0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752901AbdGRV5v (ORCPT ); Tue, 18 Jul 2017 17:57:51 -0400 Date: Tue, 18 Jul 2017 17:57:46 -0400 From: Tejun Heo To: Waiman Long Cc: Li Zefan , Johannes Weiner , cgroups@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH cgroup/for-4.13-fixes] cgroup: create dfl_root files on subsys registration Message-ID: <20170718215746.GG3365493@devbig577.frc2.facebook.com> References: <1500406336-29512-1-git-send-email-longman@redhat.com> <20170718195148.GC3365493@devbig577.frc2.facebook.com> <539870d2-8b85-2f54-61bd-4ba068e75ce0@redhat.com> <20170718201229.GD3365493@devbig577.frc2.facebook.com> <255cc198-2c10-af76-98ca-086807d11540@redhat.com> <20170718205009.GE3365493@devbig577.frc2.facebook.com> <20170718210658.GF3365493@devbig577.frc2.facebook.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170718210658.GF3365493@devbig577.frc2.facebook.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On subsystem registration, css_populate_dir() is not called on the new root css, so the interface files for the subsystem on cgrp_dfl_root aren't created on registration. This is a residue from the days when cgrp_dfl_root was used only as the parking spot for unused subsystems, which no longer is true as it's used as the root for cgroup2. This is often fine as later operations tend to create them as a part of mount (cgroup1) or subtree_control operations (cgroup2); however, it's not difficult to mount cgroup2 with the controller interface files missing as Waiman found out. Fix it by invoking css_populate_dir() on the root css on subsys registration. Signed-off-by: Tejun Heo Reported-by: Waiman Long Cc: stable@vger.kernel.org # v4.5+ --- Hello, Waiman. Can you please verify that this fixes the bug? Thanks. kernel/cgroup/cgroup.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c index 620794a..9d33108 100644 --- a/kernel/cgroup/cgroup.c +++ b/kernel/cgroup/cgroup.c @@ -4669,6 +4669,10 @@ int __init cgroup_init(void) if (ss->bind) ss->bind(init_css_set.subsys[ssid]); + + mutex_lock(&cgroup_mutex); + css_populate_dir(init_css_set.subsys[ssid]); + mutex_unlock(&cgroup_mutex); } /* init_css_set.subsys[] has been updated, re-hash */