Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33;
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 2/2] cgroup: Avoid extra dereference in css_populate_dir()
Date:   Tue, 12 Sep 2023 12:34:35 +0530
Message-ID: <5870fc2459d97b2e47c5a8dc47f1a2a3837c5e03.1694501024.git.kamalesh.babulal@oracle.com>
In-Reply-To: <96694dfc5f4caf4d84a740c3b18b0a456c9ff522.1694501024.git.kamalesh.babulal@oracle.com>
References: <96694dfc5f4caf4d84a740c3b18b0a456c9ff522.1694501024.git.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?+37z2nvEMD5/8X2fEzhwCQFQ37zjvfFa0KoLhzJQL4aQBP+k0ktJP0ByGgUp?=
 =?us-ascii?Q?MXHz6MJKS0Ve+a+O4Bbhw7R8r08nvy1tLCD7Uh+sabGlzVT3i1oOHeSZ8ATk?=
 =?us-ascii?Q?HZAUR38nSZgYuAabptlVtR3fCFIzRwXLdoBA+Q6ThK64BeVxG/C+lqZsEVRj?=
 =?us-ascii?Q?IVWwipBiLHn6/1/iEtRchBT4dtO6L672jXCk+joia7PD/K9cdiUqSXN5VpBS?=
 =?us-ascii?Q?ToxZ4vHQQpH2l350SRW+AZvM5LYS1iCxSXmZR9U+7NSgfxtt5XsPaYzOsdN+?=
 =?us-ascii?Q?4L1aHE7ujiu5JSjvQcsi+4IQ0/tvDA2FKcCFcpjjUUmbUDCVhjMjdfK7LKcg?=
 =?us-ascii?Q?lDVe49IOmSD2hszAxJVpORwcK4wfWVJwAd53kIRWH7ZYmkoAMYvLfpunLkFa?=
 =?us-ascii?Q?VPNNkzWM+0Jinykt7MeIS9CDirS4KNzZH7oa0pytf+uYeLqWHCpW/lpwIDWL?=
 =?us-ascii?Q?hjM0fM0hELNGFZRj3rn63gexMuxc7atfWeoQwC3Ly8nA6yi1n8IdenMOZxJa?=
 =?us-ascii?Q?0pwt64IklVgKdsUKXuU9gD7cctdsnWOyzwyvQNJn0NyD/Gcz087hZRuUjusf?=
 =?us-ascii?Q?Cxn+mppoARJmkU7CPNnZatcHfkDItFoKNI2mfrMH/l3okybqiU1rE4+KScQI?=
 =?us-ascii?Q?6ZmKvkFwJyE+saOW9OxSnQ2+5dat++SYzZ2wdYd50D+9/EQe4vN5w784yQ3O?=
 =?us-ascii?Q?nJXdVmznwLT8mOLGIKqXqhAk69JODFyhL+uGPD6TwA8XxINbk2+KdoQcUgaQ?=
 =?us-ascii?Q?kok2DDMaTLflu6u0XFzo2YvHvGhncJ+1Q7SDvX5x4OUBeQNAkND0LUdbPiyj?=
 =?us-ascii?Q?OFZJYu3vzJ6HQnNX2SAwe7hkT/giXU4h9oQkxnQOWXnmAUz+Lfo2g2vRMisI?=
 =?us-ascii?Q?nGe9eJoyChd2m3/qkLmgnPRCueoHoZvja8q+3s6pJhBdO4G7JLhFobZaPGnJ?=
 =?us-ascii?Q?wrNCw/7SDMkK0funsYQ5U3NWNGw5g6eCFgDPJHUKJgwZYnhVDCVKohtXu+mF?=
 =?us-ascii?Q?B12OdwOfVByOU5L66lCcm4IyYHRjhqmJeGFT3Bb04yiliLQf1f+2F4WvFjom?=
 =?us-ascii?Q?v4a32hXd8Ouj8R5nEDm7GQFebtw3nlz5XVn+Qk+h31p1aSje340XZGpyNwbN?=
 =?us-ascii?Q?gtAqZMA3cBA4KYBQcX+3nktPc7NWEwAfRtuXmxSN38w2IuhWsXOAvN5qecxR?=
 =?us-ascii?Q?a0ZohLqskkX4S+kQ14gwz0JsOJ8snfCDmMDoFTNExwMR+v4x9Z8mb/a5HKvr?=
 =?us-ascii?Q?eiq8YCD/pUww7jDman9EkSb9Enje9BZZ/JNc1clwkA8WrUwM3t4ctb6fVpQE?=
 =?us-ascii?Q?27SGL8X/QOtIhiHKGpD+0xNkkY722X/o5w/xid8XzyNUTRMf0jlOzqKGtrbT?=
 =?us-ascii?Q?YCt+5esGm3Gutr1OMejej5MhLrd53+HNzy0NCb568X/yyPWSAKd444NJrXPp?=
 =?us-ascii?Q?Eb0zZOveQncXJyrctjHnc346Qzy7xKHaDN3lqDxy1cP1u/qpBvtywlwoJrQo?=
 =?us-ascii?Q?qUSWkVeOLPYFbmRYXZGifYYrFRyTaAIJ2ChMFGske9g2468xpIHm/G2nntqi?=
 =?us-ascii?Q?80XkqVPhK/EWHEWV2LRx58keSy5TUfjsqslphFHuYHysdGqA3QDO61nLFm9p?=
 =?us-ascii?Q?ZSJO8jjcPNGFLKS3UOe+3+DZ6sfhQbAyySqHI+ydsYxKV5MQrRJFdeSl4D/V?=
 =?us-ascii?Q?x7WDbQ=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 2i/ofW1SxHZFOlpcNT7Ge65XxzLWKZyXn/bEJFBJv66zO/RB6f+Ie0lvM8iDCXR6fs6xbCR3SriPMrhEGJxQUxSEILnx7xLOvrtwurmgQtkyedxLEvqexiJh8iPDnlObmu6KdlC1z3hiAWUZOeuxVZAATMFFarNeGU7Qfg63miR4EfhFWRZVhjWx0f8Xl9oue7Id3N6HAioefSLQJ1yuCvuVfe3+LXOuww4gpPfLzDdgv1WwfNutHjSo5opQBWLqhZ5SVvBCgfR0Rsojm7y2lSpu+2pIe1S8tlL4/iGVJxfHMLTKZtGn5PfHaag0/QE7EpuKYyOip0GlyyrKLdVifBhbY54spwXenY+dHne9fYXTegLMdClHSlOcUXirEwtNmKlzGi8LtsCQ/nl9MaJoXfoGNQvoGhz0QE0hkEGCNz2nWwIeTGlRYui8DWarMG2pX6f+KMdGxxYQM2LhfYCfjFTRdA6U91AV4nr64j1NJNHRTLL4tPkgK6yDV/jzMbV8vGMFwXNqErW3m6rceCNCHlDJSjt3ipsshBaWxbQQLLCgo96EkJqOqevNHJ5hTGGrhH8CXhTNlakSYeGq+fSSPz0YMRVh6zbmeNzVAbt8kUjK2hyPeQj58wyGBXn0Y40RlcEi/fPYXx8gBnGKoZtC+oIogBs9/r/We+dzMEy4FlLZd3HnzHbdbVKILVhWsd747AIk0MPcOmWLBd4WWHCwZ2nibdFWNs9StikfWD6rtoHwSj9l3ImjRBMaEG881T/kxWlbXCOAG04nZnHshKjB73jT6PSce3yrBdHO9NB5R3o4A2tb1SNB2LJGqNPGTyZNERgesmY4TwWyQzXzbXGz9dWsPtrkrZeUFq2ywy9Lmtc=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 197d33f3-9074-4bc4-6dd6-08dbb35e99ee
X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB3001.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Sep 2023 07:05:09.4806
 (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: k8m/8fUv8MXG1Ta0a333OcT4oEyFhb0QBIKgJOCzsuBS0w5x6Astmpp60v+v2pSAjwRGuzUFSzzzcnX2o6U9rCrshitXDOc5tHwptPcgcnI=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR10MB6689
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.267,Aquarius:18.0.957,Hydra:6.0.601,FMLib:17.11.176.26
 definitions=2023-09-12_04,2023-09-05_01,2023-05-22_02
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=862 mlxscore=0 adultscore=0
 phishscore=0 spamscore=0 suspectscore=0 malwarescore=0 bulkscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2308100000
 definitions=main-2309120059
X-Proofpoint-GUID: FQXGoZ8vA68ldli-vK952ASrNNx--xGB
X-Proofpoint-ORIG-GUID: FQXGoZ8vA68ldli-vK952ASrNNx--xGB
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 (lipwig.vger.email [0.0.0.0]); Tue, 12 Sep 2023 00:05:44 -0700 (PDT)
X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
	DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,
	SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no
	version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email

Use css directly instead of dereferencing it from &cgroup->self, while
adding the cgroup v2 cft base and psi files in css_populate_dir(). Both
points to the same css, when css->ss is NULL, this avoids extra deferences
and makes code consistent in usage across the function.

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

diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c
index a6b1ea324b0e..f8ff85033e5a 100644
--- a/kernel/cgroup/cgroup.c
+++ b/kernel/cgroup/cgroup.c
@@ -1719,13 +1719,13 @@ static int css_populate_dir(struct cgroup_subsys_state *css)
 
 	if (!css->ss) {
 		if (cgroup_on_dfl(cgrp)) {
-			ret = cgroup_addrm_files(&cgrp->self, cgrp,
+			ret = cgroup_addrm_files(css, cgrp,
 						 cgroup_base_files, true);
 			if (ret < 0)
 				return ret;
 
 			if (cgroup_psi_enabled()) {
-				ret = cgroup_addrm_files(&cgrp->self, cgrp,
+				ret = cgroup_addrm_files(css, cgrp,
 							 cgroup_psi_files, true);
 				if (ret < 0)
 					return ret;
-- 
2.41.0