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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id DCB4CC3ABD8 for ; Thu, 15 May 2025 00:19:55 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A0FF1440009; Wed, 14 May 2025 20:19:52 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 992198D0001; Wed, 14 May 2025 20:19:52 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8077B440009; Wed, 14 May 2025 20:19:52 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 56D898D0001 for ; Wed, 14 May 2025 20:19:52 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 31409141218 for ; Thu, 15 May 2025 00:19:53 +0000 (UTC) X-FDA: 83443234266.24.AAE3E59 Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) by imf08.hostedemail.com (Postfix) with ESMTP id 5E680160002 for ; Thu, 15 May 2025 00:19:51 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=jVLFUWdg; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf08.hostedemail.com: domain of inwardvessel@gmail.com designates 209.85.214.178 as permitted sender) smtp.mailfrom=inwardvessel@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1747268391; a=rsa-sha256; cv=none; b=qcOj1rNHZnFHfMqbBsgd1DqEG5V6cIZPINR0ol8UawgtKyjfjdxyb2yZQxNpM2wJ6vdZaR hd7S2f+sF/0mSKpEAsYDJM6uGAytqVlFPyzb4okpYPfemL2lA+v5r+/8zppTrGm0eFPGZ5 vM3ffQzudPzDmQjVFElz1E8ZAZ/5kPo= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=jVLFUWdg; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf08.hostedemail.com: domain of inwardvessel@gmail.com designates 209.85.214.178 as permitted sender) smtp.mailfrom=inwardvessel@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1747268391; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=SUTWdwmMcIzb1e7juyJwpTlqnFpMaz9poabQke7cTwg=; b=JR0yr5pz78UNZqVy2Nu0doAVfOGiWanI6jnNtRUfdA1byp+tMaQ0RHXxrp4ABCTfNfmGE+ D7ykOYKk7CiifTlOEU8FTEy22eM4xLqmEnoRuOqOIfgOeX/BsgHVGS61BBY95TNHcSU2Nt eb4R2zmC19jeRSFcKfvqwdbajUgWBKE= Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-22d95f0dda4so4391085ad.2 for ; Wed, 14 May 2025 17:19:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1747268390; x=1747873190; darn=kvack.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=SUTWdwmMcIzb1e7juyJwpTlqnFpMaz9poabQke7cTwg=; b=jVLFUWdgGdvcUqc4TEkyRBmcJA4IxOSqct8F+n0K9vhlQ9JtDRQRvSrOpQNaTMHtLg jgT12EBKxBJ70n+tuaLVaggh3ZqrJXfnYmsV96iZLsmLvmV8rKKDFqsSDCKZqmiywTC2 xYBE832jm2woqVjFbTRS0t4hAK0O9xX8vo9kJiKJLuD5CFfnpYQrVVWBBiT24ZGkxxrR l9rj+qH54dPP/+9A3KK+ovnJcX8ZtHz+WG7xWAPrqM1+TbO9gxXx7+lhMemXszvYmrlG POxg8miTnROT12REudCqV7SrW8FQ3tCAmDwEQ0EakjirXRM1sP9puo11mI60wbfbuzDq Np+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747268390; x=1747873190; 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=SUTWdwmMcIzb1e7juyJwpTlqnFpMaz9poabQke7cTwg=; b=gbMZ7/D30TJwkpldbwcAs+pmz4R26O6jPJ15EhozuBVyKRgjLLMxt0LrbC+Ge0duMt XHfnNT5pD7N6koZaBc7PbBeqnsdndAL8wSWsho8lT1IbdzlMkl7LUwtqZ5mvS+ySMHcg 5/JdnEx9jyYZpbyoOTLXscKvpwd5xVKegx6QOC5uMtN1cLuWoUSG8e2PepqobKnFiSJX oLV3P53P8EeIhZM3RXAv1xiLbFZ/9sPLdpf2wyhxhJkBy6YGIcyhd98UafghTWgpkqeW 9CeY1KEASuiQnurXRmaJB9DKI2uPvE0mHorClibOQ2KKhEQOcqIaSUD4R2+g6ykXxgsz ccag== X-Gm-Message-State: AOJu0YwlddsPx7wFeGWy5h+RMEZwlEM1IiY13d9l445FKfsB8Aq3uQAj PQfxA+3bEh/Rb2BLTwrQk79WY4xeKtm38sQWDOeeyNa9lWNzSvna X-Gm-Gg: ASbGncu/XjkNzxYl3ZHct4YVqsjW6HiLtyvVh2v/sW6B8V1OxhtQzf9mgHPI7FsX3Si aJExi7kCB0W6y1x4iYgToHXkUFZuVPuKh809GmvzDPCfBioSorKbGl3/6k+q9HEScBs/IIvu0Q/ wYLPpgmQoH8BVPR1K54CTHG8mNulb+jO6QSkiU1LkNGNhHEtfyF3nyfpcWtYzwRdCnwL8ou95xC auA93FST8IpAok8KAW8XCue4i6065mtgJVWVzbj9UX3yN8el9giYtVE24oR7zo5Kf2rdbFZ4OyT qMdu/sL08neRHnxutV3CjyawNsuyyPk7qV+pr8rjMOl05DTRjmhmzYfN9vIm9AH7BdJAz1EvP5z smnKzjArwnvWqlqFUa5UC9UeW67wznIZtzirUoc0= X-Google-Smtp-Source: AGHT+IH6uTdU6PiA2BNAeuQ7hrjykpNopHGrNFc8VEmTTp1ZOjgAgAyGwrsnsjAwHjU842B3xDZsAA== X-Received: by 2002:a17:902:ca0d:b0:231:99a4:8321 with SMTP id d9443c01a7336-23199a48374mr48019085ad.51.1747268390316; Wed, 14 May 2025 17:19:50 -0700 (PDT) Received: from jpkobryn-fedora-PF5CFKNC.lan (c-67-188-127-15.hsd1.ca.comcast.net. [67.188.127.15]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22fc754785bsm105939545ad.20.2025.05.14.17.19.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 May 2025 17:19:49 -0700 (PDT) From: JP Kobryn To: tj@kernel.org, shakeel.butt@linux.dev, yosryahmed@google.com, mkoutny@suse.com, hannes@cmpxchg.org, akpm@linux-foundation.org Cc: linux-mm@kvack.org, cgroups@vger.kernel.org, kernel-team@meta.com Subject: [PATCH v6 2/6] cgroup: compare css to cgroup::self in helper for distingushing css Date: Wed, 14 May 2025 17:19:33 -0700 Message-ID: <20250515001937.219505-3-inwardvessel@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250515001937.219505-1-inwardvessel@gmail.com> References: <20250515001937.219505-1-inwardvessel@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Stat-Signature: e9rf7cm6b3otpdexq94da9uum7zhmcos X-Rspam-User: X-Rspamd-Queue-Id: 5E680160002 X-Rspamd-Server: rspam06 X-HE-Tag: 1747268391-146268 X-HE-Meta: U2FsdGVkX19FH8mGIoANVB8bciZkaDkoXXOpRz99q/knWmBJwt1nCDO9+cXBstjxpRgh1EKBrvshReV1u1INyc1W/gkLHnJlkzVct0E0Xu767jbfYkfIfZ4FnjXSRJqFuTVZkgj/L5gdTAjt5Fn62tSlsQjp9w6oyx7j3JffnKMtriUR8BjXcbzm7xYxhAFmJiaSK05756Qzc1EMqpzgqKiaRlAp+KTsBKVc5C4neTO56yEnwpo78A8SeYXK/4oW2LV79T1cQ+COSwnduPcpVxTBV8raNlLp/drj3PM6O2GrDDKNjVlWYz9DIoAIBLMbnIsbeDNw+IF47xROO8vCLrza4rZWzaxfn2lSep+Tl9x9ydMzFgXTrklMTwHsxua38yVKXuyQMRjzzzVwobYBRp5VgKBC1JwBqiOYFo3Bns7QzLwr331OlpD488WuJ2DTOKiNBTXBwVDj/r1Cs64/rFDbTd49DYJy38wXAZ+Oddvf369PcrUk9jVy0C5VB9O24CFuLvDImLIUxQfCrVbknp1FjJSSLegxQRhFMqeKNjytmqgnJdsYfqAId44ljpLiZUvu1KNXbOuI80LfyRmKQGl3tNhJlUzIt7d/SbXFrZ87xz0EUSrOdxNOoNGIK39qUYD0jnnIcvU0XRx3Z8T4RzosekSCearrPZpMLtq+fYBHtuFpMvDjDFHUUdEnWazYXHAiAGsBoJSwm4xhHpiRnUjOJETz/iCNmir/zU878WyzcqYw67P1+6AgN0BjtzBEdaZk0jVYNI3nCjYOf0CIMd+ZBRuSTP1mqPA4soPaprxGct1iudMbd7cG9eefhiLV0UXABKPLCZaPO5JdES5g62Gc/4yoEk7I48laSihJ7ZUwp2bWcCCkf7QKGShO6y38ynVPI3EDf4Kmhf16UDcHihjKo1WKQKXlCxhMRCA+VlUuLPBJfdcGzEQQL47hmdEVcGXrFecl/qvRr05GC6h 5EJuj7IO eV+/+s62kai0CxkqQLn6FKQYK7B5NpdCjkuiKp1bKEKG/JTjrZhDRUwL3FSt4w8yHzB+xGQal5g8zzFZE7WHS2PJntzfbMJ6i2M5e06jdOxiWEeadylZxyhlCTqXtXrvG20vysAUg0Tu4cvIMUe+GKh0L8z1jQ9WNvj+dnEpNSPQkIVJXf2yYNG4nK1mqCSJKoJAIiM97NAi0SVY1BslG4wcJSs4QgSS63KK+2UYby7p0fwtK5Jlq2QExaOE8IoDjvCkcLOQIMwetJkpSZ+FLp76vMBGb43XfxKcHF5XleV3DqxWGwltKw3tQ5rG2vVpZ8IhnZaMQwg1VaN2mgSyTdPI9wGW3qroHe5YS6ywa+9Z+/XT/44YG3FzfHw== 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: List-Subscribe: List-Unsubscribe: Adjust the implementation of css_is_cgroup() so that it compares the given css to cgroup::self. Rename the function to css_is_self() in order to reflect that. Change the existing css->ss NULL check to a warning in the true branch. Finally, adjust call sites to use the new function name. Signed-off-by: JP Kobryn --- include/linux/cgroup.h | 10 ++++++++-- kernel/cgroup/cgroup.c | 8 ++++---- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h index 04d4ccc7b1c5..00cb37b6fdab 100644 --- a/include/linux/cgroup.h +++ b/include/linux/cgroup.h @@ -347,9 +347,15 @@ static inline bool css_is_dying(struct cgroup_subsys_state *css) return css->flags & CSS_DYING; } -static inline bool css_is_cgroup(struct cgroup_subsys_state *css) +static inline bool css_is_self(struct cgroup_subsys_state *css) { - return css->ss == NULL; + if (css == &css->cgroup->self) { + /* cgroup::self should not have subsystem association */ + WARN_ON(css->ss != NULL); + return true; + } + + return false; } static inline void cgroup_get(struct cgroup *cgrp) diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c index 83b35c22da95..ce6a60b9b585 100644 --- a/kernel/cgroup/cgroup.c +++ b/kernel/cgroup/cgroup.c @@ -1706,7 +1706,7 @@ static void css_clear_dir(struct cgroup_subsys_state *css) css->flags &= ~CSS_VISIBLE; - if (css_is_cgroup(css)) { + if (css_is_self(css)) { if (cgroup_on_dfl(cgrp)) { cgroup_addrm_files(css, cgrp, cgroup_base_files, false); @@ -1738,7 +1738,7 @@ static int css_populate_dir(struct cgroup_subsys_state *css) if (css->flags & CSS_VISIBLE) return 0; - if (css_is_cgroup(css)) { + if (css_is_self(css)) { if (cgroup_on_dfl(cgrp)) { ret = cgroup_addrm_files(css, cgrp, cgroup_base_files, true); @@ -5406,7 +5406,7 @@ static void css_free_rwork_fn(struct work_struct *work) percpu_ref_exit(&css->refcnt); - if (ss) { + if (!css_is_self(css)) { /* css free path */ struct cgroup_subsys_state *parent = css->parent; int id = css->id; @@ -5460,7 +5460,7 @@ static void css_release_work_fn(struct work_struct *work) css->flags |= CSS_RELEASED; list_del_rcu(&css->sibling); - if (ss) { + if (!css_is_self(css)) { struct cgroup *parent_cgrp; /* css release path */ -- 2.47.1