From patchwork Tue Sep 12 16:28:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zi Yan X-Patchwork-Id: 138430 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp671341vqx; Tue, 12 Sep 2023 13:47:20 -0700 (PDT) X-Google-Smtp-Source: AGHT+IErAswxuaxpeFbs6yNjTKATq8n0OWsTVVjuYiEPfJalImxG+RyFW+JQvnU69Hd+lrEl8QgU X-Received: by 2002:a05:6a20:9148:b0:154:e887:f581 with SMTP id x8-20020a056a20914800b00154e887f581mr504278pzc.58.1694551640333; Tue, 12 Sep 2023 13:47:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694551640; cv=none; d=google.com; s=arc-20160816; b=k8hCIkMADm5u2nE9ml3ZlXguf8Ednfl4VUhKvGtrESmGsY7w6vKUzCREZcqKaKQ136 ADUf/K8fOy0ecTRfXcjXnqgCaB/hTu9VuKAUKGpqWxOgiCFWfiuUtyjTTF8eLgs/j3xV b8l1TcFK0DW1MExBDnb1TfsUohA9QF7Nc260odv3Ar9e4lD1f/8DXgMqXWnvrY3oe937 1BjHdB5JAok/5AAzNdZXMhpXeer7r+PxEp+Km9vpFI3PW5bCHIyobD5BZ3xRE0YTLuZI irSZy2MbpJ4Zpiifav05JVsvLqJx9m3B4GOQAF+K5BuGDLetIHJsRIhGNVFPY7h4SBtU fdDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version:reply-to :references:in-reply-to:message-id:date:subject:cc:to:from :feedback-id:dkim-signature:dkim-signature; bh=9vQ7qsdQ+RP7SfzfLEPFzsLiQiKEomD6WH+2Rhu3mcA=; fh=bUDnJOBC0/apF/24NaPi+H6rvMB40CebS5Pe6QbQjAo=; b=GHWlNNq/+SzYJMLqTUDfUY6HIq99ZVniWPYwI9xAk0ljqhrPDMrUKYE7cBc1qx43N4 89Kq3Q68KVj819nztN3QKRPmI0VGrrM+FZc6KdjHZG4EVcz3Il4PtWXEF9sp+fKdVU/H 5VtVFdXktDO/YcdsuIbiin554D5QlXN3w/R1opOOu/geR7/SPZ/qpcV/gDt8Kre8fMpe onPOqSXPo/jpMQBCZ6T0elD4PW9K445D67nOcN+VZvt31QLKEO1cSeYxl8Wz4d7QNouz TiJ9OMjKaU7KpJVzKhVPk7MvFWsqZmbGM9gPrr8JkWNleyAEQdA2ohB4ed2Uffa6qpsw DQ6w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sent.com header.s=fm1 header.b=ZpTUQyvb; dkim=pass header.i=@messagingengine.com header.s=fm1 header.b=OcdsQuOP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sent.com Received: from pete.vger.email (pete.vger.email. [23.128.96.36]) by mx.google.com with ESMTPS id j9-20020a635509000000b005740286f2a8si8346739pgb.286.2023.09.12.13.47.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Sep 2023 13:47:20 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) client-ip=23.128.96.36; Authentication-Results: mx.google.com; dkim=pass header.i=@sent.com header.s=fm1 header.b=ZpTUQyvb; dkim=pass header.i=@messagingengine.com header.s=fm1 header.b=OcdsQuOP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sent.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by pete.vger.email (Postfix) with ESMTP id 30855829D26C; Tue, 12 Sep 2023 09:29:03 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236769AbjILQ2l (ORCPT + 37 others); Tue, 12 Sep 2023 12:28:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36906 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236704AbjILQ2i (ORCPT ); Tue, 12 Sep 2023 12:28:38 -0400 Received: from out2-smtp.messagingengine.com (out2-smtp.messagingengine.com [66.111.4.26]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5407E1703 for ; Tue, 12 Sep 2023 09:28:34 -0700 (PDT) Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id BEFC75C0208; Tue, 12 Sep 2023 12:28:33 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute3.internal (MEProxy); Tue, 12 Sep 2023 12:28:33 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sent.com; h=cc :cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:reply-to:sender:subject:subject:to:to; s=fm1; t= 1694536113; x=1694622513; bh=9vQ7qsdQ+RP7SfzfLEPFzsLiQiKEomD6WH+ 2Rhu3mcA=; b=ZpTUQyvbyV86YCj8+3kbPP+syFXBrGgx3+Nr/1LDYo3RlD0TEfe z+DgnttaQrSQLsdQ4bk6O9orX5XPfxFqTZ5TIm91hxMMdPnE3IsZTfH4DHuh3zDq E3O3SG4nLzshPZr/boNkN5n4z6/qYeUaFnu5FNV0M24VVvKIYs4CtQSlclzSnY0d AIifFKGP9lCkVhsJm8c2RS8kedtIot0h00/dra5EBUjL+ShKp0CTPWrL6B0k87JY bzIxO3VlxRN522MYC0/aMnxR74xaE4HTxQsiTrqv/Xw2Ov/p5QcdW7qdyEeCipCm KHJihqMxfqb/dNjpf/IEbzw0MQGzNwpGJcA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :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:sender:subject:subject:to:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t= 1694536113; x=1694622513; bh=9vQ7qsdQ+RP7SfzfLEPFzsLiQiKEomD6WH+ 2Rhu3mcA=; b=OcdsQuOPW/n5J3Tv/jrZYHO7ACqUAqPO7cbR7NEnnUDNby5cBmt JIGBbEHQLathe3cIGoaYPVMirFM/uLUyoUq+o43WBp+VoyJSBlSxaEDX7wFgUwjU 7PKImSoNiYSUVemuQHP05u0C2kiuWUOukrIZyNnPcw4lXe+oKXQssqXns0Yvqcht jaY9VPsQozSigm0SAXnGBNoHYUmzfyky8yFUf5BSER69qJHhxTyg730gi5yIRr1c x02bDfPEObCnoFRelAypAvUUOJ3LyXZmVRgFSNleq6x1Con7O286zDl7qMZHw3Nw 81eOQDT9HRCb3DXw602USF4Ju5VtkNZvj6Q== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedviedrudeiiedguddtudcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefhvfevufffkffojghfrhgggfestdhqredtredttdenucfhrhhomhepkghi ucgjrghnuceoiihirdihrghnsehsvghnthdrtghomheqnecuggftrfgrthhtvghrnhepge eghedugfduuddvleehheetgeeltdetieevuefhffevkefhveeufeeiieejgedvnecuvehl uhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepiihirdihrghnse hsvghnthdrtghomh X-ME-Proxy: Feedback-ID: iccd040f4:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 12 Sep 2023 12:28:32 -0400 (EDT) From: Zi Yan To: linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Zi Yan , Ryan Roberts , Andrew Morton , "Matthew Wilcox (Oracle)" , David Hildenbrand , "Yin, Fengwei" , Yu Zhao , Vlastimil Babka , Johannes Weiner , Baolin Wang , Kemeng Shi , Mel Gorman , Rohan Puri , Mcgrof Chamberlain , Adam Manzanares , John Hubbard Subject: [RFC PATCH 1/4] mm/compaction: add support for >0 order folio memory compaction. Date: Tue, 12 Sep 2023 12:28:12 -0400 Message-Id: <20230912162815.440749-2-zi.yan@sent.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230912162815.440749-1-zi.yan@sent.com> References: <20230912162815.440749-1-zi.yan@sent.com> Reply-To: Zi Yan MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (pete.vger.email [0.0.0.0]); Tue, 12 Sep 2023 09:29:03 -0700 (PDT) X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776858260906963871 X-GMAIL-MSGID: 1776866180851476156 From: Zi Yan Before, memory compaction only migrates order-0 folios and skips >0 order folios. This commit adds support for >0 order folio 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 MAX_ORDER+1 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. Step 3 is done for a latter optimization that splitting and/or merging free pages during compaction becomes easier. Signed-off-by: Zi Yan --- mm/compaction.c | 108 +++++++++++++++++++++++++++++++++++++++--------- mm/internal.h | 7 +++- 2 files changed, 94 insertions(+), 21 deletions(-) diff --git a/mm/compaction.c b/mm/compaction.c index 01ba298739dd..868e92e55d27 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -107,6 +107,44 @@ static void split_map_pages(struct list_head *list) list_splice(&tmp_list, list); } +static unsigned long release_free_list(struct free_list *freepages) +{ + int order; + unsigned long high_pfn = 0; + + for (order = 0; order <= MAX_ORDER; order++) { + struct page *page, *next; + + list_for_each_entry_safe(page, next, &freepages[order].pages, lru) { + unsigned long pfn = page_to_pfn(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; + } + } + return high_pfn; +} + +static void sort_free_pages(struct list_head *src, struct free_list *dst) +{ + unsigned int order; + struct page *page, *next; + + list_for_each_entry_safe(page, next, src, lru) { + order = buddy_order(page); + + list_move(&page->lru, &dst[order].pages); + dst[order].nr_free++; + } +} + #ifdef CONFIG_COMPACTION bool PageMovable(struct page *page) { @@ -1422,6 +1460,7 @@ fast_isolate_around(struct compact_control *cc, unsigned long pfn) { unsigned long start_pfn, end_pfn; struct page *page; + LIST_HEAD(freelist); /* Do not search around if there are enough pages already */ if (cc->nr_freepages >= cc->nr_migratepages) @@ -1439,7 +1478,8 @@ 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, &freelist, 1, false); + sort_free_pages(&freelist, cc->freepages); /* Skip this pageblock in the future as it's full or nearly full */ if (start_pfn == end_pfn && !cc->no_set_skip_hint) @@ -1568,7 +1608,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].pages); count_compact_events(COMPACTISOLATED, nr_isolated); } else { /* If isolation fails, abort the search */ @@ -1642,13 +1682,13 @@ 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; + LIST_HEAD(freelist); /* 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 @@ -1708,7 +1748,8 @@ 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, &freelist, stride, false); + sort_free_pages(&freelist, cc->freepages); /* Update the skip hint if the full pageblock was scanned */ if (isolate_start_pfn == block_end_pfn) @@ -1749,10 +1790,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); } /* @@ -1763,18 +1800,21 @@ 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); - if (list_empty(&cc->freepages)) { + if (!cc->freepages[order].nr_free) { isolate_freepages(cc); - - if (list_empty(&cc->freepages)) + if (!cc->freepages[order].nr_free) return NULL; } - dst = list_entry(cc->freepages.next, struct folio, lru); + dst = list_first_entry(&cc->freepages[order].pages, struct folio, lru); + cc->freepages[order].nr_free--; list_del(&dst->lru); - cc->nr_freepages--; - + post_alloc_hook(&dst->page, order, __GFP_MOVABLE); + if (order) + prep_compound_page(&dst->page, order); + cc->nr_freepages -= 1 << order; return dst; } @@ -1786,9 +1826,34 @@ 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++; + if (order) { + int i; + + page[1].flags &= ~PAGE_FLAGS_SECOND; + for (i = 1; i < (1 << order); i++) { + page[i].mapping = NULL; + clear_compound_head(&page[i]); + page[i].flags &= ~PAGE_FLAGS_CHECK_AT_PREP; + } + + } + /* revert post_alloc_hook() operations */ + page->mapping = NULL; + page->flags &= ~PAGE_FLAGS_CHECK_AT_PREP; + set_page_count(page, 0); + page_mapcount_reset(page); + reset_page_owner(page, order); + page_table_check_free(page, order); + arch_free_page(page, order); + set_page_private(page, order); + INIT_LIST_HEAD(&dst->lru); + + list_add(&dst->lru, &cc->freepages[order].pages); + cc->freepages[order].nr_free++; + cc->nr_freepages += 1 << order; } /* possible outcome of isolate_migratepages */ @@ -2412,6 +2477,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 @@ -2421,7 +2487,10 @@ 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 <= MAX_ORDER; order++) { + INIT_LIST_HEAD(&cc->freepages[order].pages); + cc->freepages[order].nr_free = 0; + } INIT_LIST_HEAD(&cc->migratepages); cc->migratetype = gfp_migratetype(cc->gfp_mask); @@ -2607,7 +2676,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); @@ -2626,7 +2695,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 8c90e966e9f8..f5c691bb5c1c 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -465,6 +465,11 @@ int split_free_page(struct page *free_page, /* * in mm/compaction.c */ + +struct free_list { + struct list_head pages; + unsigned long nr_free; +}; /* * compact_control is used to track pages being migrated and the free pages * they are being migrated to during memory compaction. The free_pfn starts @@ -473,7 +478,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 free_list freepages[MAX_ORDER + 1]; /* 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 */