From patchwork Mon Feb 12 16:35:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zi Yan X-Patchwork-Id: 13553621 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 50FB5C48297 for ; Mon, 12 Feb 2024 16:35:23 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 68F098D0003; Mon, 12 Feb 2024 11:35:20 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 642358D0001; Mon, 12 Feb 2024 11:35:20 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 252738D0003; Mon, 12 Feb 2024 11:35:20 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id EC6A08D0003 for ; Mon, 12 Feb 2024 11:35:19 -0500 (EST) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id B8858A0DB5 for ; Mon, 12 Feb 2024 16:35:19 +0000 (UTC) X-FDA: 81783701958.11.AD787C8 Received: from out3-smtp.messagingengine.com (out3-smtp.messagingengine.com [66.111.4.27]) by imf06.hostedemail.com (Postfix) with ESMTP id 6DC87180008 for ; Mon, 12 Feb 2024 16:35:16 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=sent.com header.s=fm3 header.b=jtwatxbu; dkim=pass header.d=messagingengine.com header.s=fm3 header.b="afPdzl/w"; dmarc=pass (policy=none) header.from=sent.com; spf=pass (imf06.hostedemail.com: domain of zi.yan@sent.com designates 66.111.4.27 as permitted sender) smtp.mailfrom=zi.yan@sent.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1707755716; 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=olLqROIyqpY7Zf7udKwLJkzhBkxMJLzel8K572FqHrM=; b=YZ/+6/1SRCqYwo9PeLwI3Mu5aKZIyduQZ/ntJ84s513MJaDtKQEj/NGTEUviDpACckgGqs jEaFyoFHq8kCvZpNli8cz8LhRV9SbxLb7098vws6H3eoVmhKJA8rvfJ7cyvoZ0OyPbLQda HNfnVBapTEbC3pezbiBpeRotaX9cpMc= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=sent.com header.s=fm3 header.b=jtwatxbu; dkim=pass header.d=messagingengine.com header.s=fm3 header.b="afPdzl/w"; dmarc=pass (policy=none) header.from=sent.com; spf=pass (imf06.hostedemail.com: domain of zi.yan@sent.com designates 66.111.4.27 as permitted sender) smtp.mailfrom=zi.yan@sent.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1707755716; a=rsa-sha256; cv=none; b=6GX4YOjusXyGVFVsnGPbMMm9yINlinDniOkvOrZW/0FnIYyMTwqtAFXixWWALASkOORhSY tUUBpesTKMYlfLqaZbkZpncZ1405uEdOSMPi00D+9+vbqsqVdtWU7Anhw/3Z2SEpj0FKJa vhZH04PR+s3tkifMe3ccSmeA9F6l1as= Received: from compute7.internal (compute7.nyi.internal [10.202.2.48]) by mailout.nyi.internal (Postfix) with ESMTP id B4EA05C0045; Mon, 12 Feb 2024 11:35:15 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute7.internal (MEProxy); Mon, 12 Feb 2024 11:35:15 -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= 1707755715; x=1707842115; bh=olLqROIyqpY7Zf7udKwLJkzhBkxMJLzel8K 572FqHrM=; b=jtwatxbu2FB6nKWyP/fincfHoJzs3A/lOqghTUCfK8J2wIPfn+T S7tgChnPEhCuIkTn2XGVynpfbrJbYfBthSX3ykoAKK9oXEIo/prqFZGwwIhjWTlQ DNiAK3a0QGpNnqYGofiADYaL3e5cw+rodaym6RLoCPDr063CCHWZwZDr5H0fYNnD kusC71OYg4vy8Qrx1Se+t2B1iGG0flCQFRyIsYt09qIRN+QvCsociw3VhV56xRxg GCatDpdKRwRmBvL4po67ti8E7H2pNkbA8w5j0No/3nLzsDIrIPlxJw16dwwZ9b6u 7ayARCU+f14z6UEhgOqCrpd+9K11KKT3mog== 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= 1707755715; x=1707842115; bh=olLqROIyqpY7Zf7udKwLJkzhBkxMJLzel8K 572FqHrM=; b=afPdzl/wbipcN9f++f1MwyUl2kN36DxNta5xjrdSb8dXrEsRFAo xo7OsCUgZeEhSpFbdtqCThXFVasVrxVTPPTEx2p6O1aYzM/hMXiyN6491K7ZZCNi O/qQnBk4YAOq3mPhYbIxNHgdfDYpVbbW0P7zBkY7gG2wrZ/jqzq18M6zGSJ87ydy LyBeVGF4OgDRheJ0g/q9ctcTHU9XVehqXAAeHd7xiR6mYjGSfW89E5oJsqxIdtqH 6JD0gjjd0i1ONje2fLCfvuepRer/QnfmRNK2WzGLjKkQVckZFpU+t4Qw/G3FKwos 3m5emENiTgMzi8qVjue2V0gKwyyKdS30I2A== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrudefgdeklecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvfevufffkffojghfrhggtgfgsehtkeertdertdejnecuhfhrohhmpegkihcu jggrnhcuoeiiihdrhigrnhesshgvnhhtrdgtohhmqeenucggtffrrghtthgvrhhnpeejke etkeffleelkeduffdtfedvtdejjeeutdeutdetgeejgfevtdefudejkeeiveenucevlhhu shhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpeiiihdrhigrnhessh gvnhhtrdgtohhm X-ME-Proxy: Feedback-ID: iccd040f4:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 12 Feb 2024 11:35:14 -0500 (EST) From: Zi Yan To: linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Zi Yan , "Huang, Ying" , Ryan Roberts , Andrew Morton , "Matthew Wilcox (Oracle)" , David Hildenbrand , "Yin, Fengwei" , Yu Zhao , Vlastimil Babka , "Kirill A . Shutemov" , Johannes Weiner , Baolin Wang , Kemeng Shi , Mel Gorman , Rohan Puri , Mcgrof Chamberlain , Adam Manzanares , "Vishal Moola (Oracle)" Subject: [PATCH v4 1/3] mm/compaction: enable compacting >0 order folios. Date: Mon, 12 Feb 2024 11:35:08 -0500 Message-ID: <20240212163510.859822-2-zi.yan@sent.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240212163510.859822-1-zi.yan@sent.com> References: <20240212163510.859822-1-zi.yan@sent.com> Reply-To: Zi Yan MIME-Version: 1.0 X-Rspamd-Queue-Id: 6DC87180008 X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: u1k9pzhcmka3akormfbfa1kbtod4joz5 X-HE-Tag: 1707755716-606445 X-HE-Meta: U2FsdGVkX1+w0Fo7qwRCubvFje85XjGR8+bkHssnkwhvEzBdST1w6dSLm7cfyApnEp7H8SZZtHo/9ah/bFiRgzBsifmqyiTLh6wqbm/1FPB3RelI66uSEUF4x0/+22mJd6JnSJEMKi/2Zv9FzRGSDOMECM+3lLQiqrSdcDkOHQTZv1bsy01HKVt0AlFzPts0oHISO8kSMtVumXqYzQ9QL7+WgRNobwghgyDQ/J42BEjlvB4a0eSVYPjUK6r8PlHjlWbFqaHfmbjh2eOwhGfgI8twkuSTGgmCV+Z7Xu5itU7ro89YpcZIhGS91TUASyUHoSwlbJxS1vemG0u89AOpEijwSuxnfZL9qNeKa15TE6L6y3DeXM1F6KXW0BsivfwBQU/2CpMQLsD2PbuWoRgqDcTD3A/+FOfLtyu70YRR/frJcSMPSP5sdr1Ryt4PgOYRnLGYeBaLqHf1jU5x/PrJpS1JvuGOvAPvxE8efoPpy7qXBtVvQ2Tn5pjzk0n/+zQtWzy/fRBBMyhCKzQQHc2d2/ae26+aBYJiY3xclUpJpb56gYebS/EDPx5IPXmeKGn5+miKG3cNVX+61LfxqTDPT0Xt7R67zVkIYrI4Hl55yUfWOFdiZJhTU93PjPZXcLs4dA7InF/tbELymoqPQO4E6zno3stDWkUBURT/ybb5Mi5IlfBdEa8Kpa9KDMimjg7EJmN5b6q+5KtJ+o9dBQ3LjOT/N+TgEnAwUjkkf90w0SRO/Sw+JMhqefVwGvv+xIeIEUyay+OTEpIPLVlOJ/AYDJuzVNlSrpnWMj7YzcswaTWcglaTMl85lmFsfP5qFJXfzU2OLQvKbCzlaHdCr+JczgoX0DrxrqhAr3ISgTOlatsqmHYRmjlMTfKNXd0OmCh7YsdDfqWP09R7WVB9KfBhxjB9P1amMKLS5dDlb8ivBsaG2Kap1hcFkiYdURpwSh7SkxSl3MeuhnYtVoVrXe3 co/12E+D IIblxTQu6tkf8e59ChsJj3FmQ7f5lh+peQfh86nGwIXIdJz/HF/Fo74m3cZSzRcUKDWMMvVTnll2s9r+ZI1cGrn54HYdGa5A214FTBu3PF2aXvnFdEuFOxLj0z2OTF2mpjkLFSfP3hgh0lU5OMgESiUDkqXgaXCYVjL59dkP1ky52qmPEA/NlYzQ/IsnammN55f8/QO3sPGaLEoknqOyST9iZFUiYmFz6dcwSAfKWuEJO6du5LS1hcRX9iGwderlaqoLm/HgE5PQm97C70FqmnWTVATN1REZpi3aBZdcqtquW7cliIPhghIPpczeLw7VcxMFi0rPdaSDXhLQjxxfqhHHfWkTpBkH5kHHNhV4jKFLxCK/RSThnLjHpMJiu7PshG8j4tAG+jK6sc9d2OrOmDvOnlNX7BFZmJyyaA1O5fCuGAFKiPLhCAJRrJGOay40OqATDyUrTfCaFQdnDH5Ud83YnqnoQT//DXAfmncpREAS9AcpzknpLD6MuucaAudEbCMCiFb/drlkEHnA/3Vm2ZUkBtseC10Im5EWGfYEeA9BzoqPtoHHXEP5ipx+f9kRHr+ILvryL/uEQD2yz9Fm1xHb0WwKmC6gJSWa+/ncVKQeM2OT8bLCXD7TNWVRvk3N9z6aW5ECuR254OBbFtX83VJ+RtCrmnznI5LZ9YjW0fYwq31cD8QwFvNizH062siIxR6Dbq0zbyk2Fg9ZuPQdCF9IW0olAtN9wTukbK6ilekhZ+aWZhEjL83hdPDMfi8OIrujGV3rs7ruVeBfNNoVu56PmGhDGUTVExnisoylCI1Vj+VGoPhqSziKDwqI4oDEsgI+krVvagNThrsvzlXqHZKmKEivmAvwa8nB+LrJm9U9lJbnfIzrLR2AcRVupmT0/sREdIfnOVBoueOOJ1VhLytwqBMeMDqTvHcjNbX6socMzoKDoRM7ybaqi7F1IQociZLCwNnB6cc6M/DJj4RaPqCIy6Ghm eZ0m8mTk YUiNrfYrbYDj4vTgCA4HD3b53dBkIdKx 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 migrate_pages() supports >0 order folio migration and during compaction, even if compaction_alloc() cannot provide >0 order free pages, migrate_pages() can split the source page and try to migrate the base pages from the split. It can be a baseline and start point for adding support for compacting >0 order folios. Signed-off-by: Zi Yan Suggested-by: Huang Ying Reviewed-by: Baolin Wang Tested-by: Baolin Wang Cc: Adam Manzanares Cc: David Hildenbrand Cc: Johannes Weiner Cc: Kemeng Shi Cc: Kirill A. Shutemov Cc: Luis Chamberlain Cc: Matthew Wilcox (Oracle) Cc: Mel Gorman Cc: Ryan Roberts Cc: Vishal Moola (Oracle) Cc: Vlastimil Babka Cc: Yin Fengwei Cc: Yu Zhao --- mm/compaction.c | 66 ++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 52 insertions(+), 14 deletions(-) diff --git a/mm/compaction.c b/mm/compaction.c index cc801ce099b4..aa6aad805c4d 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -816,6 +816,21 @@ static bool too_many_isolated(struct compact_control *cc) return too_many; } +/* + * 1. if the page order is larger than or equal to target_order (i.e., + * cc->order and when it is not -1 for global compaction), skip it since + * target_order already indicates no free page with larger than target_order + * exists and later migrating it will most likely fail; + * + * 2. compacting > pageblock_order pages does not improve memory fragmentation, + * skip them; + */ +static bool skip_isolation_on_order(int order, int target_order) +{ + return (target_order != -1 && order >= target_order) || + order >= pageblock_order; +} + /** * isolate_migratepages_block() - isolate all migrate-able pages within * a single pageblock @@ -947,7 +962,22 @@ isolate_migratepages_block(struct compact_control *cc, unsigned long low_pfn, valid_page = page; } - if (PageHuge(page) && cc->alloc_contig) { + if (PageHuge(page)) { + /* + * skip hugetlbfs if we are not compacting for pages + * bigger than its order. THPs and other compound pages + * are handled below. + */ + if (!cc->alloc_contig) { + const unsigned int order = compound_order(page); + + if (order <= MAX_PAGE_ORDER) { + low_pfn += (1UL << order) - 1; + nr_scanned += (1UL << order) - 1; + } + goto isolate_fail; + } + /* for alloc_contig case */ if (locked) { unlock_page_lruvec_irqrestore(locked, flags); locked = NULL; @@ -1008,21 +1038,24 @@ isolate_migratepages_block(struct compact_control *cc, unsigned long low_pfn, } /* - * Regardless of being on LRU, compound pages such as THP and - * hugetlbfs are not to be compacted unless we are attempting - * an allocation much larger than the huge page size (eg CMA). - * We can potentially save a lot of iterations if we skip them - * at once. The check is racy, but we can consider only valid - * values and the only danger is skipping too much. + * Regardless of being on LRU, compound pages such as THP + * (hugetlbfs is handled above) are not to be compacted unless + * we are attempting an allocation larger than the compound + * page size. We can potentially save a lot of iterations if we + * skip them at once. The check is racy, but we can consider + * only valid values and the only danger is skipping too much. */ if (PageCompound(page) && !cc->alloc_contig) { const unsigned int order = compound_order(page); - if (likely(order <= MAX_PAGE_ORDER)) { - low_pfn += (1UL << order) - 1; - nr_scanned += (1UL << order) - 1; + /* Skip based on page order and compaction target order. */ + if (skip_isolation_on_order(order, cc->order)) { + if (order <= MAX_PAGE_ORDER) { + low_pfn += (1UL << order) - 1; + nr_scanned += (1UL << order) - 1; + } + goto isolate_fail; } - goto isolate_fail; } /* @@ -1165,10 +1198,11 @@ isolate_migratepages_block(struct compact_control *cc, unsigned long low_pfn, } /* - * folio become large since the non-locked check, - * and it's on LRU. + * Check LRU folio order under the lock */ - if (unlikely(folio_test_large(folio) && !cc->alloc_contig)) { + if (unlikely(skip_isolation_on_order(folio_order(folio), + cc->order) && + !cc->alloc_contig)) { low_pfn += folio_nr_pages(folio) - 1; nr_scanned += folio_nr_pages(folio) - 1; folio_set_lru(folio); @@ -1788,6 +1822,10 @@ static struct folio *compaction_alloc(struct folio *src, unsigned long data) struct compact_control *cc = (struct compact_control *)data; struct folio *dst; + /* this makes migrate_pages() split the source page and retry */ + if (folio_test_large(src) > 0) + return NULL; + if (list_empty(&cc->freepages)) { isolate_freepages(cc); From patchwork Mon Feb 12 16:35:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zi Yan X-Patchwork-Id: 13553620 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 99BE8C4829C for ; Mon, 12 Feb 2024 16:35:20 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 25FE68D0005; Mon, 12 Feb 2024 11:35:20 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 1D3B28D0001; Mon, 12 Feb 2024 11:35:20 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 074B68D0005; Mon, 12 Feb 2024 11:35:19 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id D36ED8D0001 for ; Mon, 12 Feb 2024 11:35:19 -0500 (EST) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id A9C50140A3A for ; Mon, 12 Feb 2024 16:35:19 +0000 (UTC) X-FDA: 81783701958.05.D6B8001 Received: from out3-smtp.messagingengine.com (out3-smtp.messagingengine.com [66.111.4.27]) by imf15.hostedemail.com (Postfix) with ESMTP id 741F2A000C for ; Mon, 12 Feb 2024 16:35:17 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=sent.com header.s=fm3 header.b="se/Q6FkL"; dkim=pass header.d=messagingengine.com header.s=fm3 header.b=ImBydCTL; dmarc=pass (policy=none) header.from=sent.com; spf=pass (imf15.hostedemail.com: domain of zi.yan@sent.com designates 66.111.4.27 as permitted sender) smtp.mailfrom=zi.yan@sent.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1707755717; a=rsa-sha256; cv=none; b=4IHi7T/tt6FPuuNNX3AB7zNFFtqDc0mP8Nun25LOCr/gO/H+fzcYdukPzpTIGTp7WJIOFy OkgCGi3qYpWbLxYLD900sCLd0ihBKqsZRS/DRnbsGo/Ko+tCom76wyFjqABJ7h0HPL/L9j Hmc/CaT5u4ZLY+qmRfRbJ/r2Pl7hMMY= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=sent.com header.s=fm3 header.b="se/Q6FkL"; dkim=pass header.d=messagingengine.com header.s=fm3 header.b=ImBydCTL; dmarc=pass (policy=none) header.from=sent.com; spf=pass (imf15.hostedemail.com: domain of zi.yan@sent.com designates 66.111.4.27 as permitted sender) smtp.mailfrom=zi.yan@sent.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1707755717; 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=3/do+jCg6xGopLyF8AQICQ7f8a7A13gcREhu4u6OZjc=; b=L3/fZPI9IlK7q0ygLmufe6yOPlRfpbz4EzOFrbSCEv7/0A3742n+60XR5w+AcDwNIJ7D3Z vBBbCEAxrJCb2i6t5s8aVAhQ1i62kvk/qHJsBShuPB9oh43IYVdBcwerOdv3ltvuX/thGq pYAqjXBqSGAUBYqcGz0qtczU+y/u5As= Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id A7E3D5C00C8; Mon, 12 Feb 2024 11:35:16 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Mon, 12 Feb 2024 11:35:16 -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= 1707755716; x=1707842116; bh=3/do+jCg6xGopLyF8AQICQ7f8a7A13gcREh u4u6OZjc=; b=se/Q6FkLXP40qfmFo4pcJn3Eaf8WLvKiJATfnF5UEZg376oeDPb tM9SaoYp3P5N6F9m8lyknvvE58fCHA9T7MMh4i0pzRwU64MKpjaEcooaY519xvnE vHh//XgphuqWOQqe9lyCDODT6C3HyKN4bRt6xArsllfxhK6lndi130GrzwL/NJQh /G+gF7nJtiefXgKGA1Om4XlVsacE1kDbxhcMpE1HE9OyM8DKUpE6TWGvj0Jja17w Tq+74VDT1JGvvtLaxWbFD2fhcwZxjRYQaeIQCZIRQWvTG/BayNN8gngIzsd06PUZ iPApQP+xVk0X4eiJ4GoA2aThUFkcJlKGwCw== 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= 1707755716; x=1707842116; bh=3/do+jCg6xGopLyF8AQICQ7f8a7A13gcREh u4u6OZjc=; b=ImBydCTLVmiKMEGP2WjM5cX1xr393GEW9AVH42KHS5CLoSZI2SP nwmquPp4g478Szqz9juk4iz/6UlIB/4nX4DaHlFi9MzMGj2oT/GIX/r9QIh35UNh OUUvy96AwDUeX8AVa66U+Q7b2K2L1hEVd5xDURHhZa/3fMtYKAZcPGwGI+jMHi8j GLJ6QBlmrdUHTzDLNDHNSkG3jbLtHx1v8py/4QGYl9R4DDjSC7Bp0OcWinGINbRG m2xNBywaSOx5eu5zJr2HD8WZGpjT4TutGYMQh/t77b/1ZBlv8V++2ugaQbwJYz7P 0GfLbvFVTMDD6NWqXdiydWKKGlqt4PG/prg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrudefgdeklecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvfevufffkffojghfrhggtgfgsehtkeertdertdejnecuhfhrohhmpegkihcu jggrnhcuoeiiihdrhigrnhesshgvnhhtrdgtohhmqeenucggtffrrghtthgvrhhnpeejke etkeffleelkeduffdtfedvtdejjeeutdeutdetgeejgfevtdefudejkeeiveenucevlhhu shhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpeiiihdrhigrnhessh gvnhhtrdgtohhm X-ME-Proxy: Feedback-ID: iccd040f4:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 12 Feb 2024 11:35:15 -0500 (EST) From: Zi Yan To: linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Zi Yan , "Huang, Ying" , Ryan Roberts , Andrew Morton , "Matthew Wilcox (Oracle)" , David Hildenbrand , "Yin, Fengwei" , Yu Zhao , Vlastimil Babka , "Kirill A . Shutemov" , Johannes Weiner , Baolin Wang , Kemeng Shi , Mel Gorman , Rohan Puri , Mcgrof Chamberlain , Adam Manzanares , "Vishal Moola (Oracle)" Subject: [PATCH v4 2/3] mm/compaction: add support for >0 order folio memory compaction. Date: Mon, 12 Feb 2024 11:35:09 -0500 Message-ID: <20240212163510.859822-3-zi.yan@sent.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240212163510.859822-1-zi.yan@sent.com> References: <20240212163510.859822-1-zi.yan@sent.com> Reply-To: Zi Yan MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 741F2A000C X-Stat-Signature: cmdgqrazdkyfjfkmwj45ae4y63h8noej X-HE-Tag: 1707755717-200409 X-HE-Meta: U2FsdGVkX1/98PM4Dn5Kt555bqFeKfg1NTxduLnplrhyYPIOI2LB9dvySLOMrqhXNTopbo9FqlAsivS9tDM6wfyZhjKe8+N9sdti8D2UU1PiaAz7/KMrCpgLvI95EycWCN2S8CpZDzAselc/v2+tW1hUwjiayn+d40ffH7jOac1M771cvQyfUnc2Pw4V0lbFxEvAP1feVss3bq27bBul/1DN2w1E1AvqzcZi7Jaig3pZXgw3t400ccjQlBu8hOF6D27YyFHh7zvhwEChQu6QOv2xvTfBY6nX80kEa2UhbmsyesuJLz1DAmNFuOmvkvut3EpvOUsLyLf2NIabjrly3zNw+oSI7496ZK5U7wv1Yxyq9Q7I7e9OOuZ/MSN4h8FGfBE0Vsbl4s5WytptkbbgbPJeE3aFqXaTEiL0E75EioVGTJIcw+RoJoV4XON5SRCgL84O/JeqUXiDFfAJOUiT28bUO46LfGHGs7naCmFqXNk7SV25+32zNeVkes6hBaPwcd+bWc3Xt2ezAY7u2S+gsdoKsuQ374l8GeZCSviUvr9wi1XOa8jk+OYTTkHkfEGFSsfk3KP+PGz6KOHj1xlHZ/fuXZ2D2lCDbU37atRSyakek1g4kYiqBuCnToyl7ictRIaU6v6aZb8NibXRpK7I0xNIc55/CSLUTe9IhY2G/bRG1x+vTrFtbDz3eHc0YlKCpRSGtZP0G+cdOFVeGuEC3OQRxM8AIiNw9ndPTJTzzzZ3bY3quvCywDiImiQXeCwQwFmhbIHzM+VWuE+Z9mJlBoSDHOk0BMuSDN9PQl6AYjDdGJdVP5R+9ItMFc7eX5t0lBGFQEfEmUoryVN6X6unv3m9QdDxSYD+X2z0HpDaYbK4Jv8Zt62vmIdVuYff3ywoEzRfGB6t8P2olxWsCYoLa9BtXvFYVHKRvww9s7WClfIepgtfe6j4XiWKLhU5cK25/nKXz9Bd9k7qDXWZ5P1 UenWOTte IMy/76UNYkZLTYnBGMtGQ2P8GdllxvG8ScA33UgsINPJX7GdHaRLT4eDMlUp5ReVJjOhPXdLfJeGovmu9EqcoE66vIQ9OnkFf+WGvvn+BpSquJfADyFI2YrVtxdROpLWBN2JlZCmu2l9s5KusD7IjoI+Peax14B4V/2SpvlPzRfRMTwIXqmZtZLj5vyupDQDDB6GuRtmNLew+4rbTDfjHk/fjvzk1gs4adJtVSsZ9BWbvM8tlAFyO2WTj1N1VUrLd56spamjUFRrDRxd4cctbVldHh05WRKST7NiwVHIBGkkoLYbzzOn2qyBkMKmKCVDHMuS3y4sOqcsLqnRrgQdH3EB2bFHX+hRpX08Ux50CfW2VqZxZFDrOpHlMTOTnxKTd3aiz1QS1y3mDIegFlyrbrtAWvjdlcmLpANga6GEPWoK1+XjM1OzunCqHLY43Wx+qoRLBZL9ozGT5zrXewa7jDt0CSAMMt0xs/GjpTBxrB1SLOYVCJ6I70DgxP0c9zEWQsoFjoOwQNoKFUw8VW/Y/HnyyraVe/+8DHxJtgctarWbTrnUE3A40lrSoc43zd0Nk/VvXyNmkQZ1iTSpS+edvFyNYYBkzlvAr1Kxdcv5W8sxZ4B/PaN72YKU6oYtuiCUYz1KpeJJ1CnSo+SmKPY5ktW+bKQGwsJkxdXCaNb/dvGAIwXL8NW6GtZBs/iTJ5QsxbGq/eN5BHWQ7c/u0yiJE0Dv/wJgS9LZ7DAou/x/kTXrAm5R+LBHwF+7sCsE8u1Unacm6X31D10Jz0P8QZKBvan5HFObmnsPvloXzBQckum1z/Oihs1XCb+MFyEg0LkwJ0Gq2OMQRVygJW3RBbq9y5kXyTtD1OI7zMyb51gAHmuu9eVYqJW4LeFPfavv4IdxGRt85arzFu5bwTaK/nUdrJKQcFYB8wHnA/+4oKTCh44vjHhuUeyrLQjj5wjHww+yBjAqs19sOjAzgisqi7DomMOb89yjR jr5L2OVs w1nxM+wGv5o1N+/y3eEVqNsD6Ii/Oq6V 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 Before last commit, memory compaction only migrates order-0 folios and skips >0 order folios. Last commit splits all >0 order folios during compaction. This commit migrates >0 order folios during compaction by keeping isolated free pages at their original size without splitting them into order-0 pages and using them directly during migration process. What is different from the prior implementation: 1. All isolated free pages are kept in a NR_PAGE_ORDERS array of page lists, where each page list stores free pages in the same order. 2. All free pages are not post_alloc_hook() processed nor buddy pages, although their orders are stored in first page's private like buddy pages. 3. During migration, in new page allocation time (i.e., in compaction_alloc()), free pages are then processed by post_alloc_hook(). When migration fails and a new page is returned (i.e., in compaction_free()), free pages are restored by reversing the post_alloc_hook() operations using newly added free_pages_prepare_fpi_none(). Step 3 is done for a latter optimization that splitting and/or merging free pages during compaction becomes easier. Note: without splitting free pages, compaction can end prematurely due to migration will return -ENOMEM even if there is free pages. This happens when no order-0 free page exist and compaction_alloc() return NULL. Signed-off-by: Zi Yan Reviewed-by: Baolin Wang Tested-by: Baolin Wang Cc: Adam Manzanares Cc: David Hildenbrand Cc: Huang Ying Cc: Johannes Weiner Cc: Kemeng Shi Cc: Kirill A. Shutemov Cc: Luis Chamberlain Cc: Matthew Wilcox (Oracle) Cc: Mel Gorman Cc: Ryan Roberts Cc: Vishal Moola (Oracle) Cc: Vlastimil Babka Cc: Yin Fengwei Cc: Yu Zhao --- mm/compaction.c | 143 +++++++++++++++++++++++++++--------------------- mm/internal.h | 4 +- mm/page_alloc.c | 6 ++ 3 files changed, 91 insertions(+), 62 deletions(-) diff --git a/mm/compaction.c b/mm/compaction.c index aa6aad805c4d..d0a05a621b67 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -66,45 +66,56 @@ static inline void count_compact_events(enum vm_event_item item, long delta) #define COMPACTION_HPAGE_ORDER (PMD_SHIFT - PAGE_SHIFT) #endif -static unsigned long release_freepages(struct list_head *freelist) +static void split_map_pages(struct list_head *freepages) { + unsigned int i, order; struct page *page, *next; - unsigned long high_pfn = 0; + LIST_HEAD(tmp_list); - list_for_each_entry_safe(page, next, freelist, lru) { - unsigned long pfn = page_to_pfn(page); - list_del(&page->lru); - __free_page(page); - if (pfn > high_pfn) - high_pfn = pfn; - } + for (order = 0; order < NR_PAGE_ORDERS; order++) { + list_for_each_entry_safe(page, next, &freepages[order], lru) { + unsigned int nr_pages; - return high_pfn; + list_del(&page->lru); + + nr_pages = 1 << order; + + post_alloc_hook(page, order, __GFP_MOVABLE); + if (order) + split_page(page, order); + + for (i = 0; i < nr_pages; i++) { + list_add(&page->lru, &tmp_list); + page++; + } + } + list_splice_init(&tmp_list, &freepages[0]); + } } -static void split_map_pages(struct list_head *list) +static unsigned long release_free_list(struct list_head *freepages) { - unsigned int i, order, nr_pages; - struct page *page, *next; - LIST_HEAD(tmp_list); - - list_for_each_entry_safe(page, next, list, lru) { - list_del(&page->lru); + int order; + unsigned long high_pfn = 0; - order = page_private(page); - nr_pages = 1 << order; + for (order = 0; order < NR_PAGE_ORDERS; order++) { + struct page *page, *next; - post_alloc_hook(page, order, __GFP_MOVABLE); - if (order) - split_page(page, order); + list_for_each_entry_safe(page, next, &freepages[order], lru) { + unsigned long pfn = page_to_pfn(page); - for (i = 0; i < nr_pages; i++) { - list_add(&page->lru, &tmp_list); - page++; + list_del(&page->lru); + /* + * Convert free pages into post allocation pages, so + * that we can free them via __free_page. + */ + post_alloc_hook(page, order, __GFP_MOVABLE); + __free_pages(page, order); + if (pfn > high_pfn) + high_pfn = pfn; } } - - list_splice(&tmp_list, list); + return high_pfn; } #ifdef CONFIG_COMPACTION @@ -657,7 +668,7 @@ static unsigned long isolate_freepages_block(struct compact_control *cc, nr_scanned += isolated - 1; total_isolated += isolated; cc->nr_freepages += isolated; - list_add_tail(&page->lru, freelist); + list_add_tail(&page->lru, &freelist[order]); if (!strict && cc->nr_migratepages <= cc->nr_freepages) { blockpfn += isolated; @@ -722,7 +733,11 @@ isolate_freepages_range(struct compact_control *cc, unsigned long start_pfn, unsigned long end_pfn) { unsigned long isolated, pfn, block_start_pfn, block_end_pfn; - LIST_HEAD(freelist); + int order; + struct list_head tmp_freepages[NR_PAGE_ORDERS]; + + for (order = 0; order < NR_PAGE_ORDERS; order++) + INIT_LIST_HEAD(&tmp_freepages[order]); pfn = start_pfn; block_start_pfn = pageblock_start_pfn(pfn); @@ -753,7 +768,7 @@ isolate_freepages_range(struct compact_control *cc, break; isolated = isolate_freepages_block(cc, &isolate_start_pfn, - block_end_pfn, &freelist, 0, true); + block_end_pfn, tmp_freepages, 0, true); /* * In strict mode, isolate_freepages_block() returns 0 if @@ -770,15 +785,15 @@ isolate_freepages_range(struct compact_control *cc, */ } - /* __isolate_free_page() does not map the pages */ - split_map_pages(&freelist); - if (pfn < end_pfn) { /* Loop terminated early, cleanup. */ - release_freepages(&freelist); + release_free_list(tmp_freepages); return 0; } + /* __isolate_free_page() does not map the pages */ + split_map_pages(tmp_freepages); + /* We don't use freelists for anything. */ return pfn; } @@ -1494,7 +1509,7 @@ fast_isolate_around(struct compact_control *cc, unsigned long pfn) if (!page) return; - isolate_freepages_block(cc, &start_pfn, end_pfn, &cc->freepages, 1, false); + isolate_freepages_block(cc, &start_pfn, end_pfn, cc->freepages, 1, false); /* Skip this pageblock in the future as it's full or nearly full */ if (start_pfn == end_pfn && !cc->no_set_skip_hint) @@ -1623,7 +1638,7 @@ static void fast_isolate_freepages(struct compact_control *cc) nr_scanned += nr_isolated - 1; total_isolated += nr_isolated; cc->nr_freepages += nr_isolated; - list_add_tail(&page->lru, &cc->freepages); + list_add_tail(&page->lru, &cc->freepages[order]); count_compact_events(COMPACTISOLATED, nr_isolated); } else { /* If isolation fails, abort the search */ @@ -1700,13 +1715,12 @@ static void isolate_freepages(struct compact_control *cc) unsigned long isolate_start_pfn; /* exact pfn we start at */ unsigned long block_end_pfn; /* end of current pageblock */ unsigned long low_pfn; /* lowest pfn scanner is able to scan */ - struct list_head *freelist = &cc->freepages; unsigned int stride; /* Try a small search of the free lists for a candidate */ fast_isolate_freepages(cc); if (cc->nr_freepages) - goto splitmap; + return; /* * Initialise the free scanner. The starting point is where we last @@ -1766,7 +1780,7 @@ static void isolate_freepages(struct compact_control *cc) /* Found a block suitable for isolating free pages from. */ nr_isolated = isolate_freepages_block(cc, &isolate_start_pfn, - block_end_pfn, freelist, stride, false); + block_end_pfn, cc->freepages, stride, false); /* Update the skip hint if the full pageblock was scanned */ if (isolate_start_pfn == block_end_pfn) @@ -1807,10 +1821,6 @@ static void isolate_freepages(struct compact_control *cc) * and the loop terminated due to isolate_start_pfn < low_pfn */ cc->free_pfn = isolate_start_pfn; - -splitmap: - /* __isolate_free_page() does not map the pages */ - split_map_pages(freelist); } /* @@ -1821,24 +1831,22 @@ static struct folio *compaction_alloc(struct folio *src, unsigned long data) { struct compact_control *cc = (struct compact_control *)data; struct folio *dst; + int order = folio_order(src); - /* this makes migrate_pages() split the source page and retry */ - if (folio_test_large(src) > 0) - return NULL; - - if (list_empty(&cc->freepages)) { + if (list_empty(&cc->freepages[order])) { isolate_freepages(cc); - - if (list_empty(&cc->freepages)) + if (list_empty(&cc->freepages[order])) return NULL; } - dst = list_entry(cc->freepages.next, struct folio, lru); + dst = list_first_entry(&cc->freepages[order], struct folio, lru); list_del(&dst->lru); - cc->nr_freepages--; - cc->nr_migratepages -= 1 << folio_order(src); - - return dst; + post_alloc_hook(&dst->page, order, __GFP_MOVABLE); + if (order) + prep_compound_page(&dst->page, order); + cc->nr_freepages -= 1 << order; + cc->nr_migratepages -= 1 << order; + return page_rmappable_folio(&dst->page); } /* @@ -1849,10 +1857,22 @@ static struct folio *compaction_alloc(struct folio *src, unsigned long data) static void compaction_free(struct folio *dst, unsigned long data) { struct compact_control *cc = (struct compact_control *)data; + int order = folio_order(dst); + struct page *page = &dst->page; + + if (folio_put_testzero(dst)) { + free_pages_prepare_fpi_none(page, order); + + INIT_LIST_HEAD(&dst->lru); - list_add(&dst->lru, &cc->freepages); - cc->nr_freepages++; - cc->nr_migratepages += 1 << folio_order(dst); + list_add(&dst->lru, &cc->freepages[order]); + cc->nr_freepages += 1 << order; + cc->nr_migratepages += 1 << order; + } + /* + * someone else has referenced the page, we cannot take it back to our + * free list. + */ } /* possible outcome of isolate_migratepages */ @@ -2476,6 +2496,7 @@ compact_zone(struct compact_control *cc, struct capture_control *capc) const bool sync = cc->mode != MIGRATE_ASYNC; bool update_cached; unsigned int nr_succeeded = 0; + int order; /* * These counters track activities during zone compaction. Initialize @@ -2485,7 +2506,8 @@ compact_zone(struct compact_control *cc, struct capture_control *capc) cc->total_free_scanned = 0; cc->nr_migratepages = 0; cc->nr_freepages = 0; - INIT_LIST_HEAD(&cc->freepages); + for (order = 0; order < NR_PAGE_ORDERS; order++) + INIT_LIST_HEAD(&cc->freepages[order]); INIT_LIST_HEAD(&cc->migratepages); cc->migratetype = gfp_migratetype(cc->gfp_mask); @@ -2671,7 +2693,7 @@ compact_zone(struct compact_control *cc, struct capture_control *capc) * so we don't leave any returned pages behind in the next attempt. */ if (cc->nr_freepages > 0) { - unsigned long free_pfn = release_freepages(&cc->freepages); + unsigned long free_pfn = release_free_list(cc->freepages); cc->nr_freepages = 0; VM_BUG_ON(free_pfn == 0); @@ -2690,7 +2712,6 @@ compact_zone(struct compact_control *cc, struct capture_control *capc) trace_mm_compaction_end(cc, start_pfn, end_pfn, sync, ret); - VM_BUG_ON(!list_empty(&cc->freepages)); VM_BUG_ON(!list_empty(&cc->migratepages)); return ret; diff --git a/mm/internal.h b/mm/internal.h index 1e29c5821a1d..9925291e7704 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -447,6 +447,8 @@ extern void prep_compound_page(struct page *page, unsigned int order); extern void post_alloc_hook(struct page *page, unsigned int order, gfp_t gfp_flags); +extern bool free_pages_prepare_fpi_none(struct page *page, unsigned int order); + extern int user_min_free_kbytes; extern void free_unref_page(struct page *page, unsigned int order); @@ -481,7 +483,7 @@ int split_free_page(struct page *free_page, * completes when free_pfn <= migrate_pfn */ struct compact_control { - struct list_head freepages; /* List of free pages to migrate to */ + struct list_head freepages[NR_PAGE_ORDERS]; /* List of free pages to migrate to */ struct list_head migratepages; /* List of pages being migrated */ unsigned int nr_freepages; /* Number of isolated free pages */ unsigned int nr_migratepages; /* Number of pages to migrate */ diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 7ae4b74c9e5c..e6e2ac722a82 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -1179,6 +1179,12 @@ static __always_inline bool free_pages_prepare(struct page *page, return true; } +__always_inline bool free_pages_prepare_fpi_none(struct page *page, + unsigned int order) +{ + return free_pages_prepare(page, order, FPI_NONE); +} + /* * Frees a number of pages from the PCP lists * Assumes all pages on list are in same zone. From patchwork Mon Feb 12 16:35:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zi Yan X-Patchwork-Id: 13553622 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 0F70EC4829C for ; Mon, 12 Feb 2024 16:35:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 139CD8D0006; Mon, 12 Feb 2024 11:35:21 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 0E9368D0001; Mon, 12 Feb 2024 11:35:21 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E7F578D0006; Mon, 12 Feb 2024 11:35:20 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id D8BF38D0001 for ; Mon, 12 Feb 2024 11:35:20 -0500 (EST) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id A84C7A137A for ; Mon, 12 Feb 2024 16:35:20 +0000 (UTC) X-FDA: 81783702000.23.506A4FE Received: from out3-smtp.messagingengine.com (out3-smtp.messagingengine.com [66.111.4.27]) by imf11.hostedemail.com (Postfix) with ESMTP id 52ECC40014 for ; Mon, 12 Feb 2024 16:35:18 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=sent.com header.s=fm3 header.b=HlmOQr9q; dkim=pass header.d=messagingengine.com header.s=fm3 header.b=J2YOywBV; dmarc=pass (policy=none) header.from=sent.com; spf=pass (imf11.hostedemail.com: domain of zi.yan@sent.com designates 66.111.4.27 as permitted sender) smtp.mailfrom=zi.yan@sent.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1707755718; 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=/EqPdua3wUu7egs9hj3joQyCeB5KILvG5+17pYfAKJw=; b=ao+4JGgWSx9UmfbheG+EHDEpG3z18GFCJV/NSFtn8JqJHwTLQoIsoqw1DibkZOwhsv1fz5 bw2SfqYjRjV1iRBaHjyY33VQ7c2jHCL0oTWzlW5vmNZW9z4WQvmiLMMGyNtB9fivaxOWpz Oj6Q5SoIDZj9nmDjq0AXOY1DawR5iFY= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=sent.com header.s=fm3 header.b=HlmOQr9q; dkim=pass header.d=messagingengine.com header.s=fm3 header.b=J2YOywBV; dmarc=pass (policy=none) header.from=sent.com; spf=pass (imf11.hostedemail.com: domain of zi.yan@sent.com designates 66.111.4.27 as permitted sender) smtp.mailfrom=zi.yan@sent.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1707755718; a=rsa-sha256; cv=none; b=4CmhGgGcW/5xS2i2BDnxNLXhZ8BGUJ815YWJg246nXD2SwqTrT3RUz8Ywr1plj5Qjf+/jX qwkos5y9+oDhoNn7KgpQva2fXXXeAeE00wiDiEeSE5IMbUvZ68N5zF93NxLdUQlwqKMBK5 zZ4xtKv+davhT9UesvwAC4DibnXWxgw= Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailout.nyi.internal (Postfix) with ESMTP id 8F20A5C00CA; Mon, 12 Feb 2024 11:35:17 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute6.internal (MEProxy); Mon, 12 Feb 2024 11:35:17 -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= 1707755717; x=1707842117; bh=/EqPdua3wUu7egs9hj3joQyCeB5KILvG5+1 7pYfAKJw=; b=HlmOQr9qvHE0N6b7r3vJLZNcb3UVrG8RUx4z6QwPWhLBya5sAT9 V/S8Zqpwle9MkAqKRpupK3V2y9nYsva6hSKmft+SWN0zTIoSACDHPIyodradZMjy g+GChb5rZTZ44gfLzd7CUhTC0ssGdm7FJ4mYXHBBtjFA0hDoYMWCuOFobhFSSMaK my8JWVzC16TrYyZO0HNWwVqcee9zpknq/X4JA2fQlF2BU5e2k/PCfbhgTnkzNt2i 2hZBq9/vVwdpRqc9Jw3Ba02aMdxcuP6xjPriauzPyPw+VO5OH8Q9t/KqKNte/okX gxJiwWJoFaUX3BdyN2TVc42jIOZnVCM3oNg== 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= 1707755717; x=1707842117; bh=/EqPdua3wUu7egs9hj3joQyCeB5KILvG5+1 7pYfAKJw=; b=J2YOywBVYcHvZh7SL9Ztx6GaM3mrxWauzT0f5e3Y4/dspDxc67z 0VnElepBVZ/VU9ofd0CW9IdSk+E7tGKMbk72o8MDHt4nIP/V3BV1+7XRh8zkGLZi Qwjkb6t/nNlSuJseIqlikcvWUbzFbWnXQJ+MheLqK7u1DlXuf28jrhHStz07sqFi 0GW/1LGHaNq5478fa5nBMOQpSzr6nmCKNpj7n/tRqAbB07H0Iwze+SKx5tyt2Blm H0L4gRsQaUbjFFUNrwbG1TrzHq5cqxNGBkLFKaCIgBOOftaOWtNkzNsfxoiCkguE JICNz/Blga59c1UaxavgBIMUYrtQMc6AtlA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrudefgdekkecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvfevufffkffojghfrhggtgfgsehtkeertdertdejnecuhfhrohhmpegkihcu jggrnhcuoeiiihdrhigrnhesshgvnhhtrdgtohhmqeenucggtffrrghtthgvrhhnpeejke etkeffleelkeduffdtfedvtdejjeeutdeutdetgeejgfevtdefudejkeeiveenucevlhhu shhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpeiiihdrhigrnhessh gvnhhtrdgtohhm X-ME-Proxy: Feedback-ID: iccd040f4:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 12 Feb 2024 11:35:16 -0500 (EST) From: Zi Yan To: linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Zi Yan , "Huang, Ying" , Ryan Roberts , Andrew Morton , "Matthew Wilcox (Oracle)" , David Hildenbrand , "Yin, Fengwei" , Yu Zhao , Vlastimil Babka , "Kirill A . Shutemov" , Johannes Weiner , Baolin Wang , Kemeng Shi , Mel Gorman , Rohan Puri , Mcgrof Chamberlain , Adam Manzanares , "Vishal Moola (Oracle)" Subject: [PATCH v4 3/3] mm/compaction: optimize >0 order folio compaction with free page split. Date: Mon, 12 Feb 2024 11:35:10 -0500 Message-ID: <20240212163510.859822-4-zi.yan@sent.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240212163510.859822-1-zi.yan@sent.com> References: <20240212163510.859822-1-zi.yan@sent.com> Reply-To: Zi Yan MIME-Version: 1.0 X-Rspamd-Queue-Id: 52ECC40014 X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: agniahda34ze11whitgxsiy6sryarw3q X-HE-Tag: 1707755718-303908 X-HE-Meta: U2FsdGVkX1/9L5+ebMPckeuFfYN8KgD+cwF0HP05ZYZIze3x5de9sn9uNIP6OBnMVMI/y6B0zAO5ATMIBzAgt47n11czJnyKdzXIIUl+tK7s/cMCY9Xhv+TmsOgaF8B3rCkvDKGD7h8gPiwJTmbbI3a01mvUC9bPJguUnfXP/BvNOokWtcOryJ5E2C7ilw48aS1+FS7srt7GoKUZOlvls/55PZqsuLtQE78dgXZqC+11V5vcaHLl4AFh35oQxOxZEY3qI2R+w9Pvi2myWo0N1/P20uSXpsRIMOy5EcAs66E+Fk7Yk2+q3Cw/o2W9IjCGysUKBTc03gsF8TYdzPi4QiK7FWSd8Op6M2UmbewcPI1U4mfaJjriFPmP2axPOqG1ZlYUqG5s7c60EVdLiwdFqLirgL8wKvQxwC725Lw8z8hmIzE7GdAj/Ub3kBec3ElhMEN0xxx3h5VYkbHMNuGTXq02fDvQcPGeBLvze/GY0B10tkolU0FsghhRalIjNC8qqH/MXyS7c+3WjgPvrY+uONsUG27UhNpbvkRhG3Ylar6ekfklNd7A5uqzldVinPgmTi6QMrAVpqBhJuLFf1q26mqVmSxm8KZ9y7yeL9kCNRPcnbtWeMSdX+216QLjlP8WjoSaocV4xh6ZrweffsxwY8kbtmp+/ZZWHzZD+dri7C+3MRfIaJ0uR0wRcTV98+t7wuliSQxi/NilsTrk87RPQ1E/lGlj55M5uqCwiR5C89ltmG41vNawYkBm8eNPJKpoFHPBs9UqouHcNFCAfD6qAKhDZoAhGyO5ucd1Bd2seMBU50i3z5F/uIShGr6YnzmEztq4KuwvaBO1p3Gu1+1FJhbC730u3gAo/WXQiTnbWtI03gg6tcb/F3TrzQeShgOh4ibuy+BgqSATkhVsPAa/S/TwXjuD3Enq2BKVfGMUknjrZhhivy458ny4uMogo4MJ0mIQHvhF4yAMzbR4Pwy KZP8jEa4 Pp6weK4lWT6muEixXGlAj2r0l6IuvcJ2K+B8IdEf8z+K4eVsYewyIGZWX2HWFAl6K3ukMF8HVP4l1eoY/6tJBgvSPaioMRGPfV9FTF4atwRvbIpuKMCXs1r2CSHXZWHdXnEyg7y/jiNOKNO0GnhLjS7WU6VMED2Rai6V+Gb0ZkMuoonoJLyfeIYIkY2QyYxekCDAe6JFnJEqYnIxME9Vz9PMmwXyiKxZWaKXwgnR/0UgOUP0UQVEVPFiN2k7LVLx1uxcxgGE1fJYfK1zNg5x6Rlx2FXGLxy7C2tUF3N8V6JAnwJiIqYUEayLPkgKSwFjST5M5h9OpYuT96Xxw9McqcHuaX67etU5swZve78AexhLBq11h9XsTFe6/GCYlJO35NWmRonIQ3i5jIAa+18NJRyDw9DWaGLdpFtsGmBDkmFeDsQJUkikhyma8D4jfqstNaKhKGYyIy3raps1XHddv713yLDDoq6VjvdfP8dECR0ianiBj8vcE0F1xHjp6X7EKcnHd2lbUzeuL6bYl3+KV1ysWQDJ8kz9Jp4yM28qVMYjyF2Lb24mnnwrNIZ1wc5BAv/7nsqGy/geqYpT1kx0qyS50iID7UgWxcHl8k62EbCovvekm+jQn7i1kWuvf35ntzBd3Dv66ID6R/d/ewM5PgJu3fLUlOcOK5rX65u/AnMv2rIovzZE0q7KovooMxPaphqQQOwNo4ASQ0LBS0WHF8LQktm0tpgJx6WTH602a7qcvTJWSUma0Q7wdPb+C+PR9Rf+y3/130ZXhO+t+ZX+k6I+QGapu5c75fxU+34SC6kz7OFwzxwkacgqo9JY07EHrP9wAgFFeQ7jexrTxtJKnVqYfySVLmZn3xY1iOV+vfcUgvBPBfy6OOPIEGZhV2jcb5WnrUAFk2WRIzj27cAoTIIhK3I0jJH7Htosaupdkbq4UY0xkU6RpSSqxJhs+FeecoZLZ7NCuHzj9pjtTlqLFDEW9fdR1 XWDnkGH9 ZfNyGWDh+EF2KOX7cQ58ONKmAuDiT6Xz 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 During migration in a memory compaction, free pages are placed in an array of page lists based on their order. But the desired free page order (i.e., the order of a source page) might not be always present, thus leading to migration failures and premature compaction termination. Split a high order free pages when source migration page has a lower order to increase migration successful rate. Note: merging free pages when a migration fails and a lower order free page is returned via compaction_free() is possible, but there is too much work. Since the free pages are not buddy pages, it is hard to identify these free pages using existing PFN-based page merging algorithm. Signed-off-by: Zi Yan Reviewed-by: Baolin Wang Tested-by: Baolin Wang Cc: Adam Manzanares Cc: David Hildenbrand Cc: Huang Ying Cc: Johannes Weiner Cc: Kemeng Shi Cc: Kirill A. Shutemov Cc: Luis Chamberlain Cc: Matthew Wilcox (Oracle) Cc: Mel Gorman Cc: Ryan Roberts Cc: Vishal Moola (Oracle) Cc: Vlastimil Babka Cc: Yin Fengwei Cc: Yu Zhao --- mm/compaction.c | 36 +++++++++++++++++++++++++++++++----- 1 file changed, 31 insertions(+), 5 deletions(-) diff --git a/mm/compaction.c b/mm/compaction.c index d0a05a621b67..25908e36b97c 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -1832,15 +1832,41 @@ static struct folio *compaction_alloc(struct folio *src, unsigned long data) struct compact_control *cc = (struct compact_control *)data; struct folio *dst; int order = folio_order(src); + bool has_isolated_pages = false; + int start_order; + struct page *freepage; + unsigned long size; + +again: + for (start_order = order; start_order < NR_PAGE_ORDERS; start_order++) + if (!list_empty(&cc->freepages[start_order])) + break; - if (list_empty(&cc->freepages[order])) { - isolate_freepages(cc); - if (list_empty(&cc->freepages[order])) + /* no free pages in the list */ + if (start_order == NR_PAGE_ORDERS) { + if (!has_isolated_pages) { + isolate_freepages(cc); + has_isolated_pages = true; + goto again; + } else return NULL; } - dst = list_first_entry(&cc->freepages[order], struct folio, lru); - list_del(&dst->lru); + freepage = list_first_entry(&cc->freepages[start_order], struct page, + lru); + size = 1 << start_order; + + list_del(&freepage->lru); + + while (start_order > order) { + start_order--; + size >>= 1; + + list_add(&freepage[size].lru, &cc->freepages[start_order]); + set_page_private(&freepage[size], start_order); + } + dst = (struct folio *)freepage; + post_alloc_hook(&dst->page, order, __GFP_MOVABLE); if (order) prep_compound_page(&dst->page, order);