From patchwork Tue Feb 20 18:32:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zi Yan X-Patchwork-Id: 13564333 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 13912C5475B for ; Tue, 20 Feb 2024 18:32:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 90B2B6B0080; Tue, 20 Feb 2024 13:32:45 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 86D856B0083; Tue, 20 Feb 2024 13:32:45 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6980C6B0085; Tue, 20 Feb 2024 13:32:45 -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 549956B0080 for ; Tue, 20 Feb 2024 13:32:45 -0500 (EST) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id BE1CD1A07CA for ; Tue, 20 Feb 2024 18:32:44 +0000 (UTC) X-FDA: 81813028248.23.39E3E6F Received: from wout3-smtp.messagingengine.com (wout3-smtp.messagingengine.com [64.147.123.19]) by imf27.hostedemail.com (Postfix) with ESMTP id 6F7D54001D for ; Tue, 20 Feb 2024 18:32:42 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=sent.com header.s=fm1 header.b=OSmmEdRo; dkim=pass header.d=messagingengine.com header.s=fm1 header.b=gmSswlMA; dmarc=pass (policy=none) header.from=sent.com; spf=pass (imf27.hostedemail.com: domain of zi.yan@sent.com designates 64.147.123.19 as permitted sender) smtp.mailfrom=zi.yan@sent.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1708453962; a=rsa-sha256; cv=none; b=Cf0SfJE9GFKuwcvHsSDHyL3jUW7ifs9t1/HEu5EE9DcJ7hRUbyqJb3Y4gHPx/M7vcFRO/I LV1s115hJOWjNK89ngEk7Hg+kbDzGrtL4oGUnZCUr+d1pgfv6M/kMq5zsy9+A8uWzRCWv+ n3jQpsBzRBL4z21wC7KnR5vP9l9S5mE= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=sent.com header.s=fm1 header.b=OSmmEdRo; dkim=pass header.d=messagingengine.com header.s=fm1 header.b=gmSswlMA; dmarc=pass (policy=none) header.from=sent.com; spf=pass (imf27.hostedemail.com: domain of zi.yan@sent.com designates 64.147.123.19 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=1708453962; 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=3te7tA2WvcLuVx5XlSmApKI15+NRwijvQjuoj0usTfY=; b=C8omGk5bJU5dXFhVO/TsXLnCzoCLT7EdoWBb7I9UOSzikUXXQoUDyTfsfO6fuGaOPirmJW NTQkKatU1sR5HJF1wDT3A9YhnJG8steD5EkO6oSC8XyHRN97PhuvKrGoRz5UCmzTye6hQ+ FM2LYkGjfp0+Klv3vkQQIGUMYF7PfLg= Received: from compute7.internal (compute7.nyi.internal [10.202.2.48]) by mailout.west.internal (Postfix) with ESMTP id 4F7983200495; Tue, 20 Feb 2024 13:32:39 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute7.internal (MEProxy); Tue, 20 Feb 2024 13:32:41 -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= 1708453958; x=1708540358; bh=3te7tA2WvcLuVx5XlSmApKI15+NRwijvQju oj0usTfY=; b=OSmmEdRoDCwAgPBnLo0uZuQmHYzka++qvdQaXCk44ZDkenqRSb/ K0hZmACbnPKTnIsRqCesEe/C/TxyJW1JtH3gDiOYSbyF/lPmgVgJHa74i9MPm7Jh +xvtuWp0gV4+1HEK/3fO/FEoeQIJE7pkTCxHyF7EjWGEzWwX2+e43B7Z5mqLpcxV CAtDT76PMAUS67DsKKkWC8s/WhKVzmpArFJn5fQwR/PbJICXsLUVT1mK7haRlUCz q20JRQS7zbZ2s/C4ugZifll3pLFFfeH/uY8Xy/zbFahW1D/qOhX4BAPxHlVBbf8x UiEcd+fQdY2ss9rZHvh9zePsQIzaKA7AxVA== 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= 1708453958; x=1708540358; bh=3te7tA2WvcLuVx5XlSmApKI15+NRwijvQju oj0usTfY=; b=gmSswlMAp/+WPxW+MYBqcg9EJgcY/p1MxHMZAoruS9GrwGchYPy 3Ous9gaijN0aVRwVNWXOKzWiekjpb3GPsNmM27lXwaOzEATaSZRln67Z2gwdpcwH P8tDUsZ96dxTJg1enKijxxxmJ7EY3Ulh9wCBwheJRscZJuQ4kP7yQCOhmIZ3qo1R 2+zvY0cUT0NAAgl3tWqEjFvleWyVa6PXV6s85zwbJsbCzKG+yuGZEa9yJxxc/kaK LKJTYsEgjYX/aYYH27H9VUZDnpg8UqgWttfzdBVGAFgx2ECmXKM/N2iv4mKc2hQN STYviACeyGO3U9Pdx7uwp/A5LSjRlCNGLLQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrfedtgdduudehucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhhrgggtgfesthekredtredtjeenucfhrhhomhepkghi ucgjrghnuceoiihirdihrghnsehsvghnthdrtghomheqnecuggftrfgrthhtvghrnhepje ekteekffelleekudfftdefvddtjeejuedtuedtteegjefgvedtfedujeekieevnecuvehl uhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepiihirdihrghnse hsvghnthdrtghomh X-ME-Proxy: Feedback-ID: iccd040f4:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 20 Feb 2024 13:32:37 -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 v7 1/4] mm/page_alloc: remove unused fpi_flags in free_pages_prepare() Date: Tue, 20 Feb 2024 13:32:17 -0500 Message-ID: <20240220183220.1451315-2-zi.yan@sent.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240220183220.1451315-1-zi.yan@sent.com> References: <20240220183220.1451315-1-zi.yan@sent.com> Reply-To: Zi Yan MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 6F7D54001D X-Stat-Signature: weqazan4w5sj9djygbqwq4bacz1ppddm X-HE-Tag: 1708453962-536960 X-HE-Meta: U2FsdGVkX19FtvzRJP480NTzVBUyAr8rD08pG6q2ZRAF9AjST7q9faFBU72ZSWTV+/t6/bFPAhPnAouh2/LsUdNoqhUpmi3XPwxQ2dgfK/mLi4mrbhiRZb63w93RyHNjSH2ISNiLVFL+8qSD175jmb8uu0UWi2g+nfo1mgXxdPB4fghJivQdjKA6agNhYSzOXPK4PkYlbHikVE9kheMWZhvol4jaegRipdtaLvstu2LEDSe1kfKaibsVIEI/2+gfLKQdR7hu7sCcnHIskqRIGrhrHBMnt+PtQFle8QCJchdPZQU/huOdd3Y9Bcu8IL9c5xIveJRG9bHJasc3AJjH+fVmBmLnzDqj+Gv6hldsvuwA2PGfbLNb0VGN1T/fVcazpDgmdKBhHThkLu7BZlmwOfrFkcAoLmkPQVjJ8E0ryyezb+2tYtZ5IZBfdU9MT97ZGCNIqBv/zRXcOnCiNaEwxSnjUo2ILVgyJpmEzRK/FMoxHFYlwacTHwGbettTGkcE3bls+vrnHwbwz+bTEMpF0VNJhNjC90REM+RpmBrVbDGS9pfHBcWfsL94ALxNUI33kVljbZV7yd85YaERr7cwhM46Jm6ubMYb7GhublViCwdohr0f0M0jc18ZacZgNNpz5M8guTjHGeIoUW7P4WyV9qOHq0IVSb+r10ZzJ//xbDBf69pEERps9Q2GGuvyURi2K1sTGl9eHLRejghh0wzTfgm/RsLbH6H17jKwJDuNHg0qmW4rKTbx75i+6qyrgFlI3iC0GL8unMUPesGQu8TrYteC/YwFqGtHYX+nVe4MU11m/3TidFLpNH0CJQEDlFdDJmuEUZqs3E1Dg8wXKsgxmeQXACGVMQVA3XyYd8TNDdNEAkxxMtsBUHQSlGgDrUt8p+vCX5sTNSskEcMslwZteyjek57qwsEqUBsFysuL8tKk1Q4h1VsGq0FIwjYoG0FrHG/5kVuZSoCjqrn/f4/ Up1o0McX yP4eIsXKQAXbFOAEqTc75122jjWqKE7CewlQoKZ2Xp48MpOOlu27/GZ3b3f+KERIYau/XV5UhQL5oay/5HLY0ZOX6mlkuWCRRoTlrNWCKLxYbgMYLJl0Klbl85P+Lj5b509hs4zA0z7Q1z/pu4hRUsyHy2nVfGY5Tx/o4HlyyQE0WGuFJfTCbAYGHIssA0lZA/vf8sN64jnioqQVO4bvngYL0yfVlWMjxzbdnZ8DBQJa1QJ67EJARJFFjiUai1/yXqjMe6rFZ43hPp1LTuhhUDp7MwGo0wUd+ZkQoYK4i9Lx6GTKf/QkSktKrPEBNfkIrCaLAisHeqNuuTG5VFAoZ7RmklIXDcuZiTiPS7L3mMlmKgNAoxw7kB5OFg0u/14b2oKnuDdiNHqi/0Axv/AaoX/c/zKXBsIp2K6RH0p1o9SZ9A4pPzc9mePJt8Sl2DSktyoFOl2PZc1tbdXR1w5iCgLFLwecwOeLFktBrf9nryFh/nFp0edpY93izg198EnavmEm72Y382QZIHWZMlf59F6ruHdyofXH2hYQrx7Pp5pZKFQ0la6rwr+cxVzG8MBYLKSwPQ1YytQX952/zhKwAXVMGrA== 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 Commit 0a54864f8dfb ("kasan: remove PG_skip_kasan_poison flag") removes the use of fpi_flags in should_skip_kasan_poison() and fpi_flags is only passed to should_skip_kasan_poison() in free_pages_prepare(). 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 Tue Feb 20 18:32:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zi Yan X-Patchwork-Id: 13564334 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 CB698C5475B for ; Tue, 20 Feb 2024 18:32:48 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 512D96B0083; Tue, 20 Feb 2024 13:32:48 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 49D126B0085; Tue, 20 Feb 2024 13:32:48 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2C70B6B0087; Tue, 20 Feb 2024 13:32:48 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 13D116B0083 for ; Tue, 20 Feb 2024 13:32:48 -0500 (EST) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id CB2581A07C2 for ; Tue, 20 Feb 2024 18:32:47 +0000 (UTC) X-FDA: 81813028374.18.860BF31 Received: from wout3-smtp.messagingengine.com (wout3-smtp.messagingengine.com [64.147.123.19]) by imf13.hostedemail.com (Postfix) with ESMTP id 8924720023 for ; Tue, 20 Feb 2024 18:32:45 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=sent.com header.s=fm1 header.b=IBCxnz5k; dkim=pass header.d=messagingengine.com header.s=fm1 header.b=jiSueTP2; spf=pass (imf13.hostedemail.com: domain of zi.yan@sent.com designates 64.147.123.19 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=1708453965; 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=VthfB9xHWXamr5LNX5aI7SP9sOuq2T7O1UcOskPjsOI=; b=NJEUAhMOBdsGAU7kxMChYV1ex3VExE1+oYRzpWKlfs80cEqd+10jKlpXhRinR3MkeRrrKx pETa+ZMGKtapJwIzqaY0mY5HX2obxgHeVYLAPZN58XLCPm6HEIYAQ+Rwg7VfkeoNdupBDI j5jUc0XOU7/MBKLf2R5X2LmASLt5LnM= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1708453965; a=rsa-sha256; cv=none; b=uhGSu0yYFQo9wDAAmv/TVGNs76CH+MIWwFxQCIF80mC2uwvvFoQAuejw+CApS8HBWfn7JF g+v8XRx4hUcE+hjl2KIf50MdBT0ia1WR5Wk2FODslefoBToihj+O/Cae1WDxznQ0ECWllA Hgp+fQvLxrMIS/+s4/CVuqzVeuc5TbQ= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=sent.com header.s=fm1 header.b=IBCxnz5k; dkim=pass header.d=messagingengine.com header.s=fm1 header.b=jiSueTP2; spf=pass (imf13.hostedemail.com: domain of zi.yan@sent.com designates 64.147.123.19 as permitted sender) smtp.mailfrom=zi.yan@sent.com; dmarc=pass (policy=none) header.from=sent.com Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.west.internal (Postfix) with ESMTP id 8B5B03200A4D; Tue, 20 Feb 2024 13:32:42 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Tue, 20 Feb 2024 13:32:44 -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= 1708453962; x=1708540362; bh=VthfB9xHWXamr5LNX5aI7SP9sOuq2T7O1Uc OskPjsOI=; b=IBCxnz5kEzrcnVVh8byadrCYLGeY+gCPJu4KYwlIh6EYBa+DLmh DVgGL5okBSyRGQJM8oS2cHgWVRx3A/VIJsXjlm3/Q8xVAl81p8ZTP/MDsKI2ilKg j1Ao/xGia5AXXNoAg2GqbL8XA2QOpbmWkUYhgoERs1srQZHv3C2sJWikcSOgJwz/ +rJtvtpe0YpSvNLJwH2TfKlclX3dzkRoKZiE4kGoAG4IF8+gMNdMFu8x2Hi8ckn9 gW/FXHoVwtF++TWclK+cV7TKWHLboYQV2MVqYg/G0zDsRVdgwpivGy01VjhcrLvX Bh05vMbRhOlvB5aLeaXKrxXzQ4cKhU/uynQ== 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= 1708453962; x=1708540362; bh=VthfB9xHWXamr5LNX5aI7SP9sOuq2T7O1Uc OskPjsOI=; b=jiSueTP2NFAW16xmDieh0jQv1EMcSklBlVsdVriYGBp7o94Ggcq fl0/Y10zf0QltMFk5nK18Kf7eVAmp5HMBYWlwcMMrbzm2fCsUiP4W6EWAgsjePP1 pugKuaGP0Dg72DLTzagqAwEVofFHzqE8dUqb7Ia413zAYAzGmQ/RmNmNMqu80iK8 dpyfuQmLBOu24LqQBr77Xce4SnEjXhA2bFEF/1r0RToVXdwMDXckGJibLq+U8kYX /vNtbBD9Is8Z+R/sn+DyixhqNPCqW9vOfAJ/u/DEMTKXT0EFLnPVqCUjBp/RfVJ4 2jWosqtyzTbBoRRq+5SVmMelvVS5BbOYhzg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrfedtgdduudehucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhhrgggtgfesthekredtredtjeenucfhrhhomhepkghi ucgjrghnuceoiihirdihrghnsehsvghnthdrtghomheqnecuggftrfgrthhtvghrnhepje ekteekffelleekudfftdefvddtjeejuedtuedtteegjefgvedtfedujeekieevnecuvehl uhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepiihirdihrghnse hsvghnthdrtghomh X-ME-Proxy: Feedback-ID: iccd040f4:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 20 Feb 2024 13:32:41 -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 v7 2/4] mm/compaction: enable compacting >0 order folios. Date: Tue, 20 Feb 2024 13:32:18 -0500 Message-ID: <20240220183220.1451315-3-zi.yan@sent.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240220183220.1451315-1-zi.yan@sent.com> References: <20240220183220.1451315-1-zi.yan@sent.com> Reply-To: Zi Yan MIME-Version: 1.0 X-Stat-Signature: c4f57pdrb66gdoh7a3mdpmcrpg1xyjbb X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 8924720023 X-Rspam-User: X-HE-Tag: 1708453965-409754 X-HE-Meta: U2FsdGVkX19WpO0RJXAGha3ibOQccUMwQhyT9Uwq/XugIAi+Aaa6yGAgbt3FScQ0xF2VFZxLlh0xZehpJV1O4bhQZBTo0VgxDmJNDR5BXDGTVq40vusxhdodB6yvYiSWFCfZ1ShAIfu6qaqzmAPc5LEYoIByetF4L3zg5XBqu0AM8VDHmiVCWYAdz+uSyUPxO4gM7OwkxtWbskQsLFV/5Pdp7fSH7rGjIvoQraEYPSiiiFeXqGyKya5GLjdHZV77SePII3sQlLh414ib76aN2978AgXrGp5oP+BtAT5j9ZBa8+FPLThUksCSlfnw7fUXYOc5Aui03FWyiufaf5a34Kp01vhSJH+kFRy56QOfvvKzpjy27HI+VlZpkAuhE87fC5hrUlcFCPJzQrP8fYGjVo3KaT2OeUb+G/Erp98rbCM3/rU9/jmm8fVvzis0DCiwVIYzb+9hBS+OTHyghhhJGxAR5ZnZhydW0bNqGBJmkarPVyJbgWDXbTylLPS4dleoyLgCzQayWaXgVOaUYyMigRRsOZNKZaOeWt8qgH21YJ70TqWZkXx0QwPa5oxkebPBIVnQpJUaC6Cd19twPtIMb7epBKFCBeyId4m/YIS9gCkfgDWFk0wJPl4a8+RNzoH93bPVBSZ5SyqY0mdYPucA5988yrC2LAL9QK2AEVP4gMDzKtenQWxlNxr3TlRKNBK1pvDlUmDlg6fNI8LzSwst/H1z5Dh61CHgI1TwKkbuuU63xTsaebXMedpzKc8yQjLrdm2QDqiMXtKywbvI0RTYy4wke7wKpY7bgg4EXAjl9b+hpH8SrA6kCIHtVCY3KYFD8RsBUgZUNKnyem+tNWvnUsBaXu99/OGghYUU6bOLC8tkrgSWFAdrX6kWK4ZedJruTml/sI+PHEYX5yCcE0y1valXhiA4hrqKN7aZbUKnvHH/w1TeYgf+kGmv2tGGGRDcoBcPKy+WvSsU6X7FO4m 0VWWFFOp of95rCQqEq5X7ZJlUcKl6WgFF0KdtIXp9lGnbvq6lDXHCnHEPCyehvsqJr5dbhDRq0SZdNhNql5BlaaophkMn3vQPgZOfS9rriVikcmaWW9n5aGNs77VHDmeBYa/dSyUQWSZHBEznMkxb+anryUmJtjN8kC+7T8pjsIOWrJTQjehXpvXamosdB8Wxq6Y/e8HfaetdX+W7wEsjl0EBRic9CFzEoz2F1Az0NhL92Zv0MGZnXg73SdBjta4iKbD5kYFb9Cyv+RcApfXq1JkoeOXBv1DKtw8BiYwtJFLiBV0p4V2egrF0Im58tdINabBoJOijvL55xixxPmHUtWX+thqfNi8yrobhw5WUXTiTbZ9WiP+rVEyrj62lOxrYLkhFRZ6ukL2fIyqc6TguvOCOUQ+NtAJgBqezHO1nmOY8uQWEnOd4DmC9Q5rf00ien0rV9ddolL5OcyILIz5E6JoeGO+Df2LJV7XRru6Gdk4P+yixWr7ZUyOGZoEECShW1VnTZzs+EuiUZV+JicKsIMeEk5uUhYMHl3Cj39dIhN6S4oYY1vm1UV32ph9yULBtd+F14hVY/dX7XqtdvgLRDrI6d45KRpN1XnKVwutWFbJNF95Jglp2Rui1OLuuilO7yEw+y9Xwhd92TB2l5gDrniFs03DZa2FsK+wEmA1AIOzulFkQo4O5zQnkijO7LA8FsBNxjdoGZMJVa/8m/vemVyFGsJ/Wez3rqjVe/iaMbTqgsgXqVHpR9Jhy8m4Dn2VmpDjhkKC2rbtmlqURizXJWOybPDnPYGa/sR7y2WR/6COygHPtDc3Dau6bq0StXY/K5Q5suZ0cFxgK8M+dOMbz46ax6Lt1J5WGNxqZGQBquXK1xP9SDfUqhZXunwke/VA/jrQfyUrmddO4pguVaO4hAGZ/NUNng9u3XPKUibkRO3WPNofGbLAsMMibZZiVufiQVwH9JWFCOSVFJXwWEvBMH4va0M0d3noTbqE0 05oFMyQw tSmL7JqN3aq7wgs8grTmcCGLyDKnTUJ/mzIz6xLinAA= 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 | 101 ++++++++++++++++++++++++++++++++++++------------ 1 file changed, 76 insertions(+), 25 deletions(-) diff --git a/mm/compaction.c b/mm/compaction.c index ccd447282665..6509fab27be9 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -40,9 +40,22 @@ static inline void count_compact_events(enum vm_event_item item, long delta) { count_vm_events(item, delta); } + +/* + * order == -1 is expected when compacting proactively via + * 1. /proc/sys/vm/compact_memory + * 2. /sys/devices/system/node/nodex/compact + * 3. /proc/sys/vm/compaction_proactiveness + */ +static inline bool is_via_compact_memory(int order) +{ + return order == -1; +} + #else #define count_compact_event(item) do { } while (0) #define count_compact_events(item, delta) do { } while (0) +static inline bool is_via_compact_memory(int order) { return false; } #endif #if defined CONFIG_COMPACTION || defined CONFIG_CMA @@ -816,6 +829,32 @@ static bool too_many_isolated(struct compact_control *cc) return too_many; } +/** + * skip_isolation_on_order() - determine when to skip folio isolation based on + * folio order and compaction target order + * @order: to-be-isolated folio order + * @target_order: compaction target order + * + * This avoids unnecessary folio isolations during compaction. + */ +static bool skip_isolation_on_order(int order, int target_order) +{ + /* + * Unless we are performing global compaction (i.e., + * is_via_compact_memory), skip any folios that are larger than the + * target order: we wouldn't be here if we'd have a free folio with + * the desired target_order, so migrating this folio would likely fail + * later. + */ + if (!is_via_compact_memory(target_order) && order >= target_order) + return true; + /* + * We limit memory compaction to pageblocks and won't try + * creating free blocks of memory that are larger than that. + */ + return order >= pageblock_order; +} + /** * isolate_migratepages_block() - isolate all migrate-able pages within * a single pageblock @@ -947,7 +986,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 +1062,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 +1222,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 +1846,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)) + return NULL; + if (list_empty(&cc->freepages)) { isolate_freepages(cc); @@ -2090,17 +2152,6 @@ static isolate_migrate_t isolate_migratepages(struct compact_control *cc) return cc->nr_migratepages ? ISOLATE_SUCCESS : ISOLATE_NONE; } -/* - * order == -1 is expected when compacting proactively via - * 1. /proc/sys/vm/compact_memory - * 2. /sys/devices/system/node/nodex/compact - * 3. /proc/sys/vm/compaction_proactiveness - */ -static inline bool is_via_compact_memory(int order) -{ - return order == -1; -} - /* * Determine whether kswapd is (or recently was!) running on this node. * From patchwork Tue Feb 20 18:32:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zi Yan X-Patchwork-Id: 13564335 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 1C8FCC48BC3 for ; Tue, 20 Feb 2024 18:32:52 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 97F7C6B0087; Tue, 20 Feb 2024 13:32:51 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 8E03F6B0088; Tue, 20 Feb 2024 13:32:51 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 70D306B0089; Tue, 20 Feb 2024 13:32:51 -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 579566B0087 for ; Tue, 20 Feb 2024 13:32:51 -0500 (EST) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 2D8371607E3 for ; Tue, 20 Feb 2024 18:32:51 +0000 (UTC) X-FDA: 81813028542.09.402F2DB Received: from wout3-smtp.messagingengine.com (wout3-smtp.messagingengine.com [64.147.123.19]) by imf08.hostedemail.com (Postfix) with ESMTP id CA9E8160017 for ; Tue, 20 Feb 2024 18:32:48 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=sent.com header.s=fm1 header.b=VRjtlA7G; dkim=pass header.d=messagingengine.com header.s=fm1 header.b=C2yAIoGa; dmarc=pass (policy=none) header.from=sent.com; spf=pass (imf08.hostedemail.com: domain of zi.yan@sent.com designates 64.147.123.19 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=1708453969; 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=JtFLx5yaOzF263m9p88TzPIu/+lPjxUEnJ1pW1s4Puw=; b=g+fO/CHmVrTQmlymMV3oCUu6XPy6fu/G+IoEu7oZNCgYBmRbX+SGJwW1swq6+SNM7g3Ozj SNUjwFGEXajwWIkAbb23kDRAyU3Gs2fQtVdMwK/DPx+hAQqjes8MadaAHbZOJUVUXalpXM jeJFa5uK7iIBCyC8U0Iu4p6vt48ZUwA= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=sent.com header.s=fm1 header.b=VRjtlA7G; dkim=pass header.d=messagingengine.com header.s=fm1 header.b=C2yAIoGa; dmarc=pass (policy=none) header.from=sent.com; spf=pass (imf08.hostedemail.com: domain of zi.yan@sent.com designates 64.147.123.19 as permitted sender) smtp.mailfrom=zi.yan@sent.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1708453969; a=rsa-sha256; cv=none; b=PU5eIL3cOrgJw7GknF6ooL621jKx3rdPkqkzDDjH+rzfFlkJLgucmife705hdg9xyiD65s Gez5HCk+ZxngbcSQRwieA9AkUEs3r9HbrSNZeClDkH8SKR/Du25WuyYNnla3MBm/QW0uAf 5RcV/wIXtfBncPP45fkfDjZMY75+rRU= Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailout.west.internal (Postfix) with ESMTP id C6B773200A20; Tue, 20 Feb 2024 13:32:45 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute6.internal (MEProxy); Tue, 20 Feb 2024 13:32: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= 1708453965; x=1708540365; bh=JtFLx5yaOzF263m9p88TzPIu/+lPjxUEnJ1 pW1s4Puw=; b=VRjtlA7G82KrDKIIKo1Y7Zm97nEw7/o4k6umQLb1da6cGh3M+DT dDklWKU4Qnp80XU0OSfJi1o0G3qh1YtEelMeKfa4B33OTTwJtSHiYM8DVnlDmn8g Z5BP+vNbdbToMdlPDRnNnn3la5ZE8QWsK+Yf2vrpejqOTnQGctc/Whg7sOoP78ER b56jS6EaXfeolzC9F70DvpOVLNcxAkjOCZG0h1XQ9aalybgCYVdA9dESNQ0dbKkP KQc/zTaG/s1s0pidf0IfHrnMSZpXbAfNZx1TOyw//4rdjL0zU56XJoLmAOgmbcUN G05WBCWSJSgjWzQJCplCGSKAOU3fPe8vhag== 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= 1708453965; x=1708540365; bh=JtFLx5yaOzF263m9p88TzPIu/+lPjxUEnJ1 pW1s4Puw=; b=C2yAIoGaOWw1Un3N2oDdKfx/corJNnTKh2TK3UwOjIelhk7AwYS ivuzr2s0kc9BMZQxzvvBuOf4evdDB97D1V9Mj9d7YfxGKausSen2CKgwe4pjbCcu TX+jzENAUiQ16cmb+/JIbWJM5jHQXtx82EJpqQju1t6EqnfzvK/NlTtZV41ly+/6 U+paWmsReq8kIm/4wA+4jEqAARCaH0UdqpvpgtgFG/dbGVNmsLwhJNxS6m4ZX8t8 BN1c5q9E51SH9cFkOq6JqPkDUKTeEBVMFBiTy/38Gdd61FoqFlF4qOchBtLcDd0U 7qja5yTTCOorXbwGs+JZ/sgvbky845lsD+g== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrfedtgdduudehucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhhrgggtgfesthekredtredtjeenucfhrhhomhepkghi ucgjrghnuceoiihirdihrghnsehsvghnthdrtghomheqnecuggftrfgrthhtvghrnhepje ekteekffelleekudfftdefvddtjeejuedtuedtteegjefgvedtfedujeekieevnecuvehl uhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepiihirdihrghnse hsvghnthdrtghomh X-ME-Proxy: Feedback-ID: iccd040f4:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 20 Feb 2024 13:32:44 -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 v7 3/4] mm/compaction: add support for >0 order folio memory compaction. Date: Tue, 20 Feb 2024 13:32:19 -0500 Message-ID: <20240220183220.1451315-4-zi.yan@sent.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240220183220.1451315-1-zi.yan@sent.com> References: <20240220183220.1451315-1-zi.yan@sent.com> Reply-To: Zi Yan MIME-Version: 1.0 X-Rspam-User: X-Stat-Signature: utb98zdnpobkzzdyywkqzxwpcc95inr7 X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: CA9E8160017 X-HE-Tag: 1708453968-168732 X-HE-Meta: U2FsdGVkX1/QRuwwBcmvcN9yDXCi9xqtSZQu5WC8rXK42LM/e2Mm9vIV0A3Djm0G+cc7TOEIFNbEYjWjOUiO9c7J+0iN7Qm69gpFr9tiVQdtIQxPBPllBfpRJoF0dKVflzhCIxKFytVOWVN8+uXPJet6/N25kKDtk+rIVgotpzkVHtPCmU+41Z2xPSp/sHQG+1TX967OVy4dLbNtYTLsfEiHKudG/tDLUypbgjVFBjra6Wmv2bB6Q21E1BVTe5k2Y3y6GiuF5xvN9bQUROzB91AYJz1x5EvD75c4P3Y5a1nkS0vQETS8fV2DcGtcSSkAgJcX8CL3oGs5R7R2K1O0jh7p68+h+y7LAyXdUVmltvxXRaVuQCKGaTkbwe6RfqNKD3eTBUYICJOdUlcYXu3QuR1NHZnIcPxbV2mIk3GtlPU9AH4l/maxQogKJ7yO/n4hZLgCaJ+r9b9et94xc3Fs9lvyYMxuq2fb+CmAL/TXFSQojsFGfndPwa5jGZQEtkP4WPVYefnvHaxAIueQA+xh3GQe/dMzI6dfg/tlQXnPZpk6VbKwP60Q3IV6igHXeLBQHDJCvwk1PhyhL5ezJ785KYoLvjI1iGXyFmt8yYTRwy0YtOoPKBNJNMlXoMrzrcJd/kDJGfWcA93AdFocYQWj/0jBthYxGXCu9uaf2tKLpTY0Vcecf3zEnuDmtJelW5NDa0GD6pfbIlCIHoHApcatvJM7enqiHCYBtMsnKHiy+qFlEDDWiED1WofbiixZdryB8zRlpb0NRqGTH+hZXMOCUMlwlThdNLzeSjEG5Qa58adh08iNbRtfjxOOm2nfwj4Aog3rSHBupkK/EKRMXfTt59a2KuRpU2T8rOC5W0qiWEbptk25Mm3gNgNTbW1o7x/udCYwFzH7NxiOWaksf11lm04beh5wHEL75IGsbHNS/8u4TxMzAG3wXIEfFdOj1P5sQEiAYAOTrV1IVF44VQB fw7s8uCt rKA0YsRxu0E5XriiZ1NhQaL6kMXja6vJrN80O3phvGtIC+ZTxLWHTt4TO9qZ2MQwoqEsSeVmxJZxSR1hcQ3ciM4Qh5YDzsAUO4nRVVHQUb/5d1lt6R6+I80TqhvefRykeD2HHGSZdf0wEAy4Y5CJ4g33soK1btailCL9GKpCMO0RzrI+BbEFnUzGqYA== 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 6509fab27be9..112711752321 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -79,45 +79,56 @@ static inline bool is_via_compact_memory(int order) { return false; } #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 @@ -670,7 +681,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; @@ -735,7 +746,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); @@ -766,7 +781,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 @@ -783,15 +798,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; } @@ -1518,7 +1533,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) @@ -1647,7 +1662,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 */ @@ -1724,13 +1739,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 @@ -1790,7 +1804,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) @@ -1831,10 +1845,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); } /* @@ -1845,24 +1855,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)) - 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--; - - 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); } /* @@ -1873,10 +1881,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++; + 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 */ @@ -2489,6 +2506,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 @@ -2498,7 +2516,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); @@ -2684,7 +2703,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); @@ -2703,7 +2722,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 Tue Feb 20 18:32:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zi Yan X-Patchwork-Id: 13564336 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 1F810C54764 for ; Tue, 20 Feb 2024 18:32:55 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 981826B008A; Tue, 20 Feb 2024 13:32:54 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 908A56B008C; Tue, 20 Feb 2024 13:32:54 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 70E496B0092; Tue, 20 Feb 2024 13:32:54 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 544EF6B008A for ; Tue, 20 Feb 2024 13:32:54 -0500 (EST) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 342F84078A for ; Tue, 20 Feb 2024 18:32:54 +0000 (UTC) X-FDA: 81813028668.05.87DBDA0 Received: from wout3-smtp.messagingengine.com (wout3-smtp.messagingengine.com [64.147.123.19]) by imf11.hostedemail.com (Postfix) with ESMTP id 13DE14001C for ; Tue, 20 Feb 2024 18:32:51 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=sent.com header.s=fm1 header.b="C/BfFgk3"; dkim=pass header.d=messagingengine.com header.s=fm1 header.b=Udaf3BFo; dmarc=pass (policy=none) header.from=sent.com; spf=pass (imf11.hostedemail.com: domain of zi.yan@sent.com designates 64.147.123.19 as permitted sender) smtp.mailfrom=zi.yan@sent.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1708453972; a=rsa-sha256; cv=none; b=0WsxrJxKQ0eFqNodOFuR6MrUGP5jiffqm1NtN7Zar1AJ+gxSuWQnDQZ2xoqtK5jkVhSYgi rP6h2l5aZyGlwb2WE1XkwaQsPP944yeUTzasPXUWHpW5KB1MnKKctGkgz5kWTfRAWW+8oV JUUvwj1hZOie4/Ax24zfzKTQ1bH2nyg= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=sent.com header.s=fm1 header.b="C/BfFgk3"; dkim=pass header.d=messagingengine.com header.s=fm1 header.b=Udaf3BFo; dmarc=pass (policy=none) header.from=sent.com; spf=pass (imf11.hostedemail.com: domain of zi.yan@sent.com designates 64.147.123.19 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=1708453972; 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=2I9yVROKB+W15mI+UpYHE5WhFE4737+G/6r8N16qHZk=; b=pQmC1sm+RnZ0XakiYJufyH6+Ip/w5D/mpPMdgzHelVb3+pHY84EeLZBE8u0A0xx6LVP5Z7 9KyCU1+rR/lfYzZvqZ1NEsHUp31mLJBotNUm26b9Ot0ZON1NNL6+4ckC+mMwjL+l9I1ecG PCM6u8yVrT6s3/uoTQFwqgy/W4SlDcs= Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.west.internal (Postfix) with ESMTP id 1454C3200A54; Tue, 20 Feb 2024 13:32:48 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Tue, 20 Feb 2024 13:32: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= 1708453968; x=1708540368; bh=2I9yVROKB+W15mI+UpYHE5WhFE4737+G/6r 8N16qHZk=; b=C/BfFgk39mofWJiQq1RU1DWERdAHjGqZ9CYe67lUaTnv4DkXexC JUgAvnAb0Geveu0vCR8Yc9SLyPMqyN/tNho4hPNJx4U/8p4TzIyaIc5OktmhEKCr br24aOTURhAPSOHXhberlecYH0+s+agkxnTKkHWM7EBjj9LkiJlmyvYIg9lYsb39 k1MC00poth8h21dF4zg8DknBjbZouWKEK9G0gXzDmEqPy/WYgcb5cbhSnBK3PxEU ezq4uAP4EnS/t7OdwAvx1gFmLzKX6+0I4E9AaHC+dQFzsxKKnCmseSrNxt7+pneX K8rOQO1BMHCdml1nFSal2TuN6nsalawNrtQ== 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= 1708453968; x=1708540368; bh=2I9yVROKB+W15mI+UpYHE5WhFE4737+G/6r 8N16qHZk=; b=Udaf3BFoiTXOq1ww31/D3N6rdbCeObxT1gXG2hXa5NBnQUEJ+p1 FrTz7sVN7TfskcfLfC8lvIg7uWLwAM4gKoGLGq5PDq1H3TzHRCOWn5eABFHaUPWP hRcLPmnjhUdWr7YgxaQgBvgIUqBEFq8sUmNuaeI6CvWUaUlfr3eaIw45CIHpesDM Na1wRUkDZmVVdMvqma3brYOhrSvHyQgVMba8K8fiGYgkM1qfP2v3zaZpIaOApfNj XL6QJvDFvWitaPcbo8lJ/oJtMrlxWiFEHifseopH2PWBynBXM9l0160t+59lzuIK WRXy6u9dxKaJeE4fNamBvXRDfWPNYrzk+uA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrfedtgdduudehucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhhrgggtgfesthekredtredtjeenucfhrhhomhepkghi ucgjrghnuceoiihirdihrghnsehsvghnthdrtghomheqnecuggftrfgrthhtvghrnhepje ekteekffelleekudfftdefvddtjeejuedtuedtteegjefgvedtfedujeekieevnecuvehl uhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepiihirdihrghnse hsvghnthdrtghomh X-ME-Proxy: Feedback-ID: iccd040f4:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 20 Feb 2024 13:32: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 v7 4/4] mm/compaction: optimize >0 order folio compaction with free page split. Date: Tue, 20 Feb 2024 13:32:20 -0500 Message-ID: <20240220183220.1451315-5-zi.yan@sent.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240220183220.1451315-1-zi.yan@sent.com> References: <20240220183220.1451315-1-zi.yan@sent.com> Reply-To: Zi Yan MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 13DE14001C X-Stat-Signature: uicjyc8w6jcstto1ssim8ofnb3mnqos9 X-HE-Tag: 1708453971-558100 X-HE-Meta: U2FsdGVkX1/KDa2yWqr/+Q7j6fBRxpNkRdLIxeLi034JNynjbk5iPicSu+1VimLhgrd7H1QBtk0Ir0L4l360yvRzq9UBTcFYJSkC7ikG8TtH8N1pWFnmkkmWit6jj3Or8t5xTWR7aVKQE7Mt1EdR1i7k/0RgzF5FLVNAwuy+9hwbkIC/QVbauRbTSFJU0fRUOJDO6WjPEbEiniNIgr1LC9euSwfaIe2MoG+TwAXF/QaYCm+bddISBJF/IBV8j220u3BPgBIeFITYzIhhWloP9PSHnrQH8BQVzORgVP8ZbkV/gC3OiLGVQRfnOhq0JRHXEfKHmDTJL0dKHEXPpRvhtboWsRcQO6FxOzDZGZfJ/yz1sN2P1z00glSL8TLRgAjl7RUxqnEtPp4IZ1dT1A6HORzd0y3/Xnbb6QNeU995FgcvX8dHtNDf3MLQnq47oKHAr5Nzo98oIxXUI83grY8JStnV1f1L+MrOqzdOD6xdIyNJUhg0gKdC1E50aAYxg6Z0toqzBT4zGFbFZmuKJe5lBrsU0xYSF6GGZYAz0MrvoYxavaThmfZ2QFxb8mvwzgyrNR1acdn10P3+EfXKM9hSnQOcWAxToLyCHUJcNO2gnooD1nfG5Aqa3ucT3VvexMtaQ+hOO/gZRLPq1EqdzaKRF1tVowFJvsdgXZsxasv8CnoFHUUqyaS86a92W0FaA19SFGZRmp9IivJPNlgFSPn+4Z526LafVo9Fu34cafwKpfcoTq7T7ILlSwXCbIpuX6QzpmfQUqGDrYwHzq6M+wgOa5cegN4XAM8gzAYcBadnmk9X+aFqxUZ9Zy+YGLK5j82+EUaBTYAb9dbu/SErU3OvoOLym7AMG4WsBpJRRCZTmVXwRi9EbikMEtiX4i1bMjncpiDULwsCv5Qv+UkOVd4YFjwLoW1EVNs8cGtckZ9GWoLer48JvRzCja+hc9fBLN+Ii+imnIp2uv4gFgj2MDR zT2t7F3g sNNM8Q7paovpnZ0/wMogsP4vw0Yc0vWYR+lGwnnSmH1hqL0dLsDWOMFlHVJM6KxxQOmTemuz6kB8+RJLmuEM3nCOSvXlAEf4HNs7t+sbvUNyul0Hpax5X4/qfoTufD08NKgUf3YG67eUnQIGElvZVo08D2mBOwrrw0vz8LQLHU+MQ1PB5Ls7j3YdpDQ== 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 112711752321..e70309674262 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -1856,15 +1856,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);