From nobody Tue Dec 16 17:56:24 2025 Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) (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 E58FF149C6E for ; Wed, 14 Aug 2024 09:34:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723628071; cv=none; b=LZ0xmBaV1Te/wzsIRkcCvXFc2EMNocrhZGRXFfWV5PGgwaM92WxmNWMw3z9Zcg0iTHRQwm6vo8w0ckNJxE0kYclarbAOnYywe9GtvQq6lfLnY0BeNdXpraECTEaEgsQPRYq/XqlwZc82wL7dB2fVN75HhGWi9XyO5E26676Mhgo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723628071; c=relaxed/simple; bh=Hz9+krHOYcRemGxoMGOtfajLeP9OklMvahnVfUjJqeA=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=euarc04mbR926l/sTrwkNeWI+yqYn531A75mTJBTC4f8LYZxGp60PrBVj+XQO8beOaTV+TncwnWw356hUVTN1ky6QCiiCEqpAGmj0gloB3ZXbqqerJq9hzMIi3NmnkGmsiMrDto9w4JLr3Xs4CqI6WiK2yNdPYhka0ZaI45V1y4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=bytedance.com; spf=pass smtp.mailfrom=bytedance.com; dkim=pass (2048-bit key) header.d=bytedance.com header.i=@bytedance.com header.b=T7wG6y1S; arc=none smtp.client-ip=209.85.214.176 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=bytedance.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bytedance.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bytedance.com header.i=@bytedance.com header.b="T7wG6y1S" Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-1fc6ee64512so48387865ad.0 for ; Wed, 14 Aug 2024 02:34:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1723628069; x=1724232869; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=bC0XfL2W5FE9snaEjt3YQk8wdW3PboX02I62azn3cOk=; b=T7wG6y1SdeCWIMxA2ra1l/+V819Y7v8xerCSHN9bnXMkgpk3JEby3UU4mUlgW/kovE B1B2xaMYXxnGzTYFNvJ4k1vrBlYe6jrMLfS80rni/HDvPt9ANPGc4ZtL36R54cfeQE9q E3u8cXMxBWdop6PlBKzrJWVUEgtivg1o2cBjL6KfUdCG81kYrc4aZvdhMfAZ6bRXDPO3 tTsmHD1rnIbIMPeylL36wZnHM3RZ9vEscM8Wk+gtfrEKoWc2U8RpXNwHa+4zl8apoDXE 5stMwutP7lq1KuMmNUgEscLw03hThjHuKmJQrLjK7p2JCVQEq6sO2CeXYRzuiDKqcjnl XTlA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723628069; x=1724232869; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=bC0XfL2W5FE9snaEjt3YQk8wdW3PboX02I62azn3cOk=; b=NP8lEJ6GeasNk+rv7QpHOy7NH7BJmdSyLvbJYIajUKwem05OEllM+lYS8tjcf6+ruG XysT+jkyBglahpq7OwomIELVC0h0ukQ3mjmopQn0byJqq3rg8GEBMLgv7usnJz5m8p5K 2pX0NTfZzgz/dh+zzU1WeGfdZNHskjQh0sjW6/9cmyzH9LU41OnMMWM3Eo2S7KbeYHvv qHRlqC9xKmrQR7jjyjXYb4HykPpUJQtgY3ZpGHljL7CKff2qqbuR3WLLoZMP4XoCoUnU EL8xhcLC5tlhcwT5ZRoHb3kcb6fjptsTGA1qzoRBDOZQiKK6etozm4BOQ39DB98tc/0p aruA== X-Forwarded-Encrypted: i=1; AJvYcCWcey9oiJzDWUNt6xb/yJs2IKuLx6Uce8cULA80HVSPJmzubHUk3RDzCar2sP0JETwmO4onCwqHMa4eS1ScCAaiVZg0Ug81wPq9ZzI6 X-Gm-Message-State: AOJu0YyG5rVV8rveDWmmH9NAAwgziRNKXE+bF463aC7YxHs72oWBAVV0 u2Z4PH3nYc/0lnFxqK5IegCoUgd4yF2KLhx6VpODROr3KSKiklNZkHScDC2DkqA= X-Google-Smtp-Source: AGHT+IFnKFOYsVUUabc+Y90K4OKmBUyGjwpN5//JCZ/fIRTXKELSBwTXP/hFNmyxqIj1Zzs3BDRnhw== X-Received: by 2002:a17:903:191:b0:1fd:d6d8:1355 with SMTP id d9443c01a7336-201d63b61e9mr29347935ad.17.1723628069149; Wed, 14 Aug 2024 02:34:29 -0700 (PDT) Received: from PXLDJ45XCM.bytedance.net ([61.213.176.10]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-201cd1a93ccsm26019765ad.168.2024.08.14.02.34.24 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 14 Aug 2024 02:34:28 -0700 (PDT) From: Muchun Song To: hannes@cmpxchg.org, mhocko@kernel.org, roman.gushchin@linux.dev, shakeel.butt@linux.dev, muchun.song@linux.dev, akpm@linux-foundation.org, vbabka@kernel.org Cc: cgroups@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Muchun Song , Vlastimil Babka Subject: [PATCH RESEND v3] mm: kmem: add lockdep assertion to obj_cgroup_memcg Date: Wed, 14 Aug 2024 17:34:15 +0800 Message-Id: <20240814093415.17634-1-songmuchun@bytedance.com> X-Mailer: git-send-email 2.39.3 (Apple Git-146) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The obj_cgroup_memcg() is supposed to safe to prevent the returned memory cgroup from being freed only when the caller is holding the rcu read lock or objcg_lock or cgroup_mutex. It is very easy to ignore thoes conditions when users call some upper APIs which call obj_cgroup_memcg() internally like mem_cgroup_from_slab_obj() (See the link below). So it is better to add lockdep assertion to obj_cgroup_memcg() to find those issues ASAP. Because there is no user of obj_cgroup_memcg() holding objcg_lock to make the returned memory cgroup safe, do not add objcg_lock assertion (We should export objcg_lock if we really want to do). Additionally, this is some internal implementation detail of memcg and should not be accessible outside memcg code. Some users like __mem_cgroup_uncharge() do not care the lifetime of the returned memory cgroup, which just want to know if the folio is charged to a memory cgroup, therefore, they do not need to hold the needed locks. In which case, introduce a new helper folio_memcg_charged() to do this. Compare it to folio_memcg(), it could eliminate a memory access of objcg->memcg for kmem, actually, a really small gain. Link: https://lore.kernel.org/all/20240718083607.42068-1-songmuchun@bytedan= ce.com/ Signed-off-by: Muchun Song Acked-by: Shakeel Butt Acked-by: Roman Gushchin Acked-by: Vlastimil Babka --- Resend because commit 5161b48712dcd08 is not merged first. v3: - Use lockdep_assert_once(Vlastimil). v2: - Remove mention of objcg_lock in obj_cgroup_memcg()(Shakeel Butt). include/linux/memcontrol.h | 20 +++++++++++++++++--- mm/memcontrol.c | 6 +++--- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index fc94879db4dff..95f823deafeca 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -360,11 +360,11 @@ static inline bool folio_memcg_kmem(struct folio *fol= io); * After the initialization objcg->memcg is always pointing at * a valid memcg, but can be atomically swapped to the parent memcg. * - * The caller must ensure that the returned memcg won't be released: - * e.g. acquire the rcu_read_lock or css_set_lock. + * The caller must ensure that the returned memcg won't be released. */ static inline struct mem_cgroup *obj_cgroup_memcg(struct obj_cgroup *objcg) { + lockdep_assert_once(rcu_read_lock_held() || lockdep_is_held(&cgroup_mutex= )); return READ_ONCE(objcg->memcg); } =20 @@ -438,6 +438,19 @@ static inline struct mem_cgroup *folio_memcg(struct fo= lio *folio) return __folio_memcg(folio); } =20 +/* + * folio_memcg_charged - If a folio is charged to a memory cgroup. + * @folio: Pointer to the folio. + * + * Returns true if folio is charged to a memory cgroup, otherwise returns = false. + */ +static inline bool folio_memcg_charged(struct folio *folio) +{ + if (folio_memcg_kmem(folio)) + return __folio_objcg(folio) !=3D NULL; + return __folio_memcg(folio) !=3D NULL; +} + /** * folio_memcg_rcu - Locklessly get the memory cgroup associated with a fo= lio. * @folio: Pointer to the folio. @@ -454,7 +467,6 @@ static inline struct mem_cgroup *folio_memcg_rcu(struct= folio *folio) unsigned long memcg_data =3D READ_ONCE(folio->memcg_data); =20 VM_BUG_ON_FOLIO(folio_test_slab(folio), folio); - WARN_ON_ONCE(!rcu_read_lock_held()); =20 if (memcg_data & MEMCG_DATA_KMEM) { struct obj_cgroup *objcg; @@ -463,6 +475,8 @@ static inline struct mem_cgroup *folio_memcg_rcu(struct= folio *folio) return obj_cgroup_memcg(objcg); } =20 + WARN_ON_ONCE(!rcu_read_lock_held()); + return (struct mem_cgroup *)(memcg_data & ~OBJEXTS_FLAGS_MASK); } =20 diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 622d4544edd24..3da0284573857 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -2366,7 +2366,7 @@ void mem_cgroup_cancel_charge(struct mem_cgroup *memc= g, unsigned int nr_pages) =20 static void commit_charge(struct folio *folio, struct mem_cgroup *memcg) { - VM_BUG_ON_FOLIO(folio_memcg(folio), folio); + VM_BUG_ON_FOLIO(folio_memcg_charged(folio), folio); /* * Any of the following ensures page's memcg stability: * @@ -4617,7 +4617,7 @@ void __mem_cgroup_uncharge(struct folio *folio) struct uncharge_gather ug; =20 /* Don't touch folio->lru of any random page, pre-check: */ - if (!folio_memcg(folio)) + if (!folio_memcg_charged(folio)) return; =20 uncharge_gather_clear(&ug); @@ -4662,7 +4662,7 @@ void mem_cgroup_replace_folio(struct folio *old, stru= ct folio *new) return; =20 /* Page cache replacement: new folio already charged? */ - if (folio_memcg(new)) + if (folio_memcg_charged(new)) return; =20 memcg =3D folio_memcg(old); --=20 2.20.1