Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37;
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 v2] cgroup: use legacy_name for cgroup v1 disable info
Date:   Fri,  6 Oct 2023 17:20:32 +0530
Message-ID: <20231006115034.86615-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?CZHu6ZJK5Sh6Ec+UX+lkBo+TVjhgYCIE4rhzGioKIAgTAgFZRM3hO5Ajcy7u?=
 =?us-ascii?Q?30oc38p33o9U9mJqt3WURDNra05B4qzFjIGS8Ruh9tVLi2Pfauqtr7usgHXu?=
 =?us-ascii?Q?0W242J+za18fMv2Tr5P3X2jY4NKJJjFlA3EENJ+gvrrnv1utSwQehmiOARB0?=
 =?us-ascii?Q?cBj8vYOm5OT9vdlhR8gDrnkRjmXMNXC0H0L47q+qg3W8kR2c+2OC71Z40SeU?=
 =?us-ascii?Q?urYfVPi9om3eB9XqxHZoGCBKiU9uZDe6vV5mUC72hiEE6Q5oAG6pMKSSHYLM?=
 =?us-ascii?Q?MLfzvsUW322fT42IVRrAAyNhTloXCCAl6xnD2mxgY3eAUloLjseK3Fn0LaVT?=
 =?us-ascii?Q?m52WR8wSPnDA5PJtgyZeQiLQcXLOQ+BWtdids+89ydGi6U+Y5oedRH3pQoPf?=
 =?us-ascii?Q?M0uB4snYokT2tWDS8MHPeFDpsCpGredIiK8xLO2TZ0XKKgswLolSfBt0omwb?=
 =?us-ascii?Q?bykVUi4INbzZg+S3jf7+bujkhtMqskxw7rQHronbrWmYAhk7CK2J9bnLR3Vo?=
 =?us-ascii?Q?ZpOYQtbRS8YSMSKOIHPUq90+QLoLmWommzc/r5HPOx9ur/fvdOcG7GYTXjoR?=
 =?us-ascii?Q?ApPPQNPmQ7bvDONN1MzioUPa5xrP/P/u0ffh4vGcBNn485K/Vz71Rm6Zmly+?=
 =?us-ascii?Q?3FZ6nPoWCig14n7bWtbNCqM6BByto5zjOJ0A6JQDyDS9FIWup9gQ/1Z8b+8V?=
 =?us-ascii?Q?DV3qhpyP52Jqv2MJAv6xCHxzHFmfzhrUZLMghAxyLBJTZsXJHjGNirSK9R8K?=
 =?us-ascii?Q?TyR2liF7u/XMnTlMVGrAAdSuFqNFdfBHtnoqG5xucsuno1wJJViwpkCVAQfM?=
 =?us-ascii?Q?dviA0/iMpQ5lGroVv5nWipmudqeg88eE34JrNPHpS8gLIrlfVFcVRA3C5L8V?=
 =?us-ascii?Q?Nt5eYgxGEk3CXE9lkq9XxUx2+xv4roHXXqtKY2810pWNA7pvTNIwgPw0L17V?=
 =?us-ascii?Q?O/aby1q7GbUXLp8G3V6IOOuKyMrAXdQdWdkvfpNCaJRREF7UAleQP4A1fV7v?=
 =?us-ascii?Q?HkLTaPjszsAANEzdCzfewIEwKugXw+L1y849sjezjrXUTqDSc0SIDKh3iR7q?=
 =?us-ascii?Q?RUXJYlSyuojVFeDMtFq7TRm84sO59v8gICGsT1hy6n1LkJ3gW4n97TBT3Y8x?=
 =?us-ascii?Q?TLetJSYuwo0uecPFFIzItZxsqVUv/4D1twhSYS8/LxvAkPq7jwtK0OfrBCtY?=
 =?us-ascii?Q?08DtKF0b027VS3ToHSXkMzv079GiFL73DeNgf0Ne1s1uqIk2KvP9aYcrXUYm?=
 =?us-ascii?Q?G3J+J4Da4FWDzZDViao1i1aJWw/WTzDrLOyXXThdH2wmNB6iLTzUlzuK5J0B?=
 =?us-ascii?Q?mwrOGGYRGSb6/RuMFIyZY0VabF/IU1lun0nwZjih95M3qS4G61T+f98JQ71i?=
 =?us-ascii?Q?DClYxVYvrpY9Jot+W4QG4LWSCmavmKbw4OxXOnVliQ/Ip5mu2Pw9/yOzr5D7?=
 =?us-ascii?Q?VfopZWOSx3IuK+WCuvy4qdsKMQvCnlFNRLXbcnYwXkIiiD9lg/3ExL5yRPIZ?=
 =?us-ascii?Q?23Vk9VLmvtbp8xf6p4IEHsouW30XNon+mpFyk0bw6vCVNwMJL31REyKYxS6s?=
 =?us-ascii?Q?Op7H+G2i77KqrfGmwTH+PUPpx/oRUGkcGd9I4aBaDmMLoZeTWE2Tt/wyza7v?=
 =?us-ascii?Q?iSJGdjOyDLzHWrr5eHIt13ebMVlAnvbJGrNfaWDJ2OGAFtDzhTjQUP2VnkqN?=
 =?us-ascii?Q?FrZx/Q=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: cvOwA2oi7e7YtstMSjLKLeBOClEeswmUaqb4S27Q8cIBEv5OHHVLimep01oNkxVVGL7zQYGCOKdgKU3ehNcK+h2MVBwT/hRmryljekW2Q+ZsvIqUT4JLpHTht9A4eN3Qr4q7bzZZp4G1vnIcerXiWtjFAL5PKDRRf3VsiL6NwsVsMYWdSS0vwwA/2URVdQKk6oreY6sl0PEFEgn2JEcnjOpDW3XMgOvbA/IlFICOi3u+5afGZEI6UAFKBO9oM84cv7DDA7vrSK0F9l6NeVdIjinAd+kCyQGx6Qgbhk2KqAithNHlFcH3DHSh4bYTQ/7RDi+yxfiGlnP4O69b9PCY5+QiOzJAT0m9x7d8jOLxyIOllngEIhb0lsl+5NSryC/SFSoWsEgbL2BUUWoyO2dkkmsbaps+ogkcjCUdkEMYwelXI6irNdsPHjfnUJxRZzfFFr4Lk5InGboOd1S2ufZ5oMRr7xA6gpfE6rGvgBPyW/HbYcxZXSdADaOvqgdu/Z/Azcjcbha7g72fmMM7GBDZYB1SkRP/FvNf64HkVa5AISdOe5nsqDvoWcMCcDN8rVHsoN9G0VWJj8fkrLaY1iwOcG1h9vc3rVUTrn1vCxFblHMhNPKs8LYc3nRLrRdtx4+R7vGTjTZqKKX+AmaxLz+30tZCqq56c4mJGNgasWLfTGyk6aX75yci9VGx0YBpbTGmTl0ZWDbvUOqXv7Qldl7mON8sywibU88XyNFWQgg6eGy7A9jfmZaRxQhUMG7GCMsGVAm4BcZpDJIK2YnLXwojHv/U4MxSVkaGvRkSfd20FQkBLN4xwgIH+5R58GwksCVaDuCLUbBYUneqgvac0P30HB4AA2Cm11jeKshoOp2dyXE=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 18c95bad-57b1-490e-7afa-08dbc6628651
X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB3001.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Oct 2023 11:51:07.0041
 (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: I6bwTKJ6wlWht4+3EWUHw94UwRgwxlX7XPUojVMmrPwL4xmuPXP0r1adsya4OagjwmRFrsccHVdPWC5LGc7RPgajTPvjmCO/J/xtFk4MBI4=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR10MB5884
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.267,Aquarius:18.0.980,Hydra:6.0.619,FMLib:17.11.176.26
 definitions=2023-10-06_09,2023-10-06_01,2023-05-22_02
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 mlxscore=0 spamscore=0
 phishscore=0 bulkscore=0 mlxlogscore=999 suspectscore=0 adultscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2309180000
 definitions=main-2310060087
X-Proofpoint-GUID: qdTZ8gNLaeepLD28vq7mwUaV9Gyk6Cvr
X-Proofpoint-ORIG-GUID: qdTZ8gNLaeepLD28vq7mwUaV9Gyk6Cvr
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]); Fri, 06 Oct 2023 04:51:35 -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'

Make it consistent across the pr_info()'s, by using ss->legacy_name, as
the subsystem name, while printing the cgroup v1 controller disabling
information in cgroup_init().

Signed-off-by: Kamalesh Babulal <kamalesh.babulal@oracle.com>
---
v2 changes:
- Dropped the subsys name comparison with ss->legacy_name only while
  parsing cgroup_no_v1 cmdline
- Adapt the commit subject to match the partial change

 kernel/cgroup/cgroup.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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: b78b18fb8ee19f7a05f20c3abc865b3bfe182884
-- 
2.41.0