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;