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: 13454191 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 59BE1C4167D for ; Mon, 13 Nov 2023 17:02:33 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DACA68D0031; Mon, 13 Nov 2023 12:02:32 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id D5C718D002E; Mon, 13 Nov 2023 12:02:32 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BAE448D0031; Mon, 13 Nov 2023 12:02:32 -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 A79DF8D002E for ; Mon, 13 Nov 2023 12:02:32 -0500 (EST) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 7502B1A0864 for ; Mon, 13 Nov 2023 17:02:32 +0000 (UTC) X-FDA: 81453549744.26.9832C68 Received: from out2-smtp.messagingengine.com (out2-smtp.messagingengine.com [66.111.4.26]) by imf02.hostedemail.com (Postfix) with ESMTP id 6D3AD80026 for ; Mon, 13 Nov 2023 17:02:18 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=sent.com header.s=fm3 header.b=7HB3Wyi+; dkim=pass header.d=messagingengine.com header.s=fm3 header.b=TPd9+Ccc; spf=pass (imf02.hostedemail.com: domain of zi.yan@sent.com designates 66.111.4.26 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=1699894939; a=rsa-sha256; cv=none; b=yMx8rDdRhnn/1LkStbeFwweRTfxrLcsifVTKpD6QrVXj9Yfo5/kxIOSRK/HoevxLnsNW6x OajVKXfTsDXUZ8uuPAE/QwStEJqN5t1hv5djv9roOls/wHnsaeBFI52yfJsrhcIHK1u3kZ fzqGypuAkMf2Vdt4+fRd5RA8U3IIsro= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=sent.com header.s=fm3 header.b=7HB3Wyi+; dkim=pass header.d=messagingengine.com header.s=fm3 header.b=TPd9+Ccc; spf=pass (imf02.hostedemail.com: domain of zi.yan@sent.com designates 66.111.4.26 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=1699894939; 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=urfl5JZUWyqykmUphyjWYkdFE+bafcBTkV8p8IuqwbA=; b=d02YxUS/XabDB8jSCBG/PhvKKnM80PrTU9GpfyAinCIbI63WGcvjKwFLmuw7HEwAWhH88f XElDyLjlYUCJWN3+7K2+Qvt87hjT9C7o4bKYHPBpC252oceDtmwWNqA4uBVaYs1CX2RmLs vNJN7gszobbrfeTSRk8BzvicvrKgtkQ= 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-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 6D3AD80026 X-Stat-Signature: pc36hpc6sgaouefof4j34m7kqr8rfwz9 X-Rspam-User: X-HE-Tag: 1699894938-3143 X-HE-Meta: U2FsdGVkX1/mJuoHePdn7EmVAIyzCIm2U7RDB+hk9iTmxJxcFlEpQ5AjdGGZWGoAZRzOH0Qw5ceMFh8U3o5mLACjAS+TiUfLSKH6hOQ00zM+83MG6VrdfqdmYVXJaj15oL16VIReqqfjdLG9kwPL7VLonolGhKH+NnkJBMgyYviNt1gxs6dU8CWsbuYYebr5PFPg5UuRaJHpmmya+vWYDZSQQJ1rnNorxMNlrbJHM8bPKnbHSSVmVfYfFjkvy7B+9dkz35+SZujVD8RZvcmAto06GzeKXCFi8HzBknTN5g0cDiO5qwtejpo+BJ6qcz3M7bQScAG7BBftwoYdaedNX4bZiRyItahgqChsuil9gztn84vx5XPMeXkGIC0m5J1bpYUPsawgVqb1AqhFOzuyqSZ9LtFeYC/Sgi8GLgrPoZxkPk3CDxVZpPqDTDw5XsdpOf9gbgrRWtKvePhd7tGUo5qnTO4pQezYcfVSEINxZjiv1KHV9C+fEHhTd2RmBn1dNR19oup2C5aWuBIfvLo2LQ3vSOE4J7A9E2GmSGZWy5JIcca4Dk+dW/4lNhReCzIVSbPHo9SMq77FbnoGHh0cfv1WUrzIF/aN4zED5LUHPpLYd21ONTY/nLLFu4yOkvs9yxm5ZIMM7gVm9Ylk3nTFQ7rKtxOyGlUVK5lZjOViLi74f0C+vkwBcU9bhOIhPmdvGGrNKSir9VfnSjJSzm2kAulWDW8pYilVovL9yewdG+YoeyDgsefYlX6QmJ98S9uidr9CuiAcL0NyApoigmq7oJcFbo4MX1MSVABxADn/vPe4XKbH4TkV2kGrGjWX1HhqbHf5G4dbxgKOLOC4hlk8DgpW3BqFzqUcKbeKcC6RiKddb7NMUENe1Krh3idrk33W+BTuwZbYqQO3P7SD2PEo3y3SpbwxSKBnshoFrgmrrEKmUooWd3UbWbbOUWdkyfO2WMI4qXYRfHzJq16Z2dF kY+dFLTe BJDVzjK0wT9TZvXtB1fVfBLd8t46KctmcSA7D+9Lncn2FYbpAHW8THtny3V6KOypY54rPHvVpirc6oqplurPdreqLM/Fj6f9TQsufBSr8qJmU0j4VQht67QS6YvN4WKuHq5Lapxc+44DtvVkQycZLZk5irvBfrKZVSnk3Gmw89/qS3RcW+YuJFstEsqqMrEPv3YbR8QM3XOod8mVVn0qT7cO2lXxX2Q8DvCafLPxqBf/Or1qsbRKEGSoeCtMS9rzeY07VRymXPDVpGLyNSsbyX7L5znOtMz/DqixCOKW2OghhAiOhYKTTtq+L7on9XEF1svqio+QddlbkF5hfJsigktindUyPjQnO/YY2NSd9CeXuqWx3W5n+ir5VheveViUugrdr7gTiS/2FY+NeuPR1oPvYwuLJKXFb6EBg4GNT/kSDfRDPKxfE9AZGDVWrNUWzO1YgFDxni3uwdSTQOHaFVaDORoaE5TBF0BgNxcbJcij6fQUGR4lfgMskU0H5j9538Gc4WPW4kTe6vKllZX+3nfq16qpJL9xLoVfLBU1JTGUJ818= 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. 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);