From patchwork Fri Feb 16 17:04:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zi Yan X-Patchwork-Id: 13560347 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 97EEBC48BEF for ; Fri, 16 Feb 2024 17:04:52 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E6F718D0014; Fri, 16 Feb 2024 12:04:50 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id E10B48D0002; Fri, 16 Feb 2024 12:04:50 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C63F68D0014; Fri, 16 Feb 2024 12:04:50 -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 B1DE78D0002 for ; Fri, 16 Feb 2024 12:04:50 -0500 (EST) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 8F110120314 for ; Fri, 16 Feb 2024 17:04:50 +0000 (UTC) X-FDA: 81798291540.05.1EEB8EA Received: from out1-smtp.messagingengine.com (out1-smtp.messagingengine.com [66.111.4.25]) by imf13.hostedemail.com (Postfix) with ESMTP id 7A09F2000F for ; Fri, 16 Feb 2024 17:04:48 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=sent.com header.s=fm1 header.b=KeWgkpLH; dkim=pass header.d=messagingengine.com header.s=fm1 header.b=nA9WCOef; spf=pass (imf13.hostedemail.com: domain of zi.yan@sent.com designates 66.111.4.25 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=1708103088; 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=WD56Myi2ma1dKYxOJWeOyvZTZc0rVPwnTQ4cjyMsISI=; b=lxYKvNQlmADQVm83Db3FbkWzUfL74gO0c+G0Tzz7tyYylU1h738trJLgTML8XzQxWACWJy mR2WnEHwit9zv3KZ+9HTMcxA2fi25wCNKDpGC6+cZKszaeCEW5WjLCjNWSRpWI9UEx/yNQ idJ2SFVD7uVo7xIQX/LmYOD9VJ0EuG0= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1708103088; a=rsa-sha256; cv=none; b=khl2tn5DgyZkN24OzH7AGFzecmUTutAwpDTo3J28Cpe2PLjBy02A76iFcwf+IR7IqU1MS8 O8Raq80A4UUvKCC6aUBcdH7FY4DwX8EbtpnHaIIGobTAgHKf6BsQ+9N54QjtywatzzRk5n qFgyLTP5XK3fVu0/NUv3rcUqtD/e5Wo= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=sent.com header.s=fm1 header.b=KeWgkpLH; dkim=pass header.d=messagingengine.com header.s=fm1 header.b=nA9WCOef; spf=pass (imf13.hostedemail.com: domain of zi.yan@sent.com designates 66.111.4.25 as permitted sender) smtp.mailfrom=zi.yan@sent.com; dmarc=pass (policy=none) header.from=sent.com Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id C12E75C0032; Fri, 16 Feb 2024 12:04:47 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Fri, 16 Feb 2024 12:04:47 -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=fm1; t= 1708103087; x=1708189487; bh=WD56Myi2ma1dKYxOJWeOyvZTZc0rVPwnTQ4 cjyMsISI=; b=KeWgkpLHvEgib+nAV2iSIRK1oPhtFJyIarQ2y/xOs5yYd/BGSPz uimtlyTVya0vqRic9W7BfgqjjY/LiexKL75iLtAUb85dLjtGN25wGGAlDaLiQk6c WUFjKBSoUHSGYwyDxL4/B5/EZlmvfLjjqnqSzLtGWJ+zhHfTU9pGWlFeGmNhlSj/ Zcfc0IBHI4hlVFRbnFLGfZ0xDWKz4kJqM74Go/BaWahS+1feW0dSN8W5DCijwwNS Rm3mPzCcdqxQnCZ0Xk42Mq4B9po52QwbtXkezGK10XmaF8hxeNF9oNzD6UZswpm6 OwwYof0mMUOaovwZeY/Arq5YQqj5aH3ZgHg== 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=fm1; t= 1708103087; x=1708189487; bh=WD56Myi2ma1dKYxOJWeOyvZTZc0rVPwnTQ4 cjyMsISI=; b=nA9WCOef4yROrcXUY6gTn/Rl5akvLP8BE1kABzdgqYYdWRfoOUS 7TwaSNJI/uFo5/U1YOQLzow4T/pS8+OLFS/o/s8lNY5EUzoupMI5myGgUovIa2jX yuKRRDYn5DRzsNd4V3HE0f/RUaNIui4QMdOQ8DRjp1Ql3NXakxOmuoEdVuafF5xq BAfsVpiMWNsQv+2T59MPucgsAzhdTXWgw0TkXbMOhWsYMqYwkBg9zQJol2c/63N+ H76UfoGN4mLp/0SyxB+hnvOHXyY5Vo/hVfm1nQfsVqqSTCPUbyc4pPw7YEFFPbJ1 wLEKWg5SZdqRFHjWVTzTj+rxP1oKJmEUGzQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrvddvgdeliecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvfevufffkffojghfrhggtgfgsehtkeertdertdejnecuhfhrohhmpegkihcu jggrnhcuoeiiihdrhigrnhesshgvnhhtrdgtohhmqeenucggtffrrghtthgvrhhnpeejke etkeffleelkeduffdtfedvtdejjeeutdeutdetgeejgfevtdefudejkeeiveenucevlhhu shhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpeiiihdrhigrnhessh gvnhhtrdgtohhm X-ME-Proxy: Feedback-ID: iccd040f4:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 16 Feb 2024 12:04:47 -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 v6 1/4] mm/page_alloc: remove unused fpi_flags in free_pages_prepare() Date: Fri, 16 Feb 2024 12:04:29 -0500 Message-ID: <20240216170432.1268753-2-zi.yan@sent.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240216170432.1268753-1-zi.yan@sent.com> References: <20240216170432.1268753-1-zi.yan@sent.com> Reply-To: Zi Yan MIME-Version: 1.0 X-Rspamd-Queue-Id: 7A09F2000F X-Rspam-User: X-Stat-Signature: hcn5a9cm5k5qm3ck15wdtc689rwjbsna X-Rspamd-Server: rspam03 X-HE-Tag: 1708103088-198391 X-HE-Meta: U2FsdGVkX18aP9XEQsZE6GO/RcMcH5DAMuW7leYC1q/f34Uq1ELyFJfQhPQtQn2v/ZebuxT29C+LvpVw+i0L/Jkk/ukfq93IMiIjzyXxmkGFlp1qW1aOlCVe6rO0VVHx+Lp3/Fnrm0ARan+xQ9MrYEAcZk4oi5KyInWzxk6bruZi2DDr0ZwzocPMTyruq+0xjBmAd3dBjDoWSeFZZyrOICpx/DlBOCoiPcsg25HNUExonEWlu1oiKF9zYejtLbcmcCCkyGKfdZfQuYG2c0KGorW8E6RVyhAPuQS2PSE4xQsE5tigWXMtFK2xyHxSBEKpZMx3cuMUQewHv60lOP+sK/Vvc0WcpL3rtQUumkP1llls+OnrX0VDVC2j63y+Yuv+RKIq7faMXgJ5SS207nDSchllbbko6BBSQxlJlyegReDmdU5C5dnLxkiKo9EkJ4dLShlHuWb5m/0jV1mteSzcsg+TJ0IeSVqNE0cOc5KElL5IycEChyTs5UKyIgidjxOkMDzUbt6TBu/dE1XY6miL9dJnu+dzYhOJW3ZWn8RV+WL2A5WGhtUJLYxgYQFc7qHtpSzBH5+06/5LytYIz5Q4TWvPGwRmZqqnMd/qTzBXq6TsOJcP4YoLESPzfUorpD58m3wCPqIY+f3lAikjivkQbFsf1IxI13008Ma1LqOoNdFirtaK8ohiwa11W3qb61yk1hNwRE3DCXze2bLmYoEioXc6EbMw5jzAa6iKgcOI7MIjDTcCFbWCX3F6aSH+fqWUDvMOQ24D4FTs2JCmw57AqrZyW+8WoNNG+fR55OHiGAIZxR69p7cLW2VNvDOiSzYCbt5frYC29FRfk/k6RploW1OS45EO0WBrqHjxhYR0zX4qmLFfKRyLvRP0swpcy599dARiDNGrznmgw7QY9RUlJk/QFnoRu/AjGsJ8szGaGFg4JE+Ikcxc0w8dgQPYjyhI82Yz6BOt4ZmMMXMhFJJ v3L78lBp TNodsIatsL7TodFEjim9+hN8p5/jbc6z5r9yA+4DL1+ZDCR/UmEPg607HmAjQ5uNPnBqE6nd0nQ87R+MC50+WTuMaIUwa0bsuzXLIU27VVkXoP4GDEO39WA9gH9SqOUjSQiEUTLWMxP8pi8Yiym8Uaiz7f9CkBl8o6txz/Ps6FI4kUB+lDcx4l3rei1MjjZ6mX/t5OU0Cg+htL1eamJM9mnXS7359xP36gNbA 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 fpi_flags is only passed to should_skip_kasan_poison() but ignored by the function. Remove the unused parameter. Signed-off-by: Zi Yan Reviewed-by: Vlastimil Babka Reviewed-by: David Hildenbrand --- mm/page_alloc.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 7ae4b74c9e5c..70c1ed3addf3 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -1061,7 +1061,7 @@ static int free_tail_page_prepare(struct page *head_page, struct page *page) * on-demand allocation and then freed again before the deferred pages * initialization is done, but this is not likely to happen. */ -static inline bool should_skip_kasan_poison(struct page *page, fpi_t fpi_flags) +static inline bool should_skip_kasan_poison(struct page *page) { if (IS_ENABLED(CONFIG_KASAN_GENERIC)) return deferred_pages_enabled(); @@ -1081,10 +1081,10 @@ static void kernel_init_pages(struct page *page, int numpages) } static __always_inline bool free_pages_prepare(struct page *page, - unsigned int order, fpi_t fpi_flags) + unsigned int order) { int bad = 0; - bool skip_kasan_poison = should_skip_kasan_poison(page, fpi_flags); + bool skip_kasan_poison = should_skip_kasan_poison(page); bool init = want_init_on_free(); bool compound = PageCompound(page); @@ -1266,7 +1266,7 @@ static void __free_pages_ok(struct page *page, unsigned int order, unsigned long pfn = page_to_pfn(page); struct zone *zone = page_zone(page); - if (!free_pages_prepare(page, order, fpi_flags)) + if (!free_pages_prepare(page, order)) return; /* @@ -2379,7 +2379,7 @@ static bool free_unref_page_prepare(struct page *page, unsigned long pfn, { int migratetype; - if (!free_pages_prepare(page, order, FPI_NONE)) + if (!free_pages_prepare(page, order)) return false; migratetype = get_pfnblock_migratetype(page, pfn); From patchwork Fri Feb 16 17:04:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zi Yan X-Patchwork-Id: 13560348 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 5F7E9C48260 for ; Fri, 16 Feb 2024 17:04:55 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 539C58D0017; Fri, 16 Feb 2024 12:04:54 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 4EA738D0002; Fri, 16 Feb 2024 12:04:54 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 33CAD8D0017; Fri, 16 Feb 2024 12:04:54 -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 19D378D0002 for ; Fri, 16 Feb 2024 12:04:54 -0500 (EST) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id A6289402EE for ; Fri, 16 Feb 2024 17:04:53 +0000 (UTC) X-FDA: 81798291666.15.EE0B402 Received: from out1-smtp.messagingengine.com (out1-smtp.messagingengine.com [66.111.4.25]) by imf03.hostedemail.com (Postfix) with ESMTP id 727AF2002E for ; Fri, 16 Feb 2024 17:04:51 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=sent.com header.s=fm1 header.b=ko4K3rk2; dkim=pass header.d=messagingengine.com header.s=fm1 header.b=qgfQCRP5; spf=pass (imf03.hostedemail.com: domain of zi.yan@sent.com designates 66.111.4.25 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=1708103091; 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=+doHrWMX2AVjOxCrYcWaACj3dxXZqOZangVROH6gYto=; b=IvFn8F2bZFdLVO1BZHsRbGZKkdrvq52j+so6iynliGa2U6gS8b0m2Q+pg4weBx956CcbAb rCuJodDmibSFtgRn58/GJR5F6qcoVFDQ9KNCPy8GcjQBASGH7h/ei1hd0FVU/kTE3brq5n IGqdaURzpBr9ZtWt6fjUX71TBmhXwNU= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1708103091; a=rsa-sha256; cv=none; b=XX3YlHQVAJbdQS1J54ryJ01DY1/N8U5FZIlxi8Sj8pGqIxvlqk0k2ynoSAwfdmb8LokvMV wrcXnJfP1nWEg/0KUbSoaKrKgTpGgakK7AWaT7FzuErj7GQKX5lAc/yJjM6ig2Dm4tIZy1 gUXDpLMpMEKFAAcN3B1IuTuDv5tjYVA= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=sent.com header.s=fm1 header.b=ko4K3rk2; dkim=pass header.d=messagingengine.com header.s=fm1 header.b=qgfQCRP5; spf=pass (imf03.hostedemail.com: domain of zi.yan@sent.com designates 66.111.4.25 as permitted sender) smtp.mailfrom=zi.yan@sent.com; dmarc=pass (policy=none) header.from=sent.com Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id A355E5C009C; Fri, 16 Feb 2024 12:04:50 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Fri, 16 Feb 2024 12:04: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=fm1; t= 1708103090; x=1708189490; bh=+doHrWMX2AVjOxCrYcWaACj3dxXZqOZangV ROH6gYto=; b=ko4K3rk2g+mrEQbTGfvy/IoeGbtndA10HCmGrX6ZBtcKPPtBtmT 9LaRVxlDcb81bTq/B6JKEfTj0gCUyY/09qsnrLNmSWu0fJfzBKl+r+N7hGehbV2D 7joQdvSWDxEWjTYywpwgts3JDLO1Bnxgs4q7zjVkES4oSRsGHAO0evn2ipnoUiWT CTwaQqhvmPadH8fnZ5lZNN+TTjPTka0U7WHOirLr97H9oJHc74BbEb8hFUT1i/S1 gNau3uupUOetpVvyVlkyGiGoQC5dCqDAnfQMdDvkpl7LjzKLvqHyVKdnUvJhOTwI LJ/ofpw/r5sFrWKmzvfDXYaZMDGoqyJUFmg== 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=fm1; t= 1708103090; x=1708189490; bh=+doHrWMX2AVjOxCrYcWaACj3dxXZqOZangV ROH6gYto=; b=qgfQCRP5yc+VoPEksHSAB8Efae6JHt8FyDzmpfmb6aE6OVR6fsu o58jzMAEDbkzYZWozsaSClSp7LCI2wa0UkI/tXVALveXxZMu7PlLvcMoD3ZFAuhI x+tK9PYeHp0r6IZJ9kOf6w85wl/wUXQqSCy24i4jrrEiyFQWhKT9w+ZXeOr9J7wa HobdQOTKH6m77luNHiVbfb11c7ETZCjpMV48bpe5gxJAD794fI4itPyVDw6/FnOj 0jYPhx++z0pZe5cvQFcxm2ZVhKJm99zbJHuQxIz7MdYqVzPe3TZ2Fr6CW1zM7kqf Kl7OHb4N/oW3SF9IzhZ0BWfYSwN7Qrge5Ew== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrvddvgdeliecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvfevufffkffojghfrhggtgfgsehtkeertdertdejnecuhfhrohhmpegkihcu jggrnhcuoeiiihdrhigrnhesshgvnhhtrdgtohhmqeenucggtffrrghtthgvrhhnpeejke etkeffleelkeduffdtfedvtdejjeeutdeutdetgeejgfevtdefudejkeeiveenucevlhhu shhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpeiiihdrhigrnhessh gvnhhtrdgtohhm X-ME-Proxy: Feedback-ID: iccd040f4:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 16 Feb 2024 12:04:47 -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 v6 2/4] mm/compaction: enable compacting >0 order folios. Date: Fri, 16 Feb 2024 12:04:30 -0500 Message-ID: <20240216170432.1268753-3-zi.yan@sent.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240216170432.1268753-1-zi.yan@sent.com> References: <20240216170432.1268753-1-zi.yan@sent.com> Reply-To: Zi Yan MIME-Version: 1.0 X-Rspamd-Queue-Id: 727AF2002E X-Rspam-User: X-Stat-Signature: rh771hrgipikc3p64t9ka3uyt6aixd6n X-Rspamd-Server: rspam03 X-HE-Tag: 1708103091-4460 X-HE-Meta: U2FsdGVkX18splZvmQfoMqC+vgSYS3qgGAGvR7Qlzn2Zffa3yP3P1rMRwJZDMBHcz3/bL5hqg7WPQ1ONVMqJG8JW1KRxgRYWCwHunGSn50ZPQbfZLDPNy96DdzGri2z0xfltV181dxibuUBI/WlG2xU+UG0y+5GjYvphNlzhfr9qaB79icPknc65/2jvTvcWy8awlRVRghcclr+0zIxvb0bVAtKxgm0wV6NiPqnHayeGEc4xRRSRRcIPTydeOE/rD3ZJkZnKFcGiOz/Zxthr5H6DztQofo1uu5YN1Pl7qe2rODP3p3trLxtMS/DxCUu0rIKLsAsJJKIFhA5z8pOg2//wq9kJPP0DHwKyiQviQuwjJ7jCQCOGrKRC7BUxU35Uh8WYe/yb2uZZKrl1sDep17LZolXbK2zAsk2Gbp6TrGyHBInx0bm5KQqmjLfP8aHEfWiiBsdXKGf0r0sE8+ZYTxSMouSZvSuAFmXavg6iksKp3K6hKXLKVCmlGVLpvcI2CxJQL4LyDRKZW+79PXJy6h++U/qFTrsARYB0vP53t6jYyxBpQjptKZMJ15qW9gqB95nXN3EEjF68ZKnj9cpJdXnjsr7vbP1ICgJ+1IbPV8Y59U6I+4mwE1wZpHPuupXWICOf7cR997FpWlxKuwBmNO1e2BE0G/xvEipiVROaEXCstDGKamZT7U4dAeotWUq8FfMbH9o7iisrQ1kc8LO7fWhkzqXuTyr8t/UNkWbDxui42Mpm7Dhdrxmi+PP0xQaUdQ1/KR0NORyX3t2XCgcqh+AR1hZ6Bwb52E1dsVAozmZAHGTLmTqWNBqB0lljnZE1YnDqY0557gmbHQEtan2fdfMrHA4wq3WQs3qnzhMmWaLjAvUIUksa2KXLKV4qgYzvJ5XTKXacBA8bkvLLUUhKGjGf62L/QGI138FgyP7TpLHniwZ7pVCzw8ONwsy73THd2j74NLB8IMw6gCTFKCh n0FjNlIv 5Ar8qqIGb3u3IbQjC0yD4BfixaYUkyBFCvfPoo8wEz2C8lk2Cgw8qNKmiMyBmRsS5BZmjzCuZxDUDF1AlJS64RKl+9E/3scQpydAVh0NiOxpxNSXP0D664Z33jHVq04iIjt/bLMCwDL1uUZq7uQJP8bV+HHOeMpiYZ6SrDo+M/a1XAe8ke/3A9BIVQQ== 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 Reviewed-by: Vlastimil Babka Tested-by: Baolin Wang Tested-by: Yu Zhao 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 --- 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 Fri Feb 16 17:04:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zi Yan X-Patchwork-Id: 13560349 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 22CC9C48260 for ; Fri, 16 Feb 2024 17:04:58 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 76CD28D0019; Fri, 16 Feb 2024 12:04:56 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 6E8B98D0002; Fri, 16 Feb 2024 12:04:56 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5601E8D0019; Fri, 16 Feb 2024 12:04:56 -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 3F01A8D0002 for ; Fri, 16 Feb 2024 12:04:56 -0500 (EST) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 066888018B for ; Fri, 16 Feb 2024 17:04:56 +0000 (UTC) X-FDA: 81798291792.11.07D2476 Received: from out1-smtp.messagingengine.com (out1-smtp.messagingengine.com [66.111.4.25]) by imf23.hostedemail.com (Postfix) with ESMTP id ADFAA140028 for ; Fri, 16 Feb 2024 17:04:53 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=sent.com header.s=fm1 header.b=DzxWotRL; dkim=pass header.d=messagingengine.com header.s=fm1 header.b=GoE+JqiG; dmarc=pass (policy=none) header.from=sent.com; spf=pass (imf23.hostedemail.com: domain of zi.yan@sent.com designates 66.111.4.25 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=1708103093; 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=nIAYvnltZL3ZJbh/6F5gZLxtE16cArxedAxxW1cUxBU=; b=fAkJSlJhPp8031iVBNgxOR7MTCRMH+DwlF0lE476DHRMg4wL/KEWSZxjIGtl9ymjwRd5Wn gXYFZYGpmWox6Ek54j8j3Ot/bIs5jrlXjp35ywp6nSU/sTepmlecvPWFFKD7WhW3+sO95Y v3vGPWmQ0xl6CtNNkEf5mAXlxteQANY= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=sent.com header.s=fm1 header.b=DzxWotRL; dkim=pass header.d=messagingengine.com header.s=fm1 header.b=GoE+JqiG; dmarc=pass (policy=none) header.from=sent.com; spf=pass (imf23.hostedemail.com: domain of zi.yan@sent.com designates 66.111.4.25 as permitted sender) smtp.mailfrom=zi.yan@sent.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1708103093; a=rsa-sha256; cv=none; b=21pj6NlHzKm8h52+KLxBXEq4QJiGSoge7twjazunreJiYzE3bQowgzRTrOqaIKIgaQR6D6 eaoV1QRfYkPXh15aqmJB+xXI+gsflQc13VrDBJhc53aBK5qcdkF413HNYshBGYgZbxQqWa mYeDbYWkHyjn2DqImYhSIsQOBEVfK0E= Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id E46E65C0098; Fri, 16 Feb 2024 12:04:52 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute3.internal (MEProxy); Fri, 16 Feb 2024 12:04:52 -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=fm1; t= 1708103092; x=1708189492; bh=nIAYvnltZL3ZJbh/6F5gZLxtE16cArxedAx xW1cUxBU=; b=DzxWotRLufx7pv4QtallMVp2YEhd4si5FmDqgrVdN/IovF6MWz6 1O0nY1q731gXgns3Hr3abKIdATemnOGe9cPD0sm6QdMjCMK/sne8hwftBGMvHbSG 5hhPfp6fAeMX6zWr/1NhDEPyqQYfbV//nsZH0bTr1OIkR5EMMZ+SmFJKWnFoKa+r s/akEobIzNQSi6TlVEINqok9DIR7/9QBKTRwCYArmv7ZtQu//y0E9OeKAu9ZGU0x NHmxIwy21fqvlEPxTRVdFNHmpvEr4ywyq1zLEMHKvDDOJTPZw0G4NHi1Ac6Elf5H NoYkNyU8PTgj7WeU+XwZWyBgLVV59IFbQPA== 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=fm1; t= 1708103092; x=1708189492; bh=nIAYvnltZL3ZJbh/6F5gZLxtE16cArxedAx xW1cUxBU=; b=GoE+JqiG+iW4WKDPXvVRv2LPw/D1mtJ9WjAy9VG6serbIkjmZ/G +/26VHVVwYgc2NwIU6IgKks0sC1QGa1gAB58aj3TP9S+w9HZQScnFDgurCKchrII DgL6YBrf5kWArHBKs6qLK0FnBsMqPc+BG8TZ0IZG7WfJdNleBfopCmXii6hRHOiK /xNfJmo7P4QgrwZcDJPt4AwtQv5wsfB8Mrqc4bDzOqVvtdAT6dMz6B2X2LQkakzD 5RuRGF7Guybp+ORIf9tLocFE6JCimXDDRUSBopG44tTTHx8Fhi9c7PYFM/vt/zx1 z5eJbHRVTfNpoGpGWt6sbWri9v2Uk9FIrow== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrvddvgdeliecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvfevufffkffojghfrhggtgfgsehtkeertdertdejnecuhfhrohhmpegkihcu jggrnhcuoeiiihdrhigrnhesshgvnhhtrdgtohhmqeenucggtffrrghtthgvrhhnpeejke etkeffleelkeduffdtfedvtdejjeeutdeutdetgeejgfevtdefudejkeeiveenucevlhhu shhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpeiiihdrhigrnhessh gvnhhtrdgtohhm X-ME-Proxy: Feedback-ID: iccd040f4:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 16 Feb 2024 12:04:50 -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 v6 3/4] mm/compaction: add support for >0 order folio memory compaction. Date: Fri, 16 Feb 2024 12:04:31 -0500 Message-ID: <20240216170432.1268753-4-zi.yan@sent.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240216170432.1268753-1-zi.yan@sent.com> References: <20240216170432.1268753-1-zi.yan@sent.com> Reply-To: Zi Yan MIME-Version: 1.0 X-Rspam-User: X-Stat-Signature: j4839iokxqg34tew3i1qnar8yz4xut6p X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: ADFAA140028 X-HE-Tag: 1708103093-177699 X-HE-Meta: U2FsdGVkX18g80ciY04f0HAN8OeWWTgZCh5pFxyShhVBvrAv9J4SRhH9XF+gcvVdROI/r4YBfnclZHi0UYBNc2y1TzWoRMj7gjj8FddiiQWE59HB7ceRIJqfdjAFP/UrcLnwdJQObRo0iLrvZrYHBEFJNJEkAsPDY6aJBL5rFyTI5w80Eo6hr2uaNINbRsPQQVI03xZFE0BGSdodLDgOXuq2Qd9pxgb0aCmCtTljU8oGJBj2PnLruDqzQC9MVc0frX2F0ryWCWhAn/z+wgfCVqhmymX7P59PGNXIScbFX+Ic+JTQkF0RbQ1MJ1EuLdRjpyNGBzXJi+LfVsk1HztkNZqpvbYj0gOM+6oowexDfZqUg+ZEmoNIVlX30UH3UXHfzdhsLl5H+GUZAFM7VRxkxHHWqVAuv5bc2qXSh4shgLcsbiDRcY92OuAjQt0yS3COGwuCHwMa53EnWswetcGl/yR1Zy2rXM4WTxU14dSkGiQOvoDFqe98BH20B0xNwJJSI9KzbM2oHcIyaxdJpQqz3XyJuvwS+BGPPDMpgrdAsHJPzqRpYfpqsMqdnrFcL7ZvvOBVk7fkT2E2AmkQuvz/xFi0fxNEnbntdINq+4PEG9i2JLcfzQgfqo4leo5fv11ytaZlHE1ojeZbnU4xmZvAaIjJihqrfFlQrVXI2xLiJYaHyQgaRN9gSmDCUhr64esBJFwTezwWnnPcSztRgXUSORB/TLs6f24Tp1tUuEc6XhLNnHmHMcr/gTMqNOlFzPRZA0Q5YjhoEcEHJKvgSdj3dm+WAf8CTtXI7Y2NrlaBXSXDjPrpqG+YGZHHP/p/f1gOp0bgGUxCmmhrIq25r204HvEkebiYQS+nuZquUr2q7YA80PbV6UHaER/pSOQP2oWa2cvAcOZmwZ/9ITm4FKyeB+QM9LMHoTlYWVAnIDheBZCbNc4dLAKAYKfZW4R5qXxYRGFieuvkS0pUCe/r080 4TSyzG/T 72Qa19rXjULq9hmhKM9XHGMNjIZYdYVs7YwOzERy6BDMmF3HfbAA7/xIGjR215KXRI/fZU/+1AipZlHFWnL6NoIhX8wEwim/SU+zJ3IPg8lq8UX7vDTSD5qyVNO/PNpUnHs/B5yAp2UFUJn13XoDSkNGv8VeclKacSxtrJNiOhNZ1XESK7hc1/qrwei23KGVWIO7S762pq4pwpxb7odM+Fppb5RucK+jNUrfR78wwfAXVmx4QWFkXxjSVWAWON6LDgSnsT8ESanHRGqs+38oGNmSqBqGOVMMYEeLDZbe5Qyjt/mlwhrq2v6f+xgmVAHJcE0r66M2Mb+Zmg3I19SUdWfkw/RM3UkMRAX/66XfQrC2PsA/r4NnYMWaoQ3wDUOpUfkfVkVLrcTgb+GFfl8nHyjBHL8ZkS/eoJHS3Z04YAkO29z8lzdRZJz1NCng2llpuvmPYykrPb0SSS3YLeFbWsW0oPC3f+TaZQfvDxgdQ5H+xZcNS6fm3YYEaaJEGNyxvjOGlIorn6w7ZRkiivsVH0otTIUwNG7Km0VVrrKiwHnGEeXnL8knk+ffMJeJi78dIvFkt5j+WZIVCTP1alER277TrL75qPJjVr5pSiKnId4ljnCWncQ9de67Ge6mwFQgRr3BOlDR0z7Kp/NVm66QQ4Dza6qYacFmW4guO5sh0SSkMYxgVe2P0miU3kPTr2NZ9Xso560/OXyCXR1DV3d0RstHuMqX6gIwVBj3TPx5S8FclTLk8g8HWzdkrzPhLt46BlrouUq97/CdNW6G7KeHdGRFZ5kZq0W8sJyt0C5QU/WdK/6LhSm2R7U6xi59KD2msUuPajz0Ryl25vpjcZT0gYBkl3/F58D0siW3ec1cfzPAR16JIgHGBvVFzCoCwMn7lneqA/amEgfjN7SYYVd0DV/hyihk2ppwO+GBjC56XkfB/E+opO/gbh/t/IbtBa/C+9kmoMWrQ4QMxD6ikUg+Qjk+nknO4 XotDoYcA MzpHFTAomX+dBlSk/bjmKrFiurKuRt16 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 Reviewed-by: Vlastimil Babka Tested-by: Baolin Wang Tested-by: Yu Zhao 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 --- mm/compaction.c | 140 +++++++++++++++++++++++++++--------------------- mm/internal.h | 4 +- mm/page_alloc.c | 2 +- 3 files changed, 83 insertions(+), 63 deletions(-) diff --git a/mm/compaction.c b/mm/compaction.c index aa6aad805c4d..f21836ca243a 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,19 @@ 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; - list_add(&dst->lru, &cc->freepages); - cc->nr_freepages++; - cc->nr_migratepages += 1 << folio_order(dst); + if (folio_put_testzero(dst)) { + free_pages_prepare(page, order); + 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 +2493,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 +2503,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 +2690,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 +2709,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..93e229112045 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(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 70c1ed3addf3..b0b92ce997dc 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -1080,7 +1080,7 @@ static void kernel_init_pages(struct page *page, int numpages) kasan_enable_current(); } -static __always_inline bool free_pages_prepare(struct page *page, +__always_inline bool free_pages_prepare(struct page *page, unsigned int order) { int bad = 0; From patchwork Fri Feb 16 17:04:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zi Yan X-Patchwork-Id: 13560350 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 A52B7C48260 for ; Fri, 16 Feb 2024 17:05:01 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BCB358D001A; Fri, 16 Feb 2024 12:04:57 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id B79888D0002; Fri, 16 Feb 2024 12:04:57 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9CC568D001A; Fri, 16 Feb 2024 12:04:57 -0500 (EST) 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 88D7D8D0002 for ; Fri, 16 Feb 2024 12:04:57 -0500 (EST) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 5668D80118 for ; Fri, 16 Feb 2024 17:04:57 +0000 (UTC) X-FDA: 81798291834.26.5BE91FC Received: from out1-smtp.messagingengine.com (out1-smtp.messagingengine.com [66.111.4.25]) by imf15.hostedemail.com (Postfix) with ESMTP id 0BE61A0029 for ; Fri, 16 Feb 2024 17:04:54 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=sent.com header.s=fm1 header.b=Qh+SFOC2; dkim=pass header.d=messagingengine.com header.s=fm1 header.b=hrjQmkGw; spf=pass (imf15.hostedemail.com: domain of zi.yan@sent.com designates 66.111.4.25 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=1708103095; 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=bTCMfMRgj0TAxiQeyNSNVpFoxlWh0Oj72NH6xXdaFx0=; b=4cZVKefAaKZRqefgDTTCsyMPMMkSs67WwFL7VdfqddZSW3X93lIyMTIox2ilXPNxeqh2Sc 4NS/aLgnW2shFGetVZb6d9G/c8aRX3n0WR/cU8auv7zzy+BaGS9PyCnDnctDrUIHfo3tfA y7bHrhbkgYScerIlN5WZ2kwwfP7YqIo= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1708103095; a=rsa-sha256; cv=none; b=F90NiuwKb4ogo9+Rnp54gsft7VEp5HaqVI4g29hH0JQQg+mJAaiVOqNWz8RB9JHR6Kn5sF lJvF4W2M0B3AvjhNcecbSGOD6Gt0ZdGHHhInUWH+DZFWtACZL5ROGOCTLLW2n7J3RVt9Dd VMP8zVT5pvfOddAljGUe1WnqWPx6pH0= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=sent.com header.s=fm1 header.b=Qh+SFOC2; dkim=pass header.d=messagingengine.com header.s=fm1 header.b=hrjQmkGw; spf=pass (imf15.hostedemail.com: domain of zi.yan@sent.com designates 66.111.4.25 as permitted sender) smtp.mailfrom=zi.yan@sent.com; dmarc=pass (policy=none) header.from=sent.com Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailout.nyi.internal (Postfix) with ESMTP id 4C4285C00A3; Fri, 16 Feb 2024 12:04:54 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute6.internal (MEProxy); Fri, 16 Feb 2024 12:04:54 -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=fm1; t= 1708103094; x=1708189494; bh=bTCMfMRgj0TAxiQeyNSNVpFoxlWh0Oj72NH 6xXdaFx0=; b=Qh+SFOC2uzfXFBf2MQSyLCdE/iSEti9OEl50htzixNEhyH3p6uD ttorsdTatpDLJct9xYK/4M3p/v7LE26pEawkhX7e/2gw/IgIzs+ZnS0OlP6lk+GM ky8YC+gWiiRpMIiUyVUI440RtoKFFQL6F3XF/7jnQTCtljg5jUe8YyQDVCwSs2X0 EiaOz0v44hVK/fl2b4G4CGshkV4t5MDCSjUGswZ2+MZXyZCka1nlMw/+KtnzqqMb bRnU1jjZCdIibwvZ3ewjRHaciWMNXBOY5T5oWefeQM53QEmyjbNvjT09kiFL+KHE MK3s+71oUT9iXOSHIQqrV9Pigpngwe7lufQ== 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=fm1; t= 1708103094; x=1708189494; bh=bTCMfMRgj0TAxiQeyNSNVpFoxlWh0Oj72NH 6xXdaFx0=; b=hrjQmkGwrw/QsZ5Oscv5eFQex/wKIva4wZWzZZTaY8WxwPrCbpL /ZEs1k6WWt/DCUHTPsxn+xV/sxbFuyc/GeRxj0F+KqJKqsHAdfouZeJPYmbY3Llc qFDPmgp0dlEjvCp0JEAVVMc7CTuB4tudRrtgDKZQNbEDGajyQl7TZbpmBYzOK2AN +R8PjACg5jv+jcaXiSiRoegIQsH6NxUP8XFWTtzFS6HWHrSqvz589A1OuKpQ5i50 n3BqTWs+bOWlfzAO30MSVhbfDDlzGhM5UXXuob7GZAgXH9cPTf8pucGiIF2vUIRf sMR7aFPAF37x1XJ6C+uErmm2LAwmQQ172bg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrvddvgdelhecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvfevufffkffojghfrhggtgfgsehtkeertdertdejnecuhfhrohhmpegkihcu jggrnhcuoeiiihdrhigrnhesshgvnhhtrdgtohhmqeenucggtffrrghtthgvrhhnpeejke etkeffleelkeduffdtfedvtdejjeeutdeutdetgeejgfevtdefudejkeeiveenucevlhhu shhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpeiiihdrhigrnhessh gvnhhtrdgtohhm X-ME-Proxy: Feedback-ID: iccd040f4:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 16 Feb 2024 12:04:52 -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 v6 4/4] mm/compaction: optimize >0 order folio compaction with free page split. Date: Fri, 16 Feb 2024 12:04:32 -0500 Message-ID: <20240216170432.1268753-5-zi.yan@sent.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240216170432.1268753-1-zi.yan@sent.com> References: <20240216170432.1268753-1-zi.yan@sent.com> Reply-To: Zi Yan MIME-Version: 1.0 X-Stat-Signature: i1ro5i9fxkqxeubpb1jfop81pp1hnk1f X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 0BE61A0029 X-Rspam-User: X-HE-Tag: 1708103094-806610 X-HE-Meta: U2FsdGVkX1+PvGGT6TuHid2KCHlDnIOEZHW5UlIX4pw2ngSlTIh0S+DxL4GmtFl0OxPSh5ttsKkXu+oLu/g7TX5HuDDudsMPbyLvFBwiVt436SZbqh0NFqwpuPxUqG2yvAE/s38qtYrgJL5hs7BSwem/cHhXNXl5P5EBf5E2kCffeHZx3ymBiE5gYVC+vbWoZVGG6ZNalmmQTcaTAw/obWUvS4B5h7LOMVECUeq0bRfiQNuZznnm+yek7eLHC2jkirrzUYsLPBQoYr5rHIFJcnpUq9WmPBUItJqA5mrwrSjnp0Qr55IhBBM/9WT7pndncnVutKcAWZJ0fh3xC76mFUmDqNGf9QnqN99RylqKW6hBWNzVRDKoFTX05sFfRae9X+vVvOrHb2DeAsR8i1egdqSxNwx460CVy0MF6zNXp1tOuQI1q3tq7WEzEJZJwuZAcOicT7ysJqtnZjQQcg98jqAFqHqqp/Fw4LK+zxW7wZUsBujnTwPgMmhvlAMMrN1Hhq1wnv79m/XYyr4cuPc9aMrJVGzrISWNsoBaYgAVQMO6y1sVSjdDS6Hstdan0Jy5fJ9L7XnYdfcqJoLAygqXv418D0Wjafz+kPwyT65Ey++wS0MMS90MTQubJLE022R5DJwPB3DYuTyoL9dXoR88FL8hX9IAd3a3XI2la+geToJhUIN9l/WVCSgEgPkwOYZLJd/VjxQBC9O33/yGAY2ZxeS3soFXXig3jDrBdG+RPJiv9aXMNh3ZH1UrmIGInpAb2Bmam0kf+O4S21JsnBrZoc3/Ce7esrxQLOLamg7zMM5C2h5D+kY6EGKBhn7TkanTe9R++gR1cz2+LAlfLLWPQsePmy1kU55Usk0jtTgl55fgraymOyZG5kTNsQ9lUi7nTY8OSvPsPoPtWMW5WD4S65fkP7eP0NmkzlYLiiQ0l6YPCvP5DtaD3xuNdfLC7O5+WfYF9xWfc2tbP47yp8l XkLkX0fK 238X7pqHuOv7CPYhlYGp73NzkqHquhZ9A2spjSoGWE91/p9sjok8hZXcmL5AVNrKqkecWi3RNQ+RHa3qSrFNvEoN1hU1nCmIsOnk4BHm5sxbSydoqD0q+mP7sL0N6DGfrqtaRyhtwAOvYwkWM/bpvoZvBEb82JJDPuvQtA6yr2XHn3u5N6J1gsfd4Ww9vV+uW3vuHDUQUXCwRYsCQNUciHpccJefhVExNV8QBiU/g2JpjVUsT6vjQNVT5hdz7eW6Wr3ISiImA/L9Xu3sCvX6L9FHIzpbbohytT/+5X2kgbWBm/pOTNunaiRYTA5ECR3uQlNO3a7m/trCCkSgw914XN7c2iI54CzDjKtV78WNFfDq671DgdYYsyR2yvMrdo78hZFW0uBgPXtnLTG4aL4BjjO05rnOMRgFAlZmG+Y7As9iDrrrx9+dISpyuDZ55xkKobZmZHxUXY93ud0WGEDitr+Gmzn7gDA37zowEZ6AFXjXxZ/zD78rjO7Hz8BU+FiyfHtQj68uH5hSQB5Gt25Wv071Y2gMhxVXJAai/aTlbmxv4WVUWxBGS7JChzyWQt3AxVMz0anawvXPe+MtVW6ZEgc4Wl/KU10A0IkE1k1e/tHCDvDh3O4DvQVbi/s0MUA/t1EbANulDyEHVUlM/dr8OzFe5T+IhAaztOBhMh3RV1484ux2Mdwrdd3vkm234Dyq1pvAobD+T1JLAqFzrURX2uCMRSAjq5Lj4Gi1dGiZg1DueZNedg0qXwz+sWlKZKImWIaFAVXy89RzNExXTRIuqEhRgThtuspN9yKazTELKWT90PJ7jp9sRG1wvLyzHkywfylYv4kNNHGygH2RdtKLojftvkLLAqsEHa4At5UVvqSUJVG5OSlnkeCHxqy711UYaPBfwCExqgdwyKseln1Kp+NVR8P8kr7LGt4kBNtIchkQBDx0oRy33GeTma2SjXZ6/rcP6+AMB8sv+mhmVXpy7HMTvV25b YVdsDmLx DzE2xGln2667+S8UjOpcd76pReDGkJa5 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 Reviewed-by: Vlastimil Babka Tested-by: Baolin Wang Tested-by: Yu Zhao 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 --- mm/compaction.c | 35 ++++++++++++++++++++++++++++++----- 1 file changed, 30 insertions(+), 5 deletions(-) diff --git a/mm/compaction.c b/mm/compaction.c index f21836ca243a..b2a570e00a8e 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -1832,15 +1832,40 @@ 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) return NULL; + isolate_freepages(cc); + has_isolated_pages = true; + goto again; + } + + 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; - dst = list_first_entry(&cc->freepages[order], struct folio, lru); - list_del(&dst->lru); post_alloc_hook(&dst->page, order, __GFP_MOVABLE); if (order) prep_compound_page(&dst->page, order);