From patchwork Mon Nov 13 17:01:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zi Yan X-Patchwork-Id: 164573 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b909:0:b0:403:3b70:6f57 with SMTP id t9csp1340983vqg; Mon, 13 Nov 2023 09:03:09 -0800 (PST) X-Google-Smtp-Source: AGHT+IEPiwMryyrhuVKUnjKVstLc9DTdfY49LamHKbgjN+bqhH5ewOSz70GxrpcafIH6m64IbY85 X-Received: by 2002:a05:6a20:12d4:b0:180:e3f1:4f60 with SMTP id v20-20020a056a2012d400b00180e3f14f60mr4701434pzg.45.1699894988765; Mon, 13 Nov 2023 09:03:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699894988; cv=none; d=google.com; s=arc-20160816; b=bQwCkbKTuZI3MEFQA8lmpgyGHqTjOR13X8WfB/YsvMAigcNnsarNLWTvJ92fmNtxtP 4RcjaAQy3/xCaCeAtYnHEBC0MOR0xrVPTkTYKvOT/895XYmYYwP+OHA5aWC2CT2F7san bKp9XZO7xzyigutMrVqLTfguyrp7zzbHrK51L9gYW1OuMRQNyz/V70nXmj6IxmRwlNW2 k53KnI5ElK6cz9B94jHLlSRInVf8TSk3YnXJoGKEj+ugwBtkhIedv8ibilF/kK4ESCG6 h723wNyXrzPRe2fDnolTKHi+1rN6gbMP76epKeCFqOu0x7onSO/SCJFOeGuYz43J8JVS wWOw== 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=urfl5JZUWyqykmUphyjWYkdFE+bafcBTkV8p8IuqwbA=; fh=vJ0CYzlC3FzFcxY+JvdHzizIe8XjzG5USPt1Sa6qsGI=; b=O4JDmyV2SOVrnGXd7lrf9piV4po/ImVYaaNdOgiKzy4KQTZk+mPLTUoMXSz2Ok5PRG o3jcuyBEpjRvTcmRoXX9mS5UZjambokcSPAIil41AWWCvu2iLyQWXD016iuhMB095PFB VGPIaBqQjs03p8kyyd+dPIDxr/DWV12m4VyMr9VgQwd7pcbIbiTy5EE4zXqZrFQRfU4s Y1ab7TkpGL/kENb+GFa72KdCPJ4r5vXobvDH75aRg7+Fda2z34De0PEOQiVAMMUs8zju bBUz+8ZqsmuI4g1a0/k+OVEXiVfOMCOI/W1V0JlxLUSWJObLSoGLuqErDD4vhRucgcu2 Ibvw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sent.com header.s=fm3 header.b=7HB3Wyi+; dkim=pass header.i=@messagingengine.com header.s=fm3 header.b=TPd9+Ccc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 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 agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id c7-20020a056a000ac700b0068e47f1fc7esi6165051pfl.159.2023.11.13.09.03.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Nov 2023 09:03:08 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; dkim=pass header.i=@sent.com header.s=fm3 header.b=7HB3Wyi+; dkim=pass header.i=@messagingengine.com header.s=fm3 header.b=TPd9+Ccc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 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 agentk.vger.email (Postfix) with ESMTP id E60B780A4420; Mon, 13 Nov 2023 09:02:54 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230493AbjKMRC0 (ORCPT + 30 others); Mon, 13 Nov 2023 12:02:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52568 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229454AbjKMRCW (ORCPT ); Mon, 13 Nov 2023 12:02:22 -0500 Received: from out2-smtp.messagingengine.com (out2-smtp.messagingengine.com [66.111.4.26]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 88833D63 for ; Mon, 13 Nov 2023 09:02:18 -0800 (PST) Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.nyi.internal (Postfix) with ESMTP id 010A05C01B7; Mon, 13 Nov 2023 12:02:18 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Mon, 13 Nov 2023 12:02:18 -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:sender:subject:subject:to:to; s= fm3; t=1699894937; x=1699981337; bh=urfl5JZUWyqykmUphyjWYkdFE+ba fcBTkV8p8IuqwbA=; b=7HB3Wyi+1gRLdhpQriK/kyewm4aYNjtRZ2nu3IH7+wuu 2vsuB2HaPHYBy0ZZNHffjdKm+Sly7mnILjLxEcbrEPUIyF+rOoVwGNzTna0apkfD +EW9ORilVpQXmX2xDBPplisCDSM6hxnR/ESebHQJ6wGq7s6Wfa16M452P3I/ZqxV 44GnQKHspiQ8jZvk0d9h1oQ26cWjEqJ05V+obJDPgAoah0aDRtom2EVauTJ3i+HK 4JGcZ2r5vJF5Sjh/u2MK74H/Oun9AVv642CvBvYM0DwxwydVFu79uudd6FMdYddk dssWmmhtQpq619UGwR9+6re/dTW1KB+yuYUH6GFVMQ== 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:sender:subject:subject:to:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; t=1699894937; x=1699981337; bh=urfl5JZUWyqykmUphyjWYkdFE+ba fcBTkV8p8IuqwbA=; b=TPd9+CccOdaGln4m8Tv8Duuxgf3e4Y8CQUAu137jPias LNS4P77nwQiCkh+2T11QwQgTHwXDMnrq1QN5d4NfoFs5pfxymEeMCH8LoxstLNNI mQF0karJJx7sg01u/LW5NDMXRTFVlSLOSMY7Oi7lrQWPOkSK3h5Duf34/2SI67TG W50qOEvqFUkbhtEHm+DxZJj/xueyu647kqMFBk0eqyYuq81C9B0skpBnBf0+5HIv dnk7GRsJ9KdEsJTihPFSZ3s8sd6ixsQOzQUVrsLJ6zWqPlnzz2EgvdrtMfSeKRH/ QpipWEiZpRAoigZs0yBHRGyaNzrsvlUA3k7VQQ5G5g== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrudeftddgleefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhhrgggtgfesthekredtredtjeenucfhrhhomhepkghi ucgjrghnuceoiihirdihrghnsehsvghnthdrtghomheqnecuggftrfgrthhtvghrnhepje ekteekffelleekudfftdefvddtjeejuedtuedtteegjefgvedtfedujeekieevnecuvehl uhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepiihirdihrghnse hsvghnthdrtghomh X-ME-Proxy: Feedback-ID: iccd040f4:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 13 Nov 2023 12:02:15 -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 v1 1/4] mm/compaction: enable compacting >0 order folios. Date: Mon, 13 Nov 2023 12:01:54 -0500 Message-ID: <20231113170157.280181-2-zi.yan@sent.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231113170157.280181-1-zi.yan@sent.com> References: <20231113170157.280181-1-zi.yan@sent.com> Reply-To: Zi Yan MIME-Version: 1.0 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,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email 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 (agentk.vger.email [0.0.0.0]); Mon, 13 Nov 2023 09:02:55 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782469087413724616 X-GMAIL-MSGID: 1782469087413724616 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. Suggested-by: Huang Ying Signed-off-by: Zi Yan --- mm/compaction.c | 57 ++++++++++++++++++++++++++++++++++++------------- 1 file changed, 42 insertions(+), 15 deletions(-) diff --git a/mm/compaction.c b/mm/compaction.c index 01ba298739dd..5217dd35b493 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -816,6 +816,21 @@ static bool too_many_isolated(struct compact_control *cc) return too_many; } +/* + * 1. if the page order is larger than or equal to target_order (i.e., + * cc->order and when it is not -1 for global compaction), skip it since + * target_order already indicates no free page with larger than target_order + * exists and later migrating it will most likely fail; + * + * 2. compacting > pageblock_order pages does not improve memory fragmentation, + * skip them; + */ +static bool skip_isolation_on_order(int order, int target_order) +{ + return (target_order != -1 && order >= target_order) || + order >= pageblock_order; +} + /** * isolate_migratepages_block() - isolate all migrate-able pages within * a single pageblock @@ -1009,7 +1024,7 @@ 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). + * 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. @@ -1017,11 +1032,18 @@ isolate_migratepages_block(struct compact_control *cc, unsigned long low_pfn, if (PageCompound(page) && !cc->alloc_contig) { const unsigned int order = compound_order(page); - if (likely(order <= MAX_ORDER)) { - low_pfn += (1UL << order) - 1; - nr_scanned += (1UL << order) - 1; + /* + * Skip based on page order and compaction target order + * and skip hugetlbfs pages. + */ + if (skip_isolation_on_order(order, cc->order) || + PageHuge(page)) { + if (order <= MAX_ORDER) { + low_pfn += (1UL << order) - 1; + nr_scanned += (1UL << order) - 1; + } + goto isolate_fail; } - goto isolate_fail; } /* @@ -1144,17 +1166,18 @@ isolate_migratepages_block(struct compact_control *cc, unsigned long low_pfn, goto isolate_abort; } } + } - /* - * folio become large since the non-locked check, - * and it's on LRU. - */ - if (unlikely(folio_test_large(folio) && !cc->alloc_contig)) { - low_pfn += folio_nr_pages(folio) - 1; - nr_scanned += folio_nr_pages(folio) - 1; - folio_set_lru(folio); - goto isolate_fail_put; - } + /* + * Check LRU folio order under the lock + */ + 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); + goto isolate_fail_put; } /* The folio is taken off the LRU */ @@ -1764,6 +1787,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_order(src) > 0) + return NULL; + if (list_empty(&cc->freepages)) { isolate_freepages(cc);