From patchwork Wed Feb 14 22:04: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: 13557108 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 6D4D7C48BC3 for ; Wed, 14 Feb 2024 22:04:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B62C18D0017; Wed, 14 Feb 2024 17:04:40 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id B12738D0001; Wed, 14 Feb 2024 17:04:40 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 98C3B8D0017; Wed, 14 Feb 2024 17:04:40 -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 8A5EC8D0001 for ; Wed, 14 Feb 2024 17:04:40 -0500 (EST) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 5C1791404E9 for ; Wed, 14 Feb 2024 22:04:40 +0000 (UTC) X-FDA: 81791789520.23.6D2E1F2 Received: from out4-smtp.messagingengine.com (out4-smtp.messagingengine.com [66.111.4.28]) by imf09.hostedemail.com (Postfix) with ESMTP id 29C96140010 for ; Wed, 14 Feb 2024 22:04:37 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=sent.com header.s=fm3 header.b=JBDJWFY7; dkim=pass header.d=messagingengine.com header.s=fm3 header.b=Syr7Aizs; spf=pass (imf09.hostedemail.com: domain of zi.yan@sent.com designates 66.111.4.28 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=1707948278; 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=Pw8iFzi+4Wlq8GCwOctfvzaOJplSj1uRK0yZlCI1Ab0=; b=I9BcirxXEVqixG0wPJ0FSNnvshm4W4lyadgzUuP7tpDBwa3g50MUbz8VMNkl1qQwp8BD31 fBUyCWdtj2/P8oZSEw8I8VDA+unHADMulTpC3I81RSrhOQbJJQQmCKpja5oU+uwU2n3Lwt Jtqg8kLNXOksFuVWcpLCFG2myXOdzHI= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=sent.com header.s=fm3 header.b=JBDJWFY7; dkim=pass header.d=messagingengine.com header.s=fm3 header.b=Syr7Aizs; spf=pass (imf09.hostedemail.com: domain of zi.yan@sent.com designates 66.111.4.28 as permitted sender) smtp.mailfrom=zi.yan@sent.com; dmarc=pass (policy=none) header.from=sent.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1707948278; a=rsa-sha256; cv=none; b=KEzNnmeL9+Ju8bMcSq+K9GaFxvTkke0ljXbkH5Te5rggXaebXO81mExhEYorSyHSCQFVN3 hh826hGE3MI7p3WhbjiHbwjgOW89Gkn1NGRBbp5vXgqmj5hj6FmOCoAHxhPhN+bDEtw6OC O737W9JCK/6UrFihhPwj8rawwfxuuDM= Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 66C8C5C0087; Wed, 14 Feb 2024 17:04:37 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Wed, 14 Feb 2024 17:04:37 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sent.com; h=cc :cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:reply-to:subject:subject:to:to; s=fm3; t= 1707948277; x=1708034677; bh=Pw8iFzi+4Wlq8GCwOctfvzaOJplSj1uRK0y ZlCI1Ab0=; b=JBDJWFY7p7n/L8+ggyhC1OFPrK0sll4mus15uuuCFxLyN4x1dfS wT9D2uAhpYZkNA1h7pE7qSShC1dnX4ZXyANvl40VK6um7a2dItNOHdEo2sprHZje O6TbRba0xai5Ce/1rtfHLbCtN5XupC8OgpJiakkbyTqObcv8Jic/rIJUzkKP7mrN Ob19YIpwQ2pljVF7fjhYBBPPubTa2BuuMb8fD9rAoBDzgSjPhru2yhrJw9Bm+/m3 Z7wueGRCNrGWflCNlHlUMbvzpCY+Jig/4df8VYHIn4OPWtSMWDLp5Q3BcmqocXhE ObtoA27LX586bXn272J1HOhzAkzzT/yZVnQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:reply-to:subject:subject:to:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t= 1707948277; x=1708034677; bh=Pw8iFzi+4Wlq8GCwOctfvzaOJplSj1uRK0y ZlCI1Ab0=; b=Syr7AizsUQV8PlY0WaGklQNr48lOFnqElp1+dGba+UdIZvkXyYM 88NYt9kW0hRJb99t9LEuzhmY6ZeqxsiQp+CcOIlB9YgNOjxLYBmrJPfQPpj11HC4 +QmwtOuk2DOXRN+vegbCXpGUwwWFW9e7gNJu+ITTUoL11lfg4y780K1RzytuTZ/o k2H3GEKFC6/rtJ44RlGz+lQ0n7dVcMkV93GA2RG7alTr3QWyjdkeZ3+Hvrf7mJ3u 0P5Dut466Ks75wIuVhQv/eRIN06Tv+l5mdCrZe4RLa9zPnz2AlZZ9NMdN+56Mu0l g+8PA5W9vYgiVFV1WaX+1IUMfWM/4vGAUUA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrudejgdduheekucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhhrgggtgfesthekredtredtjeenucfhrhhomhepkghi ucgjrghnuceoiihirdihrghnsehsvghnthdrtghomheqnecuggftrfgrthhtvghrnhepje ekteekffelleekudfftdefvddtjeejuedtuedtteegjefgvedtfedujeekieevnecuvehl uhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepiihirdihrghnse hsvghnthdrtghomh X-ME-Proxy: Feedback-ID: iccd040f4:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 14 Feb 2024 17:04:36 -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 v5 2/3] mm/compaction: add support for >0 order folio memory compaction. Date: Wed, 14 Feb 2024 17:04:19 -0500 Message-ID: <20240214220420.1229173-3-zi.yan@sent.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240214220420.1229173-1-zi.yan@sent.com> References: <20240214220420.1229173-1-zi.yan@sent.com> Reply-To: Zi Yan MIME-Version: 1.0 X-Rspamd-Queue-Id: 29C96140010 X-Rspam-User: X-Stat-Signature: g4mhtephzq73uq3p7mfea49mfs4d13sb X-Rspamd-Server: rspam01 X-HE-Tag: 1707948277-827667 X-HE-Meta: U2FsdGVkX1+EcCwY5s19NtrTAbeo7egM/HI+3HACKwqVknIG2L3am4POik5bB3ApbhX9in0zF+Q0LdRD+CUdrM2Y0O4MpFlW1yQ6+wRAmdWzRvzzmlQrc3wa4riFhodl+PHA5O0OzG55tDLaHBXG2k7jC6T68Khs/TjaBRCLHt9tAQumUHMDE9165jsXElqOJOoaLew8OF0YbQNbsXW12jOIb9H0K+IQ2nrKKQIHz/Hy7rbKdfJU+ccvaswmYHAKszhgK17yY1I8jTsVEEgTbpskA9lGyXJ/W+V/XKNIQ+LjayKr+Usej9vvgpQScJC3icrVgPdC2KzhdUiDZGkmLXwWxZzmdnxWG7Y6pncWr/DZE+mmUUgvqtfViHmcqeyKdXegILxYBXJZAx1V+8Y6KCeqg28+e0+L1r/pOBUMZLUNRnJ0JeYjui+VYxgWye4naMzKjdeW5ZP+MkbkkV5saFCVxJ/1iWVNWS6O6nHYGl55JzUHDLQjjLaDaVvHSBTKp71GCRSVVIwfe1SlWG+4pEy+DfO29IxFKGydHfUFp7b7k/aIKoDPSvTGn54JPvuTIUXBk4HG9fpfjMlK7gZk/ij4g/0Dz1ofIYIxWJSbP6tBITs+gl9hWe0CNBG+wdnBobgbOwbXwqaUrMYa7AYqqnLHY5m43DYSpfptlW1ruaPgWFWfQvywpSfLwze7W5HF4NXoFRR3iC7WP+FuW9CIyVoLEo8ZfE/cTVqNzsk9oShwac7CQdnJWooBRnMIR4v/Z/oIVzFbCVc+FfT7HhhdbOZb5TKut0jens2YzJLTw2amfuO0xFbPuQ8smEtx6FcEVyc5tmGOMpzqLI2XN38049qJxT3aarXOusaPXX7WPY4/l7SV1MNr5GIR2vlgc2/3QD/fLOo+QcdtOiYkYs9DbUpLYeWnP0phXOCjBeBp78x/edeFfF4aJ06N7g+QeoU/CnXLOoaxYA4+KZR2dhS x2EvNwHL 9H1fHHY2mSEXtXkL9b4mjey20WcQHsqDB8X34vej0ha3CRHvNDIst8aX3LVtuQfy8dNrM5dHTpyditMDg+dQ39yc5zOTPFzI6r4NXTVRUH7sKfli6dCQ/tPdrIz5AkdmFAKysCZ1u/8E6tFlnBN80lKoptRrTNnZ7gty4b2xc5+iGgRavc9CZoHDctW0N2SUqxb2bMANlHTr2QJ/LaQLQRHGbKK0fJzfYN8RF4Yr1ngMyAD9F+RG2Wegy/z7aZWl+TyU8Imq8+MWku3HdP3blSPo9NR8LP2j7FyxHldM6ydYjjqjiSGVV2xRGnI7/+gIOY1Zhpk1w4hkSKRKFiBmrHkAWOcNuYINNkLchREHNQIfx1BI2B+mlRF8vKI4DN7Jmo1zeU7jl3MP8MhhfgxP57NEGRS3eQ92QJIPAGj6EVBPv/zsITxwYKvX2ztS/d1ekho1oq8n+yAV89rjnPZ/V/SuLWGvvkklEH4ks4SAaGwvdwSmG1A/vQPwFSVSvNez2njhuksw+z5xMlQb/kz37sTm3N3uTxEKfpWRwidZIOoxJMPSYVjU9KyhkbLxZwsxgtEEBqpygRuvbEV4/mfz35532tKs+fEHy9dImhzkUUJJeOYAP9SOACizSeTD3MKPQB/q6qsNjZmr/5k6t/CalfBp6hF84YPSlLMWLtyEkdDGIFI3bNVnfiK69Vd66bkB8Ed6YivTGzBg+XEkoj77vrjrzbZvU8/3skhVx/PQCbw8m9ybpYRioYaw4qVyw4BJOZvuC43iC4HpWHC0z+p7rVUbxx8q4I5HV9f/stCQrVKnf+CViHs+kUi+XYEbRTWvWYAuIi0ObBq1cPhr5BvqT9UGDoGre2EO8MMScXxnh0m12zCY3oa/zT5FB6sIav4BDg+qdGDjWdfnFwKvl5ujQ5r6RMD2/f3+ZWewL04fbPmYgvgM1v4IYqaBwZEWWx7qtvwevchMx5/ZDIXj30mkB4PT+xhc+ ALHQTGG/ h/uFJAisV1KaVQuQgWDCJdm/Oe69jzO+ X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: From: Zi Yan Before last commit, memory compaction only migrates order-0 folios and skips >0 order folios. Last commit splits all >0 order folios during compaction. This commit migrates >0 order folios during compaction by keeping isolated free pages at their original size without splitting them into order-0 pages and using them directly during migration process. What is different from the prior implementation: 1. All isolated free pages are kept in a NR_PAGE_ORDERS array of page lists, where each page list stores free pages in the same order. 2. All free pages are not post_alloc_hook() processed nor buddy pages, although their orders are stored in first page's private like buddy pages. 3. During migration, in new page allocation time (i.e., in compaction_alloc()), free pages are then processed by post_alloc_hook(). When migration fails and a new page is returned (i.e., in compaction_free()), free pages are restored by reversing the post_alloc_hook() operations using newly added free_pages_prepare_fpi_none(). Step 3 is done for a latter optimization that splitting and/or merging free pages during compaction becomes easier. Note: without splitting free pages, compaction can end prematurely due to migration will return -ENOMEM even if there is free pages. This happens when no order-0 free page exist and compaction_alloc() return NULL. Signed-off-by: Zi Yan Reviewed-by: Baolin Wang Tested-by: Baolin Wang 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 Reviewed-by: Vlastimil Babka --- mm/compaction.c | 143 +++++++++++++++++++++++++++--------------------- mm/internal.h | 4 +- mm/page_alloc.c | 6 ++ 3 files changed, 91 insertions(+), 62 deletions(-) diff --git a/mm/compaction.c b/mm/compaction.c index aa6aad805c4d..d0a05a621b67 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -66,45 +66,56 @@ static inline void count_compact_events(enum vm_event_item item, long delta) #define COMPACTION_HPAGE_ORDER (PMD_SHIFT - PAGE_SHIFT) #endif -static unsigned long release_freepages(struct list_head *freelist) +static void split_map_pages(struct list_head *freepages) { + unsigned int i, order; struct page *page, *next; - unsigned long high_pfn = 0; + LIST_HEAD(tmp_list); - list_for_each_entry_safe(page, next, freelist, lru) { - unsigned long pfn = page_to_pfn(page); - list_del(&page->lru); - __free_page(page); - if (pfn > high_pfn) - high_pfn = pfn; - } + for (order = 0; order < NR_PAGE_ORDERS; order++) { + list_for_each_entry_safe(page, next, &freepages[order], lru) { + unsigned int nr_pages; - return high_pfn; + list_del(&page->lru); + + nr_pages = 1 << order; + + post_alloc_hook(page, order, __GFP_MOVABLE); + if (order) + split_page(page, order); + + for (i = 0; i < nr_pages; i++) { + list_add(&page->lru, &tmp_list); + page++; + } + } + list_splice_init(&tmp_list, &freepages[0]); + } } -static void split_map_pages(struct list_head *list) +static unsigned long release_free_list(struct list_head *freepages) { - unsigned int i, order, nr_pages; - struct page *page, *next; - LIST_HEAD(tmp_list); - - list_for_each_entry_safe(page, next, list, lru) { - list_del(&page->lru); + int order; + unsigned long high_pfn = 0; - order = page_private(page); - nr_pages = 1 << order; + for (order = 0; order < NR_PAGE_ORDERS; order++) { + struct page *page, *next; - post_alloc_hook(page, order, __GFP_MOVABLE); - if (order) - split_page(page, order); + list_for_each_entry_safe(page, next, &freepages[order], lru) { + unsigned long pfn = page_to_pfn(page); - for (i = 0; i < nr_pages; i++) { - list_add(&page->lru, &tmp_list); - page++; + list_del(&page->lru); + /* + * Convert free pages into post allocation pages, so + * that we can free them via __free_page. + */ + post_alloc_hook(page, order, __GFP_MOVABLE); + __free_pages(page, order); + if (pfn > high_pfn) + high_pfn = pfn; } } - - list_splice(&tmp_list, list); + return high_pfn; } #ifdef CONFIG_COMPACTION @@ -657,7 +668,7 @@ static unsigned long isolate_freepages_block(struct compact_control *cc, nr_scanned += isolated - 1; total_isolated += isolated; cc->nr_freepages += isolated; - list_add_tail(&page->lru, freelist); + list_add_tail(&page->lru, &freelist[order]); if (!strict && cc->nr_migratepages <= cc->nr_freepages) { blockpfn += isolated; @@ -722,7 +733,11 @@ isolate_freepages_range(struct compact_control *cc, unsigned long start_pfn, unsigned long end_pfn) { unsigned long isolated, pfn, block_start_pfn, block_end_pfn; - LIST_HEAD(freelist); + int order; + struct list_head tmp_freepages[NR_PAGE_ORDERS]; + + for (order = 0; order < NR_PAGE_ORDERS; order++) + INIT_LIST_HEAD(&tmp_freepages[order]); pfn = start_pfn; block_start_pfn = pageblock_start_pfn(pfn); @@ -753,7 +768,7 @@ isolate_freepages_range(struct compact_control *cc, break; isolated = isolate_freepages_block(cc, &isolate_start_pfn, - block_end_pfn, &freelist, 0, true); + block_end_pfn, tmp_freepages, 0, true); /* * In strict mode, isolate_freepages_block() returns 0 if @@ -770,15 +785,15 @@ isolate_freepages_range(struct compact_control *cc, */ } - /* __isolate_free_page() does not map the pages */ - split_map_pages(&freelist); - if (pfn < end_pfn) { /* Loop terminated early, cleanup. */ - release_freepages(&freelist); + release_free_list(tmp_freepages); return 0; } + /* __isolate_free_page() does not map the pages */ + split_map_pages(tmp_freepages); + /* We don't use freelists for anything. */ return pfn; } @@ -1494,7 +1509,7 @@ fast_isolate_around(struct compact_control *cc, unsigned long pfn) if (!page) return; - isolate_freepages_block(cc, &start_pfn, end_pfn, &cc->freepages, 1, false); + isolate_freepages_block(cc, &start_pfn, end_pfn, cc->freepages, 1, false); /* Skip this pageblock in the future as it's full or nearly full */ if (start_pfn == end_pfn && !cc->no_set_skip_hint) @@ -1623,7 +1638,7 @@ static void fast_isolate_freepages(struct compact_control *cc) nr_scanned += nr_isolated - 1; total_isolated += nr_isolated; cc->nr_freepages += nr_isolated; - list_add_tail(&page->lru, &cc->freepages); + list_add_tail(&page->lru, &cc->freepages[order]); count_compact_events(COMPACTISOLATED, nr_isolated); } else { /* If isolation fails, abort the search */ @@ -1700,13 +1715,12 @@ static void isolate_freepages(struct compact_control *cc) unsigned long isolate_start_pfn; /* exact pfn we start at */ unsigned long block_end_pfn; /* end of current pageblock */ unsigned long low_pfn; /* lowest pfn scanner is able to scan */ - struct list_head *freelist = &cc->freepages; unsigned int stride; /* Try a small search of the free lists for a candidate */ fast_isolate_freepages(cc); if (cc->nr_freepages) - goto splitmap; + return; /* * Initialise the free scanner. The starting point is where we last @@ -1766,7 +1780,7 @@ static void isolate_freepages(struct compact_control *cc) /* Found a block suitable for isolating free pages from. */ nr_isolated = isolate_freepages_block(cc, &isolate_start_pfn, - block_end_pfn, freelist, stride, false); + block_end_pfn, cc->freepages, stride, false); /* Update the skip hint if the full pageblock was scanned */ if (isolate_start_pfn == block_end_pfn) @@ -1807,10 +1821,6 @@ static void isolate_freepages(struct compact_control *cc) * and the loop terminated due to isolate_start_pfn < low_pfn */ cc->free_pfn = isolate_start_pfn; - -splitmap: - /* __isolate_free_page() does not map the pages */ - split_map_pages(freelist); } /* @@ -1821,24 +1831,22 @@ static struct folio *compaction_alloc(struct folio *src, unsigned long data) { struct compact_control *cc = (struct compact_control *)data; struct folio *dst; + int order = folio_order(src); - /* this makes migrate_pages() split the source page and retry */ - if (folio_test_large(src) > 0) - return NULL; - - if (list_empty(&cc->freepages)) { + if (list_empty(&cc->freepages[order])) { isolate_freepages(cc); - - if (list_empty(&cc->freepages)) + if (list_empty(&cc->freepages[order])) return NULL; } - dst = list_entry(cc->freepages.next, struct folio, lru); + dst = list_first_entry(&cc->freepages[order], struct folio, lru); list_del(&dst->lru); - cc->nr_freepages--; - cc->nr_migratepages -= 1 << folio_order(src); - - return dst; + post_alloc_hook(&dst->page, order, __GFP_MOVABLE); + if (order) + prep_compound_page(&dst->page, order); + cc->nr_freepages -= 1 << order; + cc->nr_migratepages -= 1 << order; + return page_rmappable_folio(&dst->page); } /* @@ -1849,10 +1857,22 @@ static struct folio *compaction_alloc(struct folio *src, unsigned long data) static void compaction_free(struct folio *dst, unsigned long data) { struct compact_control *cc = (struct compact_control *)data; + int order = folio_order(dst); + struct page *page = &dst->page; + + if (folio_put_testzero(dst)) { + free_pages_prepare_fpi_none(page, order); + + INIT_LIST_HEAD(&dst->lru); - list_add(&dst->lru, &cc->freepages); - cc->nr_freepages++; - cc->nr_migratepages += 1 << folio_order(dst); + list_add(&dst->lru, &cc->freepages[order]); + cc->nr_freepages += 1 << order; + cc->nr_migratepages += 1 << order; + } + /* + * someone else has referenced the page, we cannot take it back to our + * free list. + */ } /* possible outcome of isolate_migratepages */ @@ -2476,6 +2496,7 @@ compact_zone(struct compact_control *cc, struct capture_control *capc) const bool sync = cc->mode != MIGRATE_ASYNC; bool update_cached; unsigned int nr_succeeded = 0; + int order; /* * These counters track activities during zone compaction. Initialize @@ -2485,7 +2506,8 @@ compact_zone(struct compact_control *cc, struct capture_control *capc) cc->total_free_scanned = 0; cc->nr_migratepages = 0; cc->nr_freepages = 0; - INIT_LIST_HEAD(&cc->freepages); + for (order = 0; order < NR_PAGE_ORDERS; order++) + INIT_LIST_HEAD(&cc->freepages[order]); INIT_LIST_HEAD(&cc->migratepages); cc->migratetype = gfp_migratetype(cc->gfp_mask); @@ -2671,7 +2693,7 @@ compact_zone(struct compact_control *cc, struct capture_control *capc) * so we don't leave any returned pages behind in the next attempt. */ if (cc->nr_freepages > 0) { - unsigned long free_pfn = release_freepages(&cc->freepages); + unsigned long free_pfn = release_free_list(cc->freepages); cc->nr_freepages = 0; VM_BUG_ON(free_pfn == 0); @@ -2690,7 +2712,6 @@ compact_zone(struct compact_control *cc, struct capture_control *capc) trace_mm_compaction_end(cc, start_pfn, end_pfn, sync, ret); - VM_BUG_ON(!list_empty(&cc->freepages)); VM_BUG_ON(!list_empty(&cc->migratepages)); return ret; diff --git a/mm/internal.h b/mm/internal.h index 1e29c5821a1d..9925291e7704 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -447,6 +447,8 @@ extern void prep_compound_page(struct page *page, unsigned int order); extern void post_alloc_hook(struct page *page, unsigned int order, gfp_t gfp_flags); +extern bool free_pages_prepare_fpi_none(struct page *page, unsigned int order); + extern int user_min_free_kbytes; extern void free_unref_page(struct page *page, unsigned int order); @@ -481,7 +483,7 @@ int split_free_page(struct page *free_page, * completes when free_pfn <= migrate_pfn */ struct compact_control { - struct list_head freepages; /* List of free pages to migrate to */ + struct list_head freepages[NR_PAGE_ORDERS]; /* List of free pages to migrate to */ struct list_head migratepages; /* List of pages being migrated */ unsigned int nr_freepages; /* Number of isolated free pages */ unsigned int nr_migratepages; /* Number of pages to migrate */ diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 7ae4b74c9e5c..e6e2ac722a82 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -1179,6 +1179,12 @@ static __always_inline bool free_pages_prepare(struct page *page, return true; } +__always_inline bool free_pages_prepare_fpi_none(struct page *page, + unsigned int order) +{ + return free_pages_prepare(page, order, FPI_NONE); +} + /* * Frees a number of pages from the PCP lists * Assumes all pages on list are in same zone.