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 509D4C3DA63 for ; Tue, 23 Jul 2024 18:39:47 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DF3AC6B00A3; Tue, 23 Jul 2024 14:39:46 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id DA3CA6B00A5; Tue, 23 Jul 2024 14:39:46 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C6BE56B00A7; Tue, 23 Jul 2024 14:39:46 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id A849B6B00A3 for ; Tue, 23 Jul 2024 14:39:46 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 61B901A0397 for ; Tue, 23 Jul 2024 18:39:46 +0000 (UTC) X-FDA: 82371881172.24.960115D Received: from out-184.mta1.migadu.com (out-184.mta1.migadu.com [95.215.58.184]) by imf16.hostedemail.com (Postfix) with ESMTP id 1560D180005 for ; Tue, 23 Jul 2024 18:39:43 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=Lf69A3py; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf16.hostedemail.com: domain of shakeel.butt@linux.dev designates 95.215.58.184 as permitted sender) smtp.mailfrom=shakeel.butt@linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1721759932; 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-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=k5VmKZyH3j0WUjWPZGHhKWDE4amCUXUtXuqAGRmce9Q=; b=Hc3LuHYEwFa2TZ1eqnUuFAGHgzthMem+sSsNrzU78YJWshqk3u58O3+uowFtyuyeOQwyyM LGk9+VCJDRaawd4zuLIWNfNxHhePbxhe8wDyw7br85mzULlq2a2prrr3LhCx08cArSfVBS gq4gZ4H1BAsQX0H6MPMmX//Mf5L06d8= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1721759932; a=rsa-sha256; cv=none; b=pTz1UxL752jQ/mT9ibIa5sdOoWCNlaGHuhStNuTfYgpqEjHMJkEtmRiZjQghtXU6vuzWfP H/tRIAWx1FBugFgOIUkAh3DG1FLZn5zOf/b/5RnUdViGpNt6nFV8h03Eu6g2Esgzd3L0ct u+Bluz1fUVoKJmfv0ab8V95m4rVjWIE= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=Lf69A3py; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf16.hostedemail.com: domain of shakeel.butt@linux.dev designates 95.215.58.184 as permitted sender) smtp.mailfrom=shakeel.butt@linux.dev Date: Tue, 23 Jul 2024 11:39:33 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1721759981; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=k5VmKZyH3j0WUjWPZGHhKWDE4amCUXUtXuqAGRmce9Q=; b=Lf69A3pyC9Cl+9XC0Cm/jXZKXUMDzQlH6WeHZLuZWXjQO0gxunzf8a7sFijcJ3oRHe037C s4daK/hPZ8xnvgv1Jt5yLH1T0EUyuG8MOox2KCMaDExg0PZsu9DLz0pvWKwXs0VzQ58Dyp sqApIQ2S8IAn3CGyRAf7/PICmZSbyTo= X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Shakeel Butt To: Muchun Song Cc: hannes@cmpxchg.org, mhocko@kernel.org, roman.gushchin@linux.dev, muchun.song@linux.dev, akpm@linux-foundation.org, cgroups@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] mm: kmem: add lockdep assertion to obj_cgroup_memcg Message-ID: References: <20240722070810.46016-1-songmuchun@bytedance.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240722070810.46016-1-songmuchun@bytedance.com> X-Migadu-Flow: FLOW_OUT X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 1560D180005 X-Stat-Signature: ca1meycr98pf113c74zjji7h3kej8bgm X-Rspam-User: X-HE-Tag: 1721759983-475668 X-HE-Meta: U2FsdGVkX1/FF/Tyj4GS5OQAHsxDhcg4/wQSYui16//3tY0g05f6NLKhJMNQoXUrlkTc1FM37kRbpFrpbyDTtGXeyqfNCXqZrMGRtTt2yfssnWendIWZn0QqzVz976u2r/HTyTTXgxy7PAhiZ2XQRa54fPyfLS75wD1+8kMgqbG6IpDlhKSp6KaapZ3El1Wc9VoLPovh2Ju1jqrmku7EVgboyIFYazXwBfNvX/+/jSHMC4Q1y0M7jgS8/X0DSt0cz+m+0crmgvHqsqM2aIvNBRgb28YIhgt1iPrXI7yEeTJew+80uRaD/2McyGf4fQDcuonp9nJ5secoWDBr8hNOr4DaxtcTgljwznznR9OwrIgS3UOjSDURrg7/N5L1JVje33TUWcckUHZStqUFBzkwB/H4doceVyFcQGhOfBmw2DZ/ghkATy53W6/w6CejXIAbZe4BYCcUyOOstnyl5ALbeS0jYN5xdvDqCQxpEtkJ3idLW5E1M24/X+6w3wYULn+rBJijcyIMWCl387iuOIOFmy+R1eDfQa3ZXevWnjPwmIXCVR0KD1m7gVwDIhu+KNuO/9EYwgBGFWRIquoE/m7CWdKpCNcUySTkcg1NCR5FN2f+u7cZf77yMKacOSYKF8L+rs7+ZusdGM6mNlfHMIhIZMHv51ifPS3/4qgfuPPNAaEOlBz/NRhM3UvoNsRhqpCxBsEF8DcCXaY3q3mLRRJlprOmRDUQO8xUtDwU0qpJm0AiD9kyHL4iNOh0R4MtAS84DNUIQfekVQou+t1K3nXJao2A3ctMbJaWFw53X11W9e8reO1UxlEK8ZqgeXVhSYJmRsZwcX4ph9XSNhiuNHRxpyF/7yWzNM5iHpkg+8Agspf5p0Sy2Sx4R/C2mxYM5H+1ND6HwV3UnVN3PLtCcV0s9ZLDitnmJ7Dj2kw8PAC1mgbX/DZhgJsOPwMCE8rV/m7KiarCQRgGB57iDJZgV+r ScB09ScV Jd9hn9xYlp+Q3c6j6UsBqLmkdTo/DTxz3koS7s5EWYPrWMUkxJqCPiHYcXERlxn8lTUK9MhDAknUO1GZDXXnsNnO4RPmuH02h6vEeGQ9wkm13Ql91BrkRjKedvUovL0q0r5zKLFyUm0txcrv983yjTWEGfMUJwX4OiC5Z00Koam6zu2pYlvtEHt/2SpM0JtfnMZWFpVFkL591x4g7pX/8MFilPy7cfUj5cKN5dO+y4M9tHtgcip4WKkv8XKaZp9OZMMay5PFwZJgzW6ufVXsq+5GJAWQI3TsdXsUU 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: On Mon, Jul 22, 2024 at 03:08:10PM GMT, Muchun Song wrote: > 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) > and leave a comment to indicate it is intentional. > Do we expect non-memcg code to access objcg_lock? To me this is some internal implementation detail of memcg and should not be accessible outside memcg code. So, I would recommend to not mention objcg_lock at all. > 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@bytedance.com/ > Signed-off-by: Muchun Song > --- > include/linux/memcontrol.h | 22 +++++++++++++++++++--- > mm/memcontrol.c | 6 +++--- > 2 files changed, 22 insertions(+), 6 deletions(-) > > diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h > index fc94879db4dff..d616c50025098 100644 > --- a/include/linux/memcontrol.h > +++ b/include/linux/memcontrol.h > @@ -360,11 +360,13 @@ static inline bool folio_memcg_kmem(struct folio *folio); > * 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) > { > + WARN_ON_ONCE(!rcu_read_lock_held() && > + /* !lockdep_is_held(&objcg_lock) && */ > + !lockdep_is_held(&cgroup_mutex)); > return READ_ONCE(objcg->memcg); > } > > @@ -438,6 +440,19 @@ static inline struct mem_cgroup *folio_memcg(struct folio *folio) > return __folio_memcg(folio); > } > > +/* > + * 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) != NULL; > + return __folio_memcg(folio) != NULL; > +} > + > /** > * folio_memcg_rcu - Locklessly get the memory cgroup associated with a folio. > * @folio: Pointer to the folio. > @@ -454,7 +469,6 @@ static inline struct mem_cgroup *folio_memcg_rcu(struct folio *folio) > unsigned long memcg_data = READ_ONCE(folio->memcg_data); > > VM_BUG_ON_FOLIO(folio_test_slab(folio), folio); > - WARN_ON_ONCE(!rcu_read_lock_held()); > > if (memcg_data & MEMCG_DATA_KMEM) { > struct obj_cgroup *objcg; > @@ -463,6 +477,8 @@ static inline struct mem_cgroup *folio_memcg_rcu(struct folio *folio) > return obj_cgroup_memcg(objcg); > } > > + WARN_ON_ONCE(!rcu_read_lock_held()); > + > return (struct mem_cgroup *)(memcg_data & ~OBJEXTS_FLAGS_MASK); > } > > 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 *memcg, unsigned int nr_pages) > > 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; > > /* Don't touch folio->lru of any random page, pre-check: */ > - if (!folio_memcg(folio)) > + if (!folio_memcg_charged(folio)) > return; > > uncharge_gather_clear(&ug); > @@ -4662,7 +4662,7 @@ void mem_cgroup_replace_folio(struct folio *old, struct folio *new) > return; > > /* Page cache replacement: new folio already charged? */ > - if (folio_memcg(new)) > + if (folio_memcg_charged(new)) > return; > > memcg = folio_memcg(old); > -- > 2.20.1 >