From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 484F0257427 for ; Tue, 11 Mar 2025 12:37:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.51 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741696622; cv=none; b=kzxSbEQzedUV8p2dJqLdJZ1lW6lJ+VQS7BBn/fKZtQ2o+hnv1UCzU5VG6lkK1hMFC1g5vUBZzPVZOfSe6S01yNkpPdlFticLKrbwnGDDHj7D/db/TC90m/et8yju2+y1jHFVhdWu2SagA9JXhCLkEXHL9EfB3wfqaG63WJqudIk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741696622; c=relaxed/simple; bh=xyEpGRHmfNTyRjNmwaA53DxBYx2J1p00Psf5Ko0aRxA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=EoEDEuPHJC2qXGpINduSVtl7DmBwRGjUFRQmUMupePO/2FQGZekPyAwEi+/gWRPf88i7kty9oP/xaGc2LqyYA55jfPaCyGBjl8eXks1pVgPu0dgYOyEzEqAQlxr8Fi/uVwh9ZYAEd8ORqSoHVh2FLpHCI+X1pup4BXK8j/u77X0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com; spf=pass smtp.mailfrom=suse.com; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b=bfWcoulj; arc=none smtp.client-ip=209.85.128.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b="bfWcoulj" Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-43cf0d787eeso23380685e9.3 for ; Tue, 11 Mar 2025 05:37:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1741696619; x=1742301419; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=2Xuoo2PtJFZeE4IeXKmwssCpt9oQyYMklcL+gMOuRoQ=; b=bfWcouljdKQCxEXmcxoru9LHjh01i1KlUhSmUBYnYcDhreokBmz9Qp77KFcABE/IDM TBcNno+Mtrfyiu3EidddcJ/89PMziiJfzkHUI/KiVhQPPPx9YQ8a4UBhgvfMkucqj04d vYC/PRb+QmSLXDzHuTmlwizekshw0Cj7GjImm7jJs4QhiAP3FaNhoy+xNpkv4FxKI0D+ rkS4sGGUglssRlVd5vSlqqHVxW7b/ketR3w+a7xEjNC8aiXKSPamSPRBlEayJ1thWM1A fF/GtYA5MujYYVQxsoEqqQiwiF+Bx4amM3TcIKFXZ1dHxYlmwGFBfklnFptB9JoUlnqR 8Akw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741696619; x=1742301419; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=2Xuoo2PtJFZeE4IeXKmwssCpt9oQyYMklcL+gMOuRoQ=; b=pcTLS0PDFCeoI6vylMWCFmlgtK0geoFz5AlPozS4EU7rLIDJGZ+ZZcRT7IJ6pxX1ap YkNNpp9TVNbwvgxWs1rWdSRCboZgLOyz8X8xkF/LubBLsyFcBzk141NtIv5V1SAgpNbI KJ3l1XiZen+rJncj9fUr9H3UEEnPpVkEOjktGidA84rl5C5e/JwBc4tYm7qyw0uxt0hN 2hO7jCcna3c2+crDnzYILxhRWBh1P9m9wnalHqpi+/jH3R1AtLjfo11Ie3iTlgQnKOHK rAaHnTwew9jYNycl8Rz8Ezj+JWDiItwuxlQ6W+govIiPQncILXRCXj8JQ8xVvTW08mS+ hMUg== X-Forwarded-Encrypted: i=1; AJvYcCWqPYg7jv5GUt7zezW7vlhzeqKJSJESuN7J256OfJ195MiB9tUsA5trd0CrQT1btEbUFuLRy4gzwcmsSgA=@vger.kernel.org X-Gm-Message-State: AOJu0YwGs0GZvZ5t9bqpWz0kWXF3ywucFSYUBJ4KN40vnXX7rFZIa/2R +VSwP0Da01V6jgH5SLrHtOjK5ag+I7nHIBU2lwRcnDIlbRUspwnPAQBA9qf/Ae4= X-Gm-Gg: ASbGncur+ZyVjeStNbbvtlISehqXz+V+DWiJGVb59uOxhynfkzLnz3Q1ruahmTu6VlZ GVpzjOd0DtnPW+TCrOhOnu/wywqvrB3C5Ik1A7jfYR82dlxcybq+uC988QOP43HHc69JocNR03C AaHb+94lv9JZPbZSMFNo2tK366Ji98pL/umsnfPJ+ttDaPmoV9FEeW31Jj0ySHglIB15XmMFAxA WA6E+xLz9FP1VssH0KWHdjGsN/7BOzTRfheAOwiI5fIzPOy+2yHVVdQTMZbICI8+JenaV59vzeQ CKF1CgrBxWcpCFzM8GEp73dEZ8rYVVpRPUvFgFBZyAb1h5I= X-Google-Smtp-Source: AGHT+IG705tglikfT9xX/hSnvCuldCmyH71qaPUhRYW4tTIkJUwakPUVz4hapz+mna0wElISmvRMlQ== X-Received: by 2002:a05:600c:4f10:b0:43c:f64c:447f with SMTP id 5b1f17b1804b1-43cf64c4722mr76736445e9.29.1741696618579; Tue, 11 Mar 2025 05:36:58 -0700 (PDT) Received: from blackdock.suse.cz ([193.86.92.181]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43d04004240sm9742265e9.3.2025.03.11.05.36.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Mar 2025 05:36:58 -0700 (PDT) From: =?UTF-8?q?Michal=20Koutn=C3=BD?= To: cgroups@vger.kernel.org, linux-kernel@vger.kernel.org Cc: =?UTF-8?q?Michal=20Koutn=C3=BD?= , Waiman Long , Tejun Heo , Johannes Weiner Subject: [PATCH v2 04/11] cgroup: Print message when /proc/cgroups is read on v2-only system Date: Tue, 11 Mar 2025 13:36:21 +0100 Message-ID: <20250311123640.530377-5-mkoutny@suse.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250311123640.530377-1-mkoutny@suse.com> References: <20250311123640.530377-1-mkoutny@suse.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As a followup to commits 6c2920926b10e ("cgroup: replace unified-hierarchy.txt with a proper cgroup v2 documentation") and ab03125268679 ("cgroup: Show # of subsystem CSSes in cgroup.stat"), add a runtime message to users who read status of controllers in /proc/cgroups on v2-only system. The detection is based on a) no controllers are attached to v1, b) default hierarchy is mounted (the latter is for setups that never mount v2 but read /proc/cgroups upon boot when controllers default to v2, so that this code may be backported to older kernels). Signed-off-by: Michal Koutný Acked-by: Waiman Long --- kernel/cgroup/cgroup-internal.h | 1 + kernel/cgroup/cgroup-v1.c | 7 +++++++ kernel/cgroup/cgroup.c | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/kernel/cgroup/cgroup-internal.h b/kernel/cgroup/cgroup-internal.h index c964dd7ff967a..95ab39e1ec8f0 100644 --- a/kernel/cgroup/cgroup-internal.h +++ b/kernel/cgroup/cgroup-internal.h @@ -168,6 +168,7 @@ struct cgroup_mgctx { extern struct cgroup_subsys *cgroup_subsys[]; extern struct list_head cgroup_roots; +extern bool cgrp_dfl_visible; /* iterate across the hierarchies */ #define for_each_root(root) \ diff --git a/kernel/cgroup/cgroup-v1.c b/kernel/cgroup/cgroup-v1.c index e28d5f0d20ed0..11ea8d24ac727 100644 --- a/kernel/cgroup/cgroup-v1.c +++ b/kernel/cgroup/cgroup-v1.c @@ -673,6 +673,7 @@ struct cftype cgroup1_base_files[] = { int proc_cgroupstats_show(struct seq_file *m, void *v) { struct cgroup_subsys *ss; + bool cgrp_v1_visible = false; int i; seq_puts(m, "#subsys_name\thierarchy\tnum_cgroups\tenabled\n"); @@ -684,12 +685,18 @@ int proc_cgroupstats_show(struct seq_file *m, void *v) for_each_subsys(ss, i) { if (cgroup1_subsys_absent(ss)) continue; + cgrp_v1_visible |= ss->root != &cgrp_dfl_root; + seq_printf(m, "%s\t%d\t%d\t%d\n", ss->legacy_name, ss->root->hierarchy_id, atomic_read(&ss->root->nr_cgrps), cgroup_ssid_enabled(i)); } + if (cgrp_dfl_visible && !cgrp_v1_visible) + pr_info_once("/proc/cgroups lists only v1 controllers, use cgroup.controllers of root cgroup for v2 info\n"); + + return 0; } diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c index afc665b7b1fe5..3a5af0fc544a6 100644 --- a/kernel/cgroup/cgroup.c +++ b/kernel/cgroup/cgroup.c @@ -171,7 +171,7 @@ EXPORT_SYMBOL_GPL(cgrp_dfl_root); * The default hierarchy always exists but is hidden until mounted for the * first time. This is for backward compatibility. */ -static bool cgrp_dfl_visible; +bool cgrp_dfl_visible; /* some controllers are not supported in the default hierarchy */ static u16 cgrp_dfl_inhibit_ss_mask; -- 2.48.1