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 2D85CC3DA64 for ; Wed, 31 Jul 2024 08:09:14 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 516A66B0082; Wed, 31 Jul 2024 04:09:13 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4C64A6B0083; Wed, 31 Jul 2024 04:09:13 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 33F676B0085; Wed, 31 Jul 2024 04:09:13 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 143786B0082 for ; Wed, 31 Jul 2024 04:09:13 -0400 (EDT) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 8E9691A01AF for ; Wed, 31 Jul 2024 08:09:12 +0000 (UTC) X-FDA: 82399322544.28.6B7B757 Received: from mailout1.w1.samsung.com (mailout1.w1.samsung.com [210.118.77.11]) by imf18.hostedemail.com (Postfix) with ESMTP id 356B31C0027 for ; Wed, 31 Jul 2024 08:09:08 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=samsung.com header.s=mail20170921 header.b=XD5VOvBF; spf=pass (imf18.hostedemail.com: domain of m.szyprowski@samsung.com designates 210.118.77.11 as permitted sender) smtp.mailfrom=m.szyprowski@samsung.com; dmarc=pass (policy=none) header.from=samsung.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1722413276; 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:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=psYRFhcGmf3wASUpnlXo7MO1TNPFdUhRoiHoQgtDZCo=; b=tp5UF9hj6Kjt1MEBq8psNnaFfiXbo5a105tWsatIeA2erWoG2VZIZUimhtN2V6iQpipvFd D85Y6IhnqgVWUW1qnffGHatZ5r2fzzigEDIbgQnbVYOuOwmaUpoWkoRD0caK7a6Eo3I1sD H5jNLC0E9XRCQk34mPXFyXL+T9t7P0o= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=samsung.com header.s=mail20170921 header.b=XD5VOvBF; spf=pass (imf18.hostedemail.com: domain of m.szyprowski@samsung.com designates 210.118.77.11 as permitted sender) smtp.mailfrom=m.szyprowski@samsung.com; dmarc=pass (policy=none) header.from=samsung.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1722413276; a=rsa-sha256; cv=none; b=JdvK9/CBwADTUuKwct7KiilmbLfz/Hl6qa8g3HIkbskAWoxUo7lwMQft4cdbs59CkiD7r/ tqH6CMA1lKEexQ0BqJOMoXnURVJHqdba+bQqSpI4+Ln5i8wiZvrg/PFCFqtnzI+SdUOehl 9UzUK778dqqpgJ8svSR1Xsi4k79Zbcs= Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20240731080906euoutp017fb9241821e3831aa4b3bf533c28a93a~nPdATiz043274132741euoutp01h for ; Wed, 31 Jul 2024 08:09:06 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20240731080906euoutp017fb9241821e3831aa4b3bf533c28a93a~nPdATiz043274132741euoutp01h DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1722413346; bh=psYRFhcGmf3wASUpnlXo7MO1TNPFdUhRoiHoQgtDZCo=; h=Date:Subject:To:Cc:From:In-Reply-To:References:From; b=XD5VOvBFNBL/+QW1U7DgwZsv3VIUPMEpb0aTllIBlBevNwTO4HbRZxmqSxI5i0vX1 IKUrMznjxNr0Ojj11jPvnp9bommxASRljjhCUejVCiX69hNS1LZMChe9g9bvSPkamN 3G5Bi5rcMDbaXBo40gKrNXMO7EMMVsjG6eTcdfb4= Received: from eusmges3new.samsung.com (unknown [203.254.199.245]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20240731080906eucas1p2fb77f38a7fc88b0c014b3a28cd07f1ca~nPdAH029l3133931339eucas1p22; Wed, 31 Jul 2024 08:09:06 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges3new.samsung.com (EUCPMTA) with SMTP id 06.A3.09620.121F9A66; Wed, 31 Jul 2024 09:09:06 +0100 (BST) Received: from eusmtrp2.samsung.com (unknown [182.198.249.139]) by eucas1p2.samsung.com (KnoxPortal) with ESMTPA id 20240731080905eucas1p24352cabf1a359cd5839430d8ad253628~nPc-uQ8kC2025620256eucas1p2n; Wed, 31 Jul 2024 08:09:05 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp2.samsung.com (KnoxPortal) with ESMTP id 20240731080905eusmtrp29d35ab5ac72a39255cb24cc2958d0918~nPc-tbGmS1490014900eusmtrp2v; Wed, 31 Jul 2024 08:09:05 +0000 (GMT) X-AuditID: cbfec7f5-d1bff70000002594-95-66a9f1214d25 Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id 44.03.08810.121F9A66; Wed, 31 Jul 2024 09:09:05 +0100 (BST) Received: from [106.210.134.192] (unknown [106.210.134.192]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20240731080904eusmtip25d4cabef9e369b48b58821ba815301df~nPc__Csa-3130431304eusmtip2s; Wed, 31 Jul 2024 08:09:04 +0000 (GMT) Message-ID: <9ccb51d9-df7a-4c8d-8b52-d0485de32f4c@samsung.com> Date: Wed, 31 Jul 2024 10:09:03 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v3] mm: kmem: add lockdep assertion to obj_cgroup_memcg To: Muchun Song Cc: Muchun Song , Johannes Weiner , Michal Hocko , Roman Gushchin , Shakeel Butt , Andrew Morton , vbabka@kernel.org, cgroups@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Content-Language: en-US From: Marek Szyprowski In-Reply-To: Content-Transfer-Encoding: 7bit X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrNKsWRmVeSWpSXmKPExsWy7djP87pKH1emGZxfx2gxZ/0aNosby2ew WKze5GtxedccNot7a/6zWrz+tozZYtnOhywWE9eIWjyfNZfJ4uD9c8wWHS/vszhwe/w7sYbN 4/Cb98wem1Z1snls+jSJ3ePEjN8sHgsbpjJ7fN4kF8AexWWTkpqTWZZapG+XwJXx/95vloKv dhWbjpxga2BcZ9LFyMkhIWAicWD9QdYuRi4OIYEVjBKXLqxnhHC+MEp8mzwNyvkMlHnRxw7T 0vFlCjNEYjmjxOvPu9khnI+MEp9X72UCqeIVsJNYPOk+M4jNIqAq0XPxBxtEXFDi5MwnLCC2 qIC8xP1bM8CmCgt4Sxx7dRHMFhFQl7j29BnYUGaBq0wSOw8/A2tmFhCXuPVkPtgCNgFDia63 XWBxTgFbiYlzF7NA1MhLbH87B+w8CYFuTolNu74yQ9ztIvFizTE2CFtY4tXxLVD/yEj83wky FKShnVFiwe/7UM4ERomG57cYIaqsJe6c+wXUzQG0QlNi/S59EFNCwFFi+glmCJNP4sZbQYgb +CQmbZsOFeaV6GgTgpihJjHr+Dq4rQcvXGKewKg0CylYZiH5chaSb2YhrF3AyLKKUTy1tDg3 PbXYOC+1XK84Mbe4NC9dLzk/dxMjMH2d/nf86w7GFa8+6h1iZOJgPMQowcGsJMIrdHJlmhBv SmJlVWpRfnxRaU5q8SFGaQ4WJXFe1RT5VCGB9MSS1OzU1ILUIpgsEwenVAOT5j5uhWg/H/Zs C7bpUsEHr7zQ6jzV0pbUorno4lLdpWqb//6peWsXu2mi4JLZq27M9EgWS8zmy96/bsehdSb7 ZxppM4Xn9B7pYj+292rG829nn1ks9WWRqu0ykXmzpbfSacurN1Pmv7H5c4VZKO71opv3l0yx uHbl/4WSruhs+X1qu3YVTfB11y94c/zCmbP7yjmK3GIct95TyripI/bN3ntSt/47p5I02yPW 33Ycks5KOK/ds+nK2yqp1QkTqs5oLGm+YJWZ+EtwWVT4pYCyQCE/Qe2GPSmJjLXF+4WXJ6T+ m9nAHbl69pwL3QXvephuv9+u2HL85rJPK6/zJN9iktscoBS97ewHrqDQldG8SizFGYmGWsxF xYkAecgzQM4DAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrLIsWRmVeSWpSXmKPExsVy+t/xe7qKH1emGby/oWwxZ/0aNosby2ew WKze5GtxedccNot7a/6zWrz+tozZYtnOhywWE9eIWjyfNZfJ4uD9c8wWHS/vszhwe/w7sYbN 4/Cb98wem1Z1snls+jSJ3ePEjN8sHgsbpjJ7fN4kF8AepWdTlF9akqqQkV9cYqsUbWhhpGdo aaFnZGKpZ2hsHmtlZKqkb2eTkpqTWZZapG+XoJfx/95vloKvdhWbjpxga2BcZ9LFyMkhIWAi 0fFlCjOILSSwlFFiW5c7RFxG4uS0BlYIW1jiz7Uuti5GLqCa94wSc8++AGvgFbCTWDzpPpjN IqAq0XPxBxtEXFDi5MwnLCC2qIC8xP1bM9hBbGEBb4ljry6C2SIC6hLXnj5jBxnKLHCdSeLk +m/MEBt+MkpcuN4NtppZQFzi1pP5TCA2m4ChRNfbLrANnAK2EhPnLmaBqDGT6NraxQhhy0ts fzuHeQKj0Cwkh8xCMmoWkpZZSFoWMLKsYhRJLS3OTc8tNtQrTswtLs1L10vOz93ECIzXbcd+ bt7BOO/VR71DjEwcjIcYJTiYlUR4hU6uTBPiTUmsrEotyo8vKs1JLT7EaAoMjYnMUqLJ+cCE kVcSb2hmYGpoYmZpYGppZqwkzutZ0JEoJJCeWJKanZpakFoE08fEwSnVwLSbLUHIeqX9zrTo wz/XXZ8/s2Nt+QSPXTqzy9135gQ/vbl+1pbykw/uXahZvVagfd0JhW17WNkP3mzxjd92sv5D zo48sQmCiR7mZ9Yd1K1rL8gXe/8o4M0fwePBJx6YXwl0yrP03WYtyPjE6NWx87sY3z1/qCvj ptKeVPDygHte6jvL+c6KUXcY438t+CB25c/rla3X1odF/Mtfo8t90lVlm+65noLwSaZpFlFx XP+eP7c5tpktdmXyycg9rA/PdDAyMJWsuMjErV4yazZvq5608Fub6TMqTIRvxKtqOF0wYaw7 cepOyIJpeU3T9yv87DHm5f64v3J727qtFt6C7f/emt44MDngj9oELsZVN+2UWIozEg21mIuK EwHUiaYXYAMAAA== X-CMS-MailID: 20240731080905eucas1p24352cabf1a359cd5839430d8ad253628 X-Msg-Generator: CA Content-Type: text/plain; charset="utf-8" X-RootMTR: 20240730185206eucas1p28b14a1d9802ce2703bd13edc75e1b55d X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20240730185206eucas1p28b14a1d9802ce2703bd13edc75e1b55d References: <20240725094330.72537-1-songmuchun@bytedance.com> <3c4b978b-b1fe-42d2-b1a7-a58609433f3c@samsung.com> X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 356B31C0027 X-Stat-Signature: u9iee5hrux6mywjtu3wp6fy4dzsq35gx X-Rspam-User: X-HE-Tag: 1722413348-810826 X-HE-Meta: U2FsdGVkX1+f0XfFb/XkTld/1VtGcV/T77m0jyJULftR4XNXzbIGuzbFtr83DGFpb5ckTlz19c70dxKn/Bd0glzm/kvGnewmcG4rsepbu2vICcbZN/3mfWQoEN3QJsAWS0fCJSTzbDWpXh/y8uqzkaL/yhZrJhZuRsGZHZyN25/pdf+nfygDSn2sgewNgAktfTp7Xx3BYFqbYdozlqeySH3bQyvhF6cpE9TK/km1zfFWdARdtTHF4CMAaYhVqIMCXquZT14CALSZV78EKOShnU9QmtzFetF4YCE1vINANkNf9nVUZ+/to8iV82/rd1PqO8+Dnb43LVvgS7V0AMGoimnp6N2tvNOmOpFgBLicJ6AOvhTEZX0b0ZEA6rvQCjybn/vl9xD6At6iP4zyS/IVcMvKud/rcHTDJycY+UqH1QpcVJi2G/3GG5zVF+8e4WnOF55FN9zpnxcxGXdem+XI5cgk4B+3AZQa2sD0ANK59sPxM7p2b4Pj9XkPRcYd9vWnhRZ3ktN+6PQEgPmuqKuj12Xh0hSFp0+Uv/ubXvUGja/Uq+Rx+9PHWX9JtZTWWSI+Xj957e7ZFeYbiWqxZ1GJPLWkVZCyhUjR3pFt+Hu9YWem794C+baE3N4ClLNiPmi1r08nydGoTrBQpx1NImA9Y3x26HMk+uwved9JUt0baUxYaMsrsRHFr2AqEamxYHbgpKgVEF1szwN2B+VvjAL0uzbEWzSnp3ogx8ih8IBNVJsJomKnbvWyFfxnRL2i9cCdN+0B5DO9QEBbPiI5PzIBBNWCwqtJ/PCPVss7P2UHddicqVxj4MLIxf6eC02QQr0g8PYfwPGhKezmLz7N41xnmtqsrDii0L2SCvXMKAap0ahA/9tC3l7huFpgeYz96bZ6PDNLNgcqFLZCoJG49YDsNZ2MVUA0m4OBTot5zFzPKk2SFJvVE4EmAJn8i5qKJjOKZFJ5Dpg++aTeH5rgE/F WjM1owQ3 t/zvYqxm3FtL5qNZi75iqC0D9I322XCT38mOuXmKIKclX4Gg4h7EyA41qRpIQPNYyECeloUxcPjF1kzAMhz0XE2ulMjWTWotL0M62dHOzhDPrdHrxJcY601ZJDdnsuRLDuLLhhwRMd7izkqHQU1mXQaXvJz5qcsc6On+MXeKSTLtH/Lycx9/kFvI9Uw== 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 31.07.2024 09:02, Muchun Song wrote: >> On Jul 31, 2024, at 02:52, Marek Szyprowski wrote: >> >> On 25.07.2024 11:43, 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). >>> 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@bytedance.com/ >>> Signed-off-by: Muchun Song >> This patch landed in today's linux-next as commit 230b2f1f31b9 ("mm: >> kmem: add lockdep assertion to obj_cgroup_memcg"). I my tests I found >> that it triggers the following warning on Debian bookworm/sid system >> image running under QEMU RISCV64: > Thanks for your report. > > I'd like to say excellent since it indeed indicates this patch works > well. Your report is actually a bug that I fixed it in [1] but not > related to this patch. > > [1] https://lore.kernel.org/all/20240718083607.42068-1-songmuchun@bytedance.com/ Confirmed. Applying [1] on top of next-20240730 fixes this issue without reverting $subject. Tested-by: Marek Szyprowski >> ------------[ cut here ]------------ >> WARNING: CPU: 0 PID: 1 at include/linux/memcontrol.h:373 >> mem_cgroup_from_slab_obj+0x13e/0x1ea >> Modules linked in: >> CPU: 0 UID: 0 PID: 1 Comm: systemd Not tainted 6.10.0+ #15154 >> Hardware name: riscv-virtio,qemu (DT) >> epc : mem_cgroup_from_slab_obj+0x13e/0x1ea >> ra : mem_cgroup_from_slab_obj+0x13c/0x1ea >> ... >> [] mem_cgroup_from_slab_obj+0x13e/0x1ea >> [] list_lru_del_obj+0xa6/0xc2 >> [] d_lru_del+0x8c/0xa4 >> [] __dentry_kill+0x15e/0x17a >> [] dput.part.0+0x242/0x3e6 >> [] dput+0xe/0x18 >> [] lookup_fast+0x80/0xce >> [] walk_component+0x20/0x13c >> [] path_lookupat+0x64/0x16c >> [] filename_lookup+0x76/0x122 >> [] user_path_at+0x30/0x4a >> [] __riscv_sys_name_to_handle_at+0x52/0x1d8 >> [] do_trap_ecall_u+0x14e/0x1da >> [] handle_exception+0xca/0xd6 >> irq event stamp: 198187 >> hardirqs last enabled at (198187): [] >> lookup_mnt+0x186/0x308 >> hardirqs last disabled at (198186): [] >> lookup_mnt+0x15c/0x308 >> softirqs last enabled at (198172): [] >> cgroup_apply_control_enable+0x1f6/0x2fc >> softirqs last disabled at (198170): [] >> cgroup_apply_control_enable+0x1d8/0x2fc >> ---[ end trace 0000000000000000 ]--- >> >> Similar warning appears on ARM64 Debian bookworm system. Reverting it on >> top of linux-next hides the issue, but I assume this is not the best way >> to fix it. >> >> I'm testing kernel built from riscv/defconfig with PROVE_LOCKING, >> DEBUG_ATOMIC_SLEEP, DEBUG_DRIVER and DEBUG_DEVRES options enabled. >> >>> --- >>> 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 *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) >>> { >>> + lockdep_assert_once(rcu_read_lock_held() || lockdep_is_held(&cgroup_mutex)); >>> return READ_ONCE(objcg->memcg); >>> } >>> >>> @@ -438,6 +438,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 +467,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 +475,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); >> Best regards >> -- >> Marek Szyprowski, PhD >> Samsung R&D Institute Poland > > Best regards -- Marek Szyprowski, PhD Samsung R&D Institute Poland