From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 59697C433E9 for ; Tue, 9 Feb 2021 16:33:39 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id DEA9E64EC4 for ; Tue, 9 Feb 2021 16:33:38 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DEA9E64EC4 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=cmpxchg.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 2BACD6B0072; Tue, 9 Feb 2021 11:33:35 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 23F356B0073; Tue, 9 Feb 2021 11:33:35 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0E11C8D0001; Tue, 9 Feb 2021 11:33:34 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0123.hostedemail.com [216.40.44.123]) by kanga.kvack.org (Postfix) with ESMTP id E11836B0072 for ; Tue, 9 Feb 2021 11:33:34 -0500 (EST) Received: from smtpin05.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id A7E0BA765 for ; Tue, 9 Feb 2021 16:33:34 +0000 (UTC) X-FDA: 77799275148.05.net83_1f0367227608 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin05.hostedemail.com (Postfix) with ESMTP id 969EA18045C05 for ; Tue, 9 Feb 2021 16:33:34 +0000 (UTC) X-HE-Tag: net83_1f0367227608 X-Filterd-Recvd-Size: 8142 Received: from mail-qk1-f169.google.com (mail-qk1-f169.google.com [209.85.222.169]) by imf45.hostedemail.com (Postfix) with ESMTP for ; Tue, 9 Feb 2021 16:33:33 +0000 (UTC) Received: by mail-qk1-f169.google.com with SMTP id t63so18562039qkc.1 for ; Tue, 09 Feb 2021 08:33:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cmpxchg-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zoxwI0nES4Hx21nz5hFrVEbR6q3U+ATuwnBq1WqiBSo=; b=JEGh5aBSlUc0YLYixdyqw/xzahcK0uaeG+hw0TEsjqKFTzzP36AoxgqEAzDplt7L/b R53iTdq/RKxEVr8FlOQ8XJHKLxlTMaibaWRJQrenVN4v4vaMQcRym6aQrZKrgsPL4kOt Z+URDgU5QK7aVX9Z7dT+nN2cE8xRzlG9/G+DQ2J8hAPRJK5gpr2aGEaXvkOWog8VshxB 4lvjUPXBafPUauCZQIUGTFIzC/0cAcmsqZQxeDpWCimO9dW/RrKYwSGWvI3pkPdx6jiY 9c9zvViQ4Mqc6lYUujzhyfmcaNROIYI00xvnIQq8rEOVu6ZyeAXrmdyP7AelOVgQRr2U +N0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zoxwI0nES4Hx21nz5hFrVEbR6q3U+ATuwnBq1WqiBSo=; b=WLcoHy2msMl3zTe7yv1C4YVJzhx52l2pZjViTbd+8SgWCE9R0Cg54ZvCSUOAut9diR 8vwAabvpFoMCkuCgiUQfjLdo+eltx3sP9ta5wGkvHeanWI+J8eqGIudTdKbl8/GdNuOM 6m6qhEyFQh064rOzozYk0ljthJ8gkDxxfZV793ZXBu4MDv+GVTMUeRS/kEG4PLGPAz5v RFBq3lIvG+dhwLmbxFJ1CPsah5EoQNfv3hmaHJ1fDxKb3sTLB4Rcuch47rebaHbCZzuJ LSeY6hzlDw5M7nUkXyg0ue2Y5DpbvVzTZ3/BguN9pdIwByA76fQuWLh56X4CDdwBvyYo V2ng== X-Gm-Message-State: AOAM533rR/4gYgGr7W0zSHEybABiXPom38KpYGBUdsYdfx3vppFxJQeF f+o1UlxumLNInRTXoq0gOc7rrg== X-Google-Smtp-Source: ABdhPJxtbFicxB3FjhdFv+V5RyYR98K5+Ha4zIdUItu9q0SOHyIbyp1J/nc3TIB9gazSI+gagzpJ2w== X-Received: by 2002:a37:a9d6:: with SMTP id s205mr23278961qke.162.1612888412871; Tue, 09 Feb 2021 08:33:32 -0800 (PST) Received: from localhost (70.44.39.90.res-cmts.bus.ptd.net. [70.44.39.90]) by smtp.gmail.com with ESMTPSA id 82sm2310585qkd.48.2021.02.09.08.33.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Feb 2021 08:33:32 -0800 (PST) From: Johannes Weiner To: Andrew Morton Cc: Tejun Heo , Michal Hocko , Roman Gushchin , Shakeel Butt , linux-mm@kvack.org, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-team@fb.com Subject: [PATCH v3 4/8] cgroup: rstat: support cgroup1 Date: Tue, 9 Feb 2021 11:33:00 -0500 Message-Id: <20210209163304.77088-5-hannes@cmpxchg.org> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210209163304.77088-1-hannes@cmpxchg.org> References: <20210209163304.77088-1-hannes@cmpxchg.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Rstat currently only supports the default hierarchy in cgroup2. In order to replace memcg's private stats infrastructure - used in both cgroup1 and cgroup2 - with rstat, the latter needs to support cgroup1. The initialization and destruction callbacks for regular cgroups are already in place. Remove the cgroup_on_dfl() guards to handle cgroup1. The initialization of the root cgroup is currently hardcoded to only handle cgrp_dfl_root.cgrp. Move those callbacks to cgroup_setup_root() and cgroup_destroy_root() to handle the default root as well as the various cgroup1 roots we may set up during mounting. The linking of css to cgroups happens in code shared between cgroup1 and cgroup2 as well. Simply remove the cgroup_on_dfl() guard. Linkage of the root css to the root cgroup is a bit trickier: per default, the root css of a subsystem controller belongs to the default hierarchy (i.e. the cgroup2 root). When a controller is mounted in its cgroup1 version, the root css is stolen and moved to the cgroup1 root; on unmount, the css moves back to the default hierarchy. Annotate rebind_subsystems() to move the root css linkage along between roots. Signed-off-by: Johannes Weiner Reviewed-by: Roman Gushchin Reviewed-by: Shakeel Butt Acked-by: Tejun Heo --- kernel/cgroup/cgroup.c | 34 +++++++++++++++++++++------------- kernel/cgroup/rstat.c | 2 -- 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c index 9153b20e5cc6..e049edd66776 100644 --- a/kernel/cgroup/cgroup.c +++ b/kernel/cgroup/cgroup.c @@ -1339,6 +1339,7 @@ static void cgroup_destroy_root(struct cgroup_root = *root) =20 mutex_unlock(&cgroup_mutex); =20 + cgroup_rstat_exit(cgrp); kernfs_destroy_root(root->kf_root); cgroup_free_root(root); } @@ -1751,6 +1752,12 @@ int rebind_subsystems(struct cgroup_root *dst_root= , u16 ss_mask) &dcgrp->e_csets[ss->id]); spin_unlock_irq(&css_set_lock); =20 + if (ss->css_rstat_flush) { + list_del_rcu(&css->rstat_css_node); + list_add_rcu(&css->rstat_css_node, + &dcgrp->rstat_css_list); + } + /* default hierarchy doesn't enable controllers by default */ dst_root->subsys_mask |=3D 1 << ssid; if (dst_root =3D=3D &cgrp_dfl_root) { @@ -1971,10 +1978,14 @@ int cgroup_setup_root(struct cgroup_root *root, u= 16 ss_mask) if (ret) goto destroy_root; =20 - ret =3D rebind_subsystems(root, ss_mask); + ret =3D cgroup_rstat_init(root_cgrp); if (ret) goto destroy_root; =20 + ret =3D rebind_subsystems(root, ss_mask); + if (ret) + goto exit_stats; + ret =3D cgroup_bpf_inherit(root_cgrp); WARN_ON_ONCE(ret); =20 @@ -2006,6 +2017,8 @@ int cgroup_setup_root(struct cgroup_root *root, u16= ss_mask) ret =3D 0; goto out; =20 +exit_stats: + cgroup_rstat_exit(root_cgrp); destroy_root: kernfs_destroy_root(root->kf_root); root->kf_root =3D NULL; @@ -4934,8 +4947,7 @@ static void css_free_rwork_fn(struct work_struct *w= ork) cgroup_put(cgroup_parent(cgrp)); kernfs_put(cgrp->kn); psi_cgroup_free(cgrp); - if (cgroup_on_dfl(cgrp)) - cgroup_rstat_exit(cgrp); + cgroup_rstat_exit(cgrp); kfree(cgrp); } else { /* @@ -4976,8 +4988,7 @@ static void css_release_work_fn(struct work_struct = *work) /* cgroup release path */ TRACE_CGROUP_PATH(release, cgrp); =20 - if (cgroup_on_dfl(cgrp)) - cgroup_rstat_flush(cgrp); + cgroup_rstat_flush(cgrp); =20 spin_lock_irq(&css_set_lock); for (tcgrp =3D cgroup_parent(cgrp); tcgrp; @@ -5034,7 +5045,7 @@ static void init_and_link_css(struct cgroup_subsys_= state *css, css_get(css->parent); } =20 - if (cgroup_on_dfl(cgrp) && ss->css_rstat_flush) + if (ss->css_rstat_flush) list_add_rcu(&css->rstat_css_node, &cgrp->rstat_css_list); =20 BUG_ON(cgroup_css(cgrp, ss)); @@ -5159,11 +5170,9 @@ static struct cgroup *cgroup_create(struct cgroup = *parent, const char *name, if (ret) goto out_free_cgrp; =20 - if (cgroup_on_dfl(parent)) { - ret =3D cgroup_rstat_init(cgrp); - if (ret) - goto out_cancel_ref; - } + ret =3D cgroup_rstat_init(cgrp); + if (ret) + goto out_cancel_ref; =20 /* create the directory */ kn =3D kernfs_create_dir(parent->kn, name, mode, cgrp); @@ -5250,8 +5259,7 @@ static struct cgroup *cgroup_create(struct cgroup *= parent, const char *name, out_kernfs_remove: kernfs_remove(cgrp->kn); out_stat_exit: - if (cgroup_on_dfl(parent)) - cgroup_rstat_exit(cgrp); + cgroup_rstat_exit(cgrp); out_cancel_ref: percpu_ref_exit(&cgrp->self.refcnt); out_free_cgrp: diff --git a/kernel/cgroup/rstat.c b/kernel/cgroup/rstat.c index d51175cedfca..faa767a870ba 100644 --- a/kernel/cgroup/rstat.c +++ b/kernel/cgroup/rstat.c @@ -285,8 +285,6 @@ void __init cgroup_rstat_boot(void) =20 for_each_possible_cpu(cpu) raw_spin_lock_init(per_cpu_ptr(&cgroup_rstat_cpu_lock, cpu)); - - BUG_ON(cgroup_rstat_init(&cgrp_dfl_root.cgrp)); } =20 /* --=20 2.30.0