Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7;
From:   Kamalesh Babulal <kamalesh.babulal@oracle.com>
To:     Tejun Heo <tj@kernel.org>, Zefan Li <lizefan.x@bytedance.com>,
        Johannes Weiner <hannes@cmpxchg.org>
Cc:     Tom Hromatka <tom.hromatka@oracle.com>, cgroups@vger.kernel.org,
        linux-kernel@vger.kernel.org
Subject: [PATCH] cgroup: In cgroup_no_v1() check v1 controllers only
Date:   Wed, 20 Sep 2023 15:55:12 +0530
Message-ID: <20230920102513.55772-1-kamalesh.babulal@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?KSzthxltFSXZQy3eVECrc65Q9NMaV4Zaj3A9KHJf2/lJllg7N4EiTNLS29fj?=
 =?us-ascii?Q?EOa2pMExKC/pGwtzbgQbJ0FEzh1uRKeLLPYQnCFrmE5H1sxwL3JPcX2GWI8T?=
 =?us-ascii?Q?gLeeiit8Z2uTR3UdFIlR3BGkFasqxaTcJ5ioQizn7BmIlsij1MDhp9mU68oY?=
 =?us-ascii?Q?gfKzeyZ3GgiWIArKYN3uEh7jkVYpYsCR/fy1siioBgUADvQFWVTkUzfZDSAv?=
 =?us-ascii?Q?9B6g4djzQ6P1DHREpFFw/vMmND+S1I2UOn1hTnrQelmhKfhY+l6ZKAnvaPdd?=
 =?us-ascii?Q?QD+yK0QdqR3A6F5t49B6+SJe93zaW8fI7Deb7I66a+BYW7XwUT+tiOnHK3D3?=
 =?us-ascii?Q?Fu8hIQCla8KHagYTldee2+VQIIT1IA182/cgfDaSe7BcFcnKoTey6VUSp2rD?=
 =?us-ascii?Q?+ubB4PuNOvNPBD19QC6L8UM1sAUZD3Dde7HSZqm0JNhZzsD88ezQZbpM17zj?=
 =?us-ascii?Q?Ei1Beri7lGkKpp4tQ0SqDqGyxFrlVLITBrgDzgjX/64xt9AMOAwGed0seVBs?=
 =?us-ascii?Q?EknjazQaEZuTcem5fXjlIQ2Z+Re7btFFxqPYIj1/g6yapQ4y8SAtflaonZOh?=
 =?us-ascii?Q?wbhsrptVW36JZvITTlf02ZV+dn4lwwBm/FKorQBrJnoXjRw1MgoCnn4cpvkK?=
 =?us-ascii?Q?KBdEWBnNw+wsu4MjtP3w0Pn8ZQl0piKmHKio/D2nkggwpMi5rtTMjTV6nRau?=
 =?us-ascii?Q?ZD7uAL++SpXnAevAVJlOfW8af05BfNYRwVW7IDJ2SsA8lgp83efJ3VmZxVsJ?=
 =?us-ascii?Q?HzB8oL7yhWge5L9YESVmKuraZUmA0wnAJYMmu9LqDeHvUWmbBLG8PDAfDsZF?=
 =?us-ascii?Q?4zqANT2Gwrzi556jNaXcKURqQi2nHCh7z6UWvYttyuD8P/41YZH3kaFK1jZ1?=
 =?us-ascii?Q?l57rJEmRMMdqC7gHwAq1+dA4pT9E6onMjPADbmPw17S2lYU0yG8ueYzHzrgj?=
 =?us-ascii?Q?Sy+KUKBF9SfnJil8GLE/5XascMvPUQDHYYPHyU15GaGRqAvLq3zMZtXcASOt?=
 =?us-ascii?Q?KYllpmQkd98pe+Osx20fE13qcxzErxfusXnv0CmGv+nyodEPVCLqa1YbJGzf?=
 =?us-ascii?Q?ufOSU6n9CGOc5bIAhzoBy2NzhyGfzZ1XpNZZEa1jou1OfDmpj+nzS7xKFNdm?=
 =?us-ascii?Q?7FJChhdw42pcwtVOHZUXuxDrGTcEzmJZ5Xls+gt0cCGIe3O6N9sjejR87s4C?=
 =?us-ascii?Q?7WN/pJTKmOTIEjPQTSvebZUWBN9oyoPXK3OgxjEOwlpLZ75hq/uWx9rQA1j5?=
 =?us-ascii?Q?YUj3aqn1FMj6fRyY5NFY/SGhDcpuC5ah6tIaJz6N4PCt2jcZEdzDUp8yKBB7?=
 =?us-ascii?Q?SN4jr7FG5MkqKF7ZaZbs1l37p0gWfB/d8i9ipNEadxMaRjXhqNf8Orcs22kD?=
 =?us-ascii?Q?3sKtF2yP5QBx1GBY4JOF7xb/U94K09xoHhvK5851wFdljoHnHPN6ZMEqm8rQ?=
 =?us-ascii?Q?6yCKsQS1HYI22tRDTcyMGhyUJQyqeaFEkMpNhxnJDlmJhu5IZHOssMo9ys8h?=
 =?us-ascii?Q?bvmoQySpt34jyltpLn+Rj60veY41379SUBzxBa5Otxnt7arQr3OwGAmzqLRg?=
 =?us-ascii?Q?Gi5cZi5F2JTOG27W847ygBI+xTx8BmP8v2+y6fmZrkGOFeH2vQxCCBw784eT?=
 =?us-ascii?Q?WAQStoW8XcpAouiBXo0Doch2UjNwurkPA7rkQ4RUQLaIB/Dr2rWIYP89PWAY?=
 =?us-ascii?Q?4hwfHg=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: clz6dvlPHFZ/LqlICvbTwNbepOnfBvflx4vyZJ8NWPGKQjX4Hcb9i1iiYWjoVG/IUURXEfXc9K3TLiLzp7+Qid4YCfavAQ7KYIRmjXaI+aFJm/A1jY2juVV3MRLydFx1cbzOjXOrFGjglg1TkyIlnCZKbGq9tOTljDpmf/Wpt79YAkQapj2GAtFIu/SvveqikXhsG+4GPM1B91nvwIwmddr0E0o7ysl/OtpJs+rem+VkeKRFIQWjW1rw37cV71oW+v+XWe8WS/U4Mw1+WrhiHATgncf3Qj1GF4GA0yQZ1dgfJISaWLNgcK4cGdKGjhh7oE3fQXOj1makLPNGJRZzaxNrgvcT2Be6+vNAgYuirC/0q1kKgd4BAPEVUYjgRV8+IA8zAb+dbuH5ZvEsqUbXG8Gn1mWh79603WvPD8QjkExqOMBD2JKUnbDgMRUcf8apHHrabdCbmnRx28DNG9ubUoVx0+uP8IEz6i8iew7sR3g5doGX9dVlOPHh3QV6SxEaczQv9dXFzP4FT/I3d2/dGvVUbROu1xMZQ8aXp5j9ooKmO4ucHlmNgQrEJYWds7TfBF4OZ7lL5qNjzg6LsyC6LfS2L5Mqn/r2plrvG/nvKNxQYIIkKLwrbApXcUnnsTydKihtMmVR/fRj6pHRCbh+lhAKv8K4zNFGjwBpyxfkA8gKK83qEqJnC/tcQ1AfpqRMOQxdfpNicSX+b5iJrPuF4NeNjg8jawWl1NrrzS7bVNlbB+7i3rYGlCoUExivCQRERh2SItAh2uXr7JuGzEG6LlTXB4V/28hy4tQpk/kz6Pn6chP7MjwIc7kO0MDYacuFuQmJ58AnDHEcJXyDK+ENRyg2iHIhysEkoYqs8rqOinI=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 2d69b189-9663-48ce-af6e-08dbb9c3e64a
X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB3001.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Sep 2023 10:25:23.8074
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: l2pQa7Vgvh4QLfMUeSj7kLerMQ1srUwL3CCT8MjQY7rhF7yFnNVaC1SxFviz90rJK7c17Zl8BQQJUha4w8h3UJieEn7PACSo6XakxcgfDp8=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1PR10MB4740
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.267,Aquarius:18.0.980,Hydra:6.0.601,FMLib:17.11.176.26
 definitions=2023-09-20_05,2023-09-19_01,2023-05-22_02
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 adultscore=0 bulkscore=0
 suspectscore=0 phishscore=0 malwarescore=0 mlxscore=0 mlxlogscore=999
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2308100000
 definitions=main-2309200082
X-Proofpoint-GUID: D6mGFnuYPcTpQHMq-7-igqP7vvH6b-kT
X-Proofpoint-ORIG-GUID: D6mGFnuYPcTpQHMq-7-igqP7vvH6b-kT
X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,
        RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Wed, 20 Sep 2023 03:26:01 -0700 (PDT)

cgroup v1 or v2 or both controller names can be passed as arguments to
the 'cgroup_no_v1' kernel parameter, though most of the controller's
names are the same for both cgroup versions. This can be confusing when
both versions are used interchangeably, i.e., passing cgroup_no_v1=io

$ sudo dmesg |grep cgroup
...
cgroup: Disabling io control group subsystem in v1 mounts
cgroup: Disabled controller 'blkio'

Restrict the check to ss->legacy_name only, when parsing the controller
names passed to cgroup_no_v1 parameter and also, use ss->legacy_name in
pr_info(), that prints the controller disabling information.

Signed-off-by: Kamalesh Babulal <kamalesh.babulal@oracle.com>
---
 kernel/cgroup/cgroup-v1.c | 3 +--
 kernel/cgroup/cgroup.c    | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/kernel/cgroup/cgroup-v1.c b/kernel/cgroup/cgroup-v1.c
index c487ffef6652..942872b83bf2 100644
--- a/kernel/cgroup/cgroup-v1.c
+++ b/kernel/cgroup/cgroup-v1.c
@@ -1297,8 +1297,7 @@ static int __init cgroup_no_v1(char *str)
 		}
 
 		for_each_subsys(ss, i) {
-			if (strcmp(token, ss->name) &&
-			    strcmp(token, ss->legacy_name))
+			if (strcmp(token, ss->legacy_name))
 				continue;
 
 			cgroup_no_v1_mask |= 1 << i;
diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c
index 1fb7f562289d..622fb53a806b 100644
--- a/kernel/cgroup/cgroup.c
+++ b/kernel/cgroup/cgroup.c
@@ -6121,7 +6121,7 @@ int __init cgroup_init(void)
 
 		if (cgroup1_ssid_disabled(ssid))
 			pr_info("Disabling %s control group subsystem in v1 mounts\n",
-				ss->name);
+				ss->legacy_name);
 
 		cgrp_dfl_root.subsys_mask |= 1 << ss->id;
 

base-commit: 2cf0f715623872823a72e451243bbf555d10d032
-- 
2.41.0