From patchwork Fri Mar 14 13:36:11 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 14016923 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 3AD80C35FF1 for ; Fri, 14 Mar 2025 13:36:40 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 72964280008; Fri, 14 Mar 2025 09:36:31 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6D79F280006; Fri, 14 Mar 2025 09:36:31 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 57914280008; Fri, 14 Mar 2025 09:36:31 -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 13EAB280006 for ; Fri, 14 Mar 2025 09:36:31 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 4C755564EB for ; Fri, 14 Mar 2025 13:36:32 +0000 (UTC) X-FDA: 83220256224.15.771792D Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf24.hostedemail.com (Postfix) with ESMTP id 0879A180007 for ; Fri, 14 Mar 2025 13:36:29 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=rYbFLIF9; spf=none (imf24.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=1741959390; 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=8CF6B/ZWkNgJvmh6tO93Ml9BwZtYmnZEFRYcylNCRL0=; b=H7zIlL+dfaNadr1STefahnwxaNKcivkT785TLg9A59KJCH3vFeZjt0/Z83M5w2N5fkcYlE 0iDKu0t7mVoEVGOdhvXUhnkVcZgaDRgc6gTkjfjtcH4nEpfD5DvnJ4Le9kaIZlyylYdGpk wVHXziscyQaG16gcEkY5pr9ZNeYeJy0= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=rYbFLIF9; spf=none (imf24.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=1741959390; a=rsa-sha256; cv=none; b=0hoGch3mCXvR/+nETKstssp9bxevL+XNHh4PxSG0wmjFVQC8AOlPEkVp7VYBiRLtcSujA/ jxCmppPAEK5UEG0mRCUAw2jlxWzWw+tFNPjnJLCHh382g/9/1IrpebCRdbIIqk8KjSgDTn HIXN6WDvdyYlUvvVCfjxwLNUb5RiihQ= 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=8CF6B/ZWkNgJvmh6tO93Ml9BwZtYmnZEFRYcylNCRL0=; b=rYbFLIF9gocOedOBWgEnvFJo75 oBqukbfwld0TuH/zzoIJXwCkQmUJ+gIzoSndpEWeGTT/ilfhlWianlya3Fb+pxeNJmur8iRauZP9p Hu/9GvB0IUtbPgrBddNkB+YcOWBhjXVlpgpuTrhcqhFM/+DQzYqTYW95+93/HSfjwT6Htm8d4qfCK MlB3wsXKfHdqGp6/GYPLj3xlYvXX8wIjjWhJB9PiUEWBQ6avrP7NNLL3R36iP69x6iWgcLm0xX0h5 XeuokmYVKSl+vow439lG9YNA5+4gbTrsJlPe6CuL0EQefwUHFNbmCjJ675fyyLF3pMsizfkeEV+UK FehsJTKA==; Received: from willy by casper.infradead.org with local (Exim 4.98 #2 (Red Hat Linux)) id 1tt5D4-00000000ZxS-3QiI; Fri, 14 Mar 2025 13:36:23 +0000 From: "Matthew Wilcox (Oracle)" To: Andrew Morton Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org, Johannes Weiner , Michal Hocko , Roman Gushchin , Shakeel Butt , Muchun Song , Zi Yan , David Hildenbrand Subject: [PATCH v2 1/5] mm: Separate folio_split_memcg_refs() from split_page_memcg() Date: Fri, 14 Mar 2025 13:36:11 +0000 Message-ID: <20250314133617.138071-2-willy@infradead.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250314133617.138071-1-willy@infradead.org> References: <20250314133617.138071-1-willy@infradead.org> MIME-Version: 1.0 X-Stat-Signature: rrj3dzybnsff7u8k7hegcxczstk6oct7 X-Rspamd-Queue-Id: 0879A180007 X-Rspam-User: X-Rspamd-Server: rspam09 X-HE-Tag: 1741959389-648711 X-HE-Meta: U2FsdGVkX1+Q6XOoxuHn2JpSohZE84GXcGW9l68D0yVqaxKtC5JnpsDVBUyZhz9ASs48VtvRDI1msuv13e82qdfOlwi+0URlqIMbZViKmZeuHo7VZqdqlsY4woBdq7nsbkXICxwPIS5xsRPOeBS0isMo4gQeZI/zxrWQEUGn2NyXilwa/DC+05F8VRpGQRs1LIy/mjSzSGTLbbnuXrucK91x/7/RYaLgGZvci945rVaG36YVh65LjARtj07PorIot2Ix5tI7+oiuZRALD/sIOyCGiJzdQtnvcQt2wMFsQF4nvFA9xqOTqUsxAeHwZIOm7or9mldxCBGpwteSoTaNzlDekZ4F6lhdCbEPVO1Ek3UTpMPJs3OBzXrpaSAud2Wa5/ruzFxTJeateM0RhcF4FZxIEZpKb2Zh6L44kACRo4yvsIM4Gd2OEdP3q+CZrtvxHhuGNVHUVZthyO//hN+Tv2E4FAtdkk3wgnDag7bP2dPVGXJPpUTEJR9zC54NCmTjf5qnMUIa9uNjjfHiDdDSCRP+ab29ZR2A6v2mOYcbn4nUcsrNH7xgW6livNJr5ChW1ODGk/0UY5ORoImn6Zk+Qagx6KQmo7wlkIue9j/npxdyaETG74BsR9u0CfDS4mipYFG2YfY6vLi73imd+2swqVu/LY1GBShmfpkPcf4N/frx/EUPHFKl560m21WZZXirQ/253/MCAMpAKC26b6Mu3RZTudXIWRYPCh9nxiEPMI8zI2NtzGixx3McTb+RZcHIoO1bx07JYC38jGwFBah4Xk64Vx9zoTGXi4nXEurjS+6JIGsZ/GWEZhva7q7hQoP4F479PHIEEKxydTqurx1YcXrFlFaZp6K20/qH9AxuctikqL/iRoxH+5Djw4AnCX44k14mhhl6mm/nxPUoEcAzQQBhWZIBtLQxJ8f+lMInZowCPu5araIaqqv8dkdxJ//ulWjiCF07Dm7OfOuCejU nj/N5TUj ynm/GiVL1DZ04bypCPIRI9o1N7tfQcwV3uTK4MOkSKsJiDKrYWBKkS8IhtNnQeKZtE2DQSHr64e1ZpDOZiPynMIxopGUrlM6un3DmkmPiu+DWdlbRhM6Qq/EmR+MghJZomA3iakQ+Aqb165mDmUERbWjvAHFh53SiFFKbtA9F9luhZfe7S+q4yvYSsZlJBWgtJpT531MSbx1AIAvt+GQ1NagcMyG94HSOQfJBBDp6oZ+gVUi5UuBAIJCBHDu5D9NJLRzL63cRrQm/TX84zhOt75kXimrVB78MCFSOUm1IfqFVpIkATvWp6x9QJR9zGUfBuC6o9lNEj9BwZFY8f8fUB+e0cW85BpfSCz2eO7J508EP5wAVDknAAVOZsQ== 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_refs() just handling the memcg accounting. Signed-off-by: Matthew Wilcox (Oracle) Acked-by: Johannes Weiner Acked-by: Shakeel Butt Acked-by: Zi Yan --- 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..d090089c5497 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_refs(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_refs(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..3e5ecc8f3d13 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_refs(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..4674d9815a50 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_refs(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)