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 85069C282DE for ; Thu, 13 Mar 2025 14:59:11 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0AB7B280008; Thu, 13 Mar 2025 10:59:07 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 03754280005; Thu, 13 Mar 2025 10:59:06 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DCD14280008; Thu, 13 Mar 2025 10:59:06 -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 B0FBC280005 for ; Thu, 13 Mar 2025 10:59:06 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id EBC56C0197 for ; Thu, 13 Mar 2025 14:59:06 +0000 (UTC) X-FDA: 83216835492.18.CDA05ED Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf10.hostedemail.com (Postfix) with ESMTP id 7B758C0007 for ; Thu, 13 Mar 2025 14:59:05 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=gQG4JubP; spf=none (imf10.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1741877945; 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=aOX91hRrw3k2SksGw/yHfOZGgiputoocwYVsCYVCO10=; b=GHD4FXgbx3AtQzbFMJu87vl5T5ZHQmyLDO1QO3xF1ZQGTwcGeVXE7uZQvSf+niHqX35b5N rrUf9U2k4jhjBZuxeu8niHHBSQQrIrgpDRBFEzDCuWtbXW0eRlOfUmH3f+ihMfUB9WiTeg MLtEKMmgKJZaiqC/1xe6e9oW2JTDRp0= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=gQG4JubP; spf=none (imf10.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741877945; a=rsa-sha256; cv=none; b=PsdTfaleYGAdxzp5+TpZhMOhKeDMSp8vJ+oLmXvXNV/pE8PDpk/n0D3m5SXMOUCCJu/DY/ oEokxXX0sLP9o7WpGgaeCRyQ//0DKZoBetiUlxSKVG31aFgr07xUnIyk0WVWzkHlsmmYxS eonGCjTRJCQ85a+sJO+roy10ERvsGhk= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=aOX91hRrw3k2SksGw/yHfOZGgiputoocwYVsCYVCO10=; b=gQG4JubPUbzqd5vrI7AiWlbjNs GzYp7/h4Dya4938KVsU80zPcFTieYwSDaECvyqasHg/zs2QVeqr1xkkK8ttyvsGxmd6aX6G1NtMXp 0fpCLfGYtT0IC6nv2oQaNgTspGXDLOcWSG5M9tCpMNFAZMOpw8sbsVoia4WwfCXSr7Tf5NeuOhqtp NlSBgpkA2WUEXeN4qHSxRg/URtaak/ukDfr+thZNk8TITW8MTctUVYCto2d0uAfKk7ARJkgpM5ZCu gliMuxkpv8KxmGnchy4RX9G6KljfgbbMpdOAnLVVmyynjVIeqnLmxKtxDKWLHxv27Xg1aLh0mYc6f aOaXDf1g==; Received: from willy by casper.infradead.org with local (Exim 4.98 #2 (Red Hat Linux)) id 1tsk1S-0000000HHPB-0IJb; Thu, 13 Mar 2025 14:58:58 +0000 From: "Matthew Wilcox (Oracle)" To: linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" , Johannes Weiner , Michal Hocko , Roman Gushchin , Shakeel Butt , Muchun Song , Zi Yan , David Hildenbrand Subject: [PATCH 1/5] mm: Separate folio_split_memcg() from split_page_memcg() Date: Thu, 13 Mar 2025 14:58:50 +0000 Message-ID: <20250313145856.4118428-2-willy@infradead.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250313145856.4118428-1-willy@infradead.org> References: <20250313145856.4118428-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Queue-Id: 7B758C0007 X-Rspamd-Server: rspam03 X-Stat-Signature: xytjso1b9kpm1s8d7bt3mgwo6mgyw3q1 X-HE-Tag: 1741877945-989945 X-HE-Meta: U2FsdGVkX18m+FCVjc9aXg8yG1pZKI7IoGiYo/2Cf0UsNFdgTk4G3X3+YJsaho0lvjzwHg5jpqs6KjUg4Pjh5FETGJ67hSfMWuPXylAf+jh40pV9Fvgzyn9KWbB3E2nMw2YCxgKEx2Mq3uWbsrcN74OsiDup0Y/PhkIk/ecHNNVEiPNy31rRGXSWLpQ11no3CNPyeTBUaCCQdp8T31kqQKK6MVRG1isXGmn4DZ/1w4ltRz65tklQ0cBI2qYksTkpl0MeRIu7pc72ZiSZPsmZspblj91Kh8v3hti54xVbpOU1r4VFTeDTru9CnGyJKQQcat4I4v3lluPlALLCGwOFpd5xgZUknVwkGNS0t6tSr7bJW29PG78VjXbZyaYBaJRlWVWtJ1NOvkYrqs+1vR2bZtRdNVC40PDlucGH1f96/ZpBU8GhKtR4cYiGNn/eHPbP93ms9OD115N94d1vqljrc2/Tu7b2GDl45UBWKrMDfG/o1Yq+KCvdNwoNN5l8Fhv2HYF0JUyTvoDBSFNFJCjgrQeQzsyqrfiE4Gg1aPwpVNp55189V5DIUB2db6OLMeFJOsKCMwmDkanzBY/ghw//+A6oYGpRa4a0BSNiFyBacE/yL7aFXKgAeoqNpNZQlOxh+tDIMWetmnGjaC5x/+Bs/4xb2IXMHuwY70aqKU4UCf2503FVI8phdZhmaFvSoaRfJAFYDIGBIu4RtNnPh2xNROqYkOcUdfJ+tsMOkaWQUFnCfftmDeruY/GUfpO+ZVGi+8Z4b/tLtEgzwWrLNnBYp5RWawwo5F1xhQfhKk0T2fyTPwGmlr0Sj+Z5f2R5OuZUPe0YQNEMAFvkE5NawAL335hzWRg0VeqSUzMSZyK3W5XzDWZoj7QvS4vbwQrsGDU0u6NR2OZTLDfIq8FlVd4GibtTl+Ot0lQsy+s5CMetccRNuuBauYyMvDAI6I9Ejs5T/VXp7Q0ez5E= 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: Folios always use memcg_data to refer to the mem_cgroup while pages allocated with GFP_ACCOUNT have a pointer to the obj_cgroup. Since the caller already knows what it has, split the function into two and then we don't need to check. Move the assignment of split folio memcg_data to the point where we set up the other parts of the new folio. That leaves folio_split_memcg() just handling the memcg accounting. Signed-off-by: Matthew Wilcox (Oracle) --- include/linux/memcontrol.h | 7 +++++++ mm/huge_memory.c | 16 ++++------------ mm/memcontrol.c | 17 +++++++++++++---- 3 files changed, 24 insertions(+), 16 deletions(-) diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index 57664e2a8fb7..2b4246dc4284 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -1039,6 +1039,8 @@ static inline void memcg_memory_event_mm(struct mm_struct *mm, } void split_page_memcg(struct page *head, int old_order, int new_order); +void folio_split_memcg(struct folio *folio, unsigned old_order, + unsigned new_order); static inline u64 cgroup_id_from_mm(struct mm_struct *mm) { @@ -1463,6 +1465,11 @@ static inline void split_page_memcg(struct page *head, int old_order, int new_or { } +static inline void folio_split_memcg(struct folio *folio, unsigned old_order, + unsigned new_order) +{ +} + static inline u64 cgroup_id_from_mm(struct mm_struct *mm) { return 0; diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 14b1963898a7..514db6a5eee7 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -3394,6 +3394,9 @@ static void __split_folio_to_order(struct folio *folio, int old_order, folio_set_young(new_folio); if (folio_test_idle(folio)) folio_set_idle(new_folio); +#ifdef CONFIG_MEMCG + new_folio->memcg_data = folio->memcg_data; +#endif folio_xchg_last_cpupid(new_folio, folio_last_cpupid(folio)); } @@ -3525,18 +3528,7 @@ static int __split_unmapped_folio(struct folio *folio, int new_order, } } - /* - * Reset any memcg data overlay in the tail pages. - * folio_nr_pages() is unreliable until prep_compound_page() - * was called again. - */ -#ifdef NR_PAGES_IN_LARGE_FOLIO - folio->_nr_pages = 0; -#endif - - - /* complete memcg works before add pages to LRU */ - split_page_memcg(&folio->page, old_order, split_order); + folio_split_memcg(folio, old_order, split_order); split_page_owner(&folio->page, old_order, split_order); pgalloc_tag_split(folio, old_order, split_order); diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 87544df4c3b8..102109d0ee87 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -3101,10 +3101,19 @@ void split_page_memcg(struct page *head, int old_order, int new_order) for (i = new_nr; i < old_nr; i += new_nr) folio_page(folio, i)->memcg_data = folio->memcg_data; - if (folio_memcg_kmem(folio)) - obj_cgroup_get_many(__folio_objcg(folio), old_nr / new_nr - 1); - else - css_get_many(&folio_memcg(folio)->css, old_nr / new_nr - 1); + obj_cgroup_get_many(__folio_objcg(folio), old_nr / new_nr - 1); +} + +void folio_split_memcg(struct folio *folio, unsigned old_order, + unsigned new_order) +{ + unsigned new_refs; + + if (mem_cgroup_disabled() || !folio_memcg_charged(folio)) + return; + + new_refs = (1 << (old_order - new_order)) - 1; + css_get_many(&__folio_memcg(folio)->css, new_refs); } unsigned long mem_cgroup_usage(struct mem_cgroup *memcg, bool swap) -- 2.47.2