From patchwork Tue Feb 13 21:55:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zi Yan X-Patchwork-Id: 13555739 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 2E3B4C48BC1 for ; Tue, 13 Feb 2024 21:55:59 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 79FC88D001C; Tue, 13 Feb 2024 16:55:53 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 74F268D001A; Tue, 13 Feb 2024 16:55:53 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 57AFC8D001C; Tue, 13 Feb 2024 16:55:53 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 42A5A8D001A for ; Tue, 13 Feb 2024 16:55:53 -0500 (EST) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 1E0891A0C0F for ; Tue, 13 Feb 2024 21:55:53 +0000 (UTC) X-FDA: 81788138586.28.6BBF637 Received: from out5-smtp.messagingengine.com (out5-smtp.messagingengine.com [66.111.4.29]) by imf02.hostedemail.com (Postfix) with ESMTP id F3D468000B for ; Tue, 13 Feb 2024 21:55:50 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=sent.com header.s=fm3 header.b=yYAQgjcj; dkim=pass header.d=messagingengine.com header.s=fm3 header.b=bMCcmwqi; spf=pass (imf02.hostedemail.com: domain of zi.yan@sent.com designates 66.111.4.29 as permitted sender) smtp.mailfrom=zi.yan@sent.com; dmarc=pass (policy=none) header.from=sent.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1707861351; h=from:from:sender:reply-to: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=DFD67uQnb+ulb8US39wkV47wjWKTPIuVZ3EM1gZxQmo=; b=HixAnamM8/DhbhenigIhm/HX0gylsVX7+cZygFl0Y+WDjSJa5W88J2/DBiTZW1IAusqn9W UeygXd1Qgwfe/GfiRe2kPNYe6jFb/+7iqJCd/aA12TBPPafABZkgvTcaAQw97QpA6fF4ve ftXKFyEMkHyoelLobZnylHB+gAKmK3U= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=sent.com header.s=fm3 header.b=yYAQgjcj; dkim=pass header.d=messagingengine.com header.s=fm3 header.b=bMCcmwqi; spf=pass (imf02.hostedemail.com: domain of zi.yan@sent.com designates 66.111.4.29 as permitted sender) smtp.mailfrom=zi.yan@sent.com; dmarc=pass (policy=none) header.from=sent.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1707861351; a=rsa-sha256; cv=none; b=gWmfdMXNvXkoTgelvUxWiP8ajHVBZiGRrIHtMcOTzibGhuFS28PNPsbQb78SBZLiEh/Owp beV8bgQw0wCfSs9sGInCTtkh/wx4B9j0Ud0mal1nE3IEc/1CRLgau2EfEpXQCSUhtTgO45 dz84LAqNyavc6AXnA0Ua9E/vhNHKtyM= Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 2BFDE5C0114; Tue, 13 Feb 2024 16:55:50 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute1.internal (MEProxy); Tue, 13 Feb 2024 16:55:50 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sent.com; h=cc :cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:reply-to:subject:subject:to:to; s=fm3; t= 1707861350; x=1707947750; bh=DFD67uQnb+ulb8US39wkV47wjWKTPIuVZ3E M1gZxQmo=; b=yYAQgjcjAjFkviiP5bDanth4ua6xtOef0fKzglSx07B9qGYi4dU mPqMNB+SAAhrcBNQAN/KKoYP2UPpagFwfqCyVHPlnH7gmgbi6z9CLg/dYiJ8JF0g j3iZGL7breFfiA0Q+JqtaRwazEhflTjXY9a7tfB+iefqXsUMySJOOwzZS1i0ThPY lL/XoDxyTlaXoCDtZXMNEoef0LMMKkKzPvFg6MBITMX182wUCADfrwVnru1eFfb5 B2NZ20NtFl3uKbAZqI2BC+GkMjhPc6z9bcHqG4bPHQseCdZfwmJAMnINX2Ay48C5 Lie+IbPo4PaG+33kaocLN+5h7sZUeVPONdw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:reply-to:subject:subject:to:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t= 1707861350; x=1707947750; bh=DFD67uQnb+ulb8US39wkV47wjWKTPIuVZ3E M1gZxQmo=; b=bMCcmwqij0ogO6M9GovWN06DDA9lmOzsRXUQ61nkq8KevW/A5rH VRaHwVra8JutQ9WL90i+sPClYOXvFHmA6KPK+C0nfApz8y3ISz/oBcygKF+/s0Mm akx1a2AGUdLT8mJDekRmk+DIOY2njm64l4iIb6i4KvOL2OVtYCGDqXZYsHCgO9yd 2ZzR5BcYQrI1iLNVzysnwfR10n+8hePLkZT17+ReRFaIDVxiABMDAM+ie7qreYqn tU21tFmNAV6R93PrejHiUOQBkR1cUTnd8p1r6/RITbkIHOQT7gsLlzaGOPu/ffTe KLm2OrTFVnzTGguYUazByunjCCRKq6/KZnw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrudehgdduheefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhhrgggtgfesthekredtredtjeenucfhrhhomhepkghi ucgjrghnuceoiihirdihrghnsehsvghnthdrtghomheqnecuggftrfgrthhtvghrnhepje ekteekffelleekudfftdefvddtjeejuedtuedtteegjefgvedtfedujeekieevnecuvehl uhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepiihirdihrghnse hsvghnthdrtghomh X-ME-Proxy: Feedback-ID: iccd040f4:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 13 Feb 2024 16:55:49 -0500 (EST) From: Zi Yan To: "Pankaj Raghav (Samsung)" , linux-mm@kvack.org Cc: Zi Yan , "Matthew Wilcox (Oracle)" , David Hildenbrand , Yang Shi , Yu Zhao , "Kirill A . Shutemov" , Ryan Roberts , =?utf-8?q?Michal_Koutn=C3=BD?= , Roman Gushchin , "Zach O'Keefe" , Hugh Dickins , Mcgrof Chamberlain , Andrew Morton , linux-kernel@vger.kernel.org, cgroups@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: [PATCH v4 4/7] mm: page_owner: add support for splitting to any order in split page_owner. Date: Tue, 13 Feb 2024 16:55:17 -0500 Message-ID: <20240213215520.1048625-5-zi.yan@sent.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240213215520.1048625-1-zi.yan@sent.com> References: <20240213215520.1048625-1-zi.yan@sent.com> Reply-To: Zi Yan MIME-Version: 1.0 X-Rspamd-Queue-Id: F3D468000B X-Rspam-User: X-Stat-Signature: njk58e63x7nx57edgiu3cb1h63ehyfyi X-Rspamd-Server: rspam01 X-HE-Tag: 1707861350-593177 X-HE-Meta: U2FsdGVkX1/POwb1UsKz+p+/3m/wknPNfWwm2lP3/e4raES+BFcu02QjN9gwxyK2OujzqrcJpZIbbMhsQEupVEUQnFeXr9yuwVch7kWGGLpifRQVjh1PcCDI6vbHMbdBvdlr2GeCt68QWZP9ZQm8wwoVp5M3e1eWblJwbl/Sr7hhcj/gJ6brekzmSsNfLuYq7gHuNqOd7ojl7RLNBPuFKR7IGE4eDVjuk6QMAeDWyms0+TLRoWhGzT3EbSPSlNuI0wSWHcOiQn4YqNEn8icpAmOwBNya6gk9WvuVkB7ahLMVuHcO5TBNg6iC4KtfYDmcoEEFNkw8bLh3i/zj+8/x18Jmpmb0KMB6we8v/tlX5q3CR551ZPqSA0pm4GDMr46THjqEVFHyFc8pFLb59pVRDj+JcS+GC2/DgMsgzerKBXsOfQj+Puynm1VWFbZqC/a2Mu+8zfBuD5kRlo/eOdfnm2ocIXDIv0LkqMk2+MqbL3PZLgdiQlcT829yItp/qzVZRaEr1V4NvfphTJ65WWvDCs5VoaUzPWgzcPrE624ruVLBiqXqt46p/b//LBLUSb3f0bx1qByyCn1J0rR3K5Cie3zuXm3hVeoTyx0po2COIKqOjb3NMfUQq3v/9dtb9dE3Qg4HJg8X6esG3XRDGXBYy7uNKSPQiDW6MqDAGHOtdJqBXBl62gcK6NlwJYRj14TnoEPAbXJ8Hm22UZmjdqYWP9iIpS+jw2u0KSqBldeOgWUKSrp2cvCdlRA+QC882XOFkrmwNn4XYpB02ed4/6o6D4K1HG2KCDCbF2ZQ7dJPXtPuCsY/9ZwY174y2w/2q2BDRW6FQU6b2hk7M4gVT2Pt6HMzysWbzLFeiSmnnFa+/u43WYXQuTpe/LKxtrZJ3v5sGssQzu6Hx6iCVSuSpvjZHTJfhgfEq2pwGrEZ7BPZKfu71kdxRm6K5o0qEygl1DXrgMTmtotpTOEYolt+g2F g98laj+O IdsuftL/dfAuQPmDPKHpl+9CP73NyJYl0DiSfsgcidk0aWqlxFqjB++7lN2tc+M0joFGPJO7dJh8EHdh8RBBAusZrW9r28WDm+RbZp06JzJaSGplnQ/s04b2mSGn80wbA35bUvmmVjxaL9niW3ousRso6E3JwCzPYttU+UyFMRNuP7doNOFifVAwJUmxq73oRaDojIZ4oVr91CKvwrFs6p+VCpjeU4czjBjyH+u8yLjOtM8/nQgGltIEBgx1sJVqM0V8CoSJkMwsTzAc86sm2kDvWW+m5kA3or5y3ek3GLfpfGOGRnHxY64CR3gidZONDbRGHACLr/a1FTeoYELv2syPl75GmKkcOSNa62n7jN8hoZWKA3uJKoUVpGomdrrUctIOPJhctpuIDmqRYO8KgYZsuux91bFqM/SIEgREmFJZrgmuyTiotTD4WQRU8GwPFsDQzV8fnQxo1ZH2x08CKVoPFpBeEgAhaPe4TqzR2QWJVrzo2j6XvnFKkGQR/DbtyFB0+n8031Tk9Wftjc2aYoRbQiw== 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: From: Zi Yan It adds a new_order parameter to set new page order in page owner. It prepares for upcoming changes to support split huge page to any lower order. Signed-off-by: Zi Yan --- include/linux/page_owner.h | 10 +++++----- mm/huge_memory.c | 2 +- mm/page_alloc.c | 4 ++-- mm/page_owner.c | 9 +++++---- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/include/linux/page_owner.h b/include/linux/page_owner.h index d7878523adfc..a784ba69f67f 100644 --- a/include/linux/page_owner.h +++ b/include/linux/page_owner.h @@ -11,7 +11,7 @@ extern struct page_ext_operations page_owner_ops; extern void __reset_page_owner(struct page *page, unsigned short order); extern void __set_page_owner(struct page *page, unsigned short order, gfp_t gfp_mask); -extern void __split_page_owner(struct page *page, int order); +extern void __split_page_owner(struct page *page, int old_order, int new_order); extern void __folio_copy_owner(struct folio *newfolio, struct folio *old); extern void __set_page_owner_migrate_reason(struct page *page, int reason); extern void __dump_page_owner(const struct page *page); @@ -31,10 +31,10 @@ static inline void set_page_owner(struct page *page, __set_page_owner(page, order, gfp_mask); } -static inline void split_page_owner(struct page *page, int order) +static inline void split_page_owner(struct page *page, int old_order, int new_order) { if (static_branch_unlikely(&page_owner_inited)) - __split_page_owner(page, order); + __split_page_owner(page, old_order, new_order); } static inline void folio_copy_owner(struct folio *newfolio, struct folio *old) { @@ -56,11 +56,11 @@ static inline void reset_page_owner(struct page *page, unsigned short order) { } static inline void set_page_owner(struct page *page, - unsigned int order, gfp_t gfp_mask) + unsigned short order, gfp_t gfp_mask) { } static inline void split_page_owner(struct page *page, - int order) + int old_order, int new_order) { } static inline void folio_copy_owner(struct folio *newfolio, struct folio *folio) diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 3d30eccd3a7f..ad7133c97428 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -2919,7 +2919,7 @@ static void __split_huge_page(struct page *page, struct list_head *list, unlock_page_lruvec(lruvec); /* Caller disabled irqs, so they are still disabled here */ - split_page_owner(head, order); + split_page_owner(head, order, 0); /* See comment in __split_huge_page_tail() */ if (PageAnon(head)) { diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 9d4dd41d0647..e0f107b21c98 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -2652,7 +2652,7 @@ void split_page(struct page *page, unsigned int order) for (i = 1; i < (1 << order); i++) set_page_refcounted(page + i); - split_page_owner(page, order); + split_page_owner(page, order, 0); split_page_memcg(page, order, 0); } EXPORT_SYMBOL_GPL(split_page); @@ -4837,7 +4837,7 @@ static void *make_alloc_exact(unsigned long addr, unsigned int order, struct page *page = virt_to_page((void *)addr); struct page *last = page + nr; - split_page_owner(page, order); + split_page_owner(page, order, 0); split_page_memcg(page, order, 0); while (page < --last) set_page_refcounted(last); diff --git a/mm/page_owner.c b/mm/page_owner.c index 1319e402c2cf..ebbffa0501db 100644 --- a/mm/page_owner.c +++ b/mm/page_owner.c @@ -292,19 +292,20 @@ void __set_page_owner_migrate_reason(struct page *page, int reason) page_ext_put(page_ext); } -void __split_page_owner(struct page *page, int order) +void __split_page_owner(struct page *page, int old_order, int new_order) { int i; struct page_ext *page_ext = page_ext_get(page); struct page_owner *page_owner; - unsigned int nr = 1 << order; + unsigned int old_nr = 1 << old_order; + unsigned int new_nr = 1 << new_order; if (unlikely(!page_ext)) return; - for (i = 0; i < nr; i++) { + for (i = 0; i < old_nr; i += new_nr) { page_owner = get_page_owner(page_ext); - page_owner->order = 0; + page_owner->order = new_order; page_ext = page_ext_next(page_ext); } page_ext_put(page_ext);