From patchwork Tue Dec 17 03:33:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ge Yang X-Patchwork-Id: 13910946 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 B8B29E7717F for ; Tue, 17 Dec 2024 03:33:40 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 369BA6B0083; Mon, 16 Dec 2024 22:33:40 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 2F2BB6B0085; Mon, 16 Dec 2024 22:33:40 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 195346B0088; Mon, 16 Dec 2024 22:33:40 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id EB7D26B0083 for ; Mon, 16 Dec 2024 22:33:39 -0500 (EST) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 704C41A0334 for ; Tue, 17 Dec 2024 03:33:39 +0000 (UTC) X-FDA: 82903029216.17.981C9A5 Received: from m16.mail.126.com (m16.mail.126.com [117.135.210.7]) by imf21.hostedemail.com (Postfix) with ESMTP id C64741C0002 for ; Tue, 17 Dec 2024 03:32:39 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=126.com header.s=s110527 header.b=J8ZKi2nu; spf=pass (imf21.hostedemail.com: domain of yangge1116@126.com designates 117.135.210.7 as permitted sender) smtp.mailfrom=yangge1116@126.com; dmarc=pass (policy=none) header.from=126.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1734406385; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references:dkim-signature; bh=EFyBEGnfljxFoLLjFi/f//r0dupDm0Da3QllS1XtR1w=; b=mwGRKpSh1aEhzYr0KrGSN0TeU4bN1KvVQqpKvex1nJiFpZ2Sk4+OA7KDhw4r2+AQkkoZsx LYnmZyY0LbBggtHXqVRFSaDzg4TmDPq4xPgaG1VgFyPMGXQ0qOvtndg4AjrUkDKvNMp8G6 e3j76E2ROhP+qgRQXpeuIZTaD1/jbNI= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1734406385; a=rsa-sha256; cv=none; b=bfj7Mqf38Hf+Z1EVn2/X8vJIP8E/FtJlKgPwVoRzgn7H8qnoJ18CAtOAUlsXHB6l7/d1zV 7rPfDzq/3k9GV7WrbNHi0oL8TpgSwY+4hTVxSr94cyxKaUCkEITjL9Dce1ow8OkNmKhJ6V a5l35A94dcEYpRdulxce5LkSs95lRkU= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=126.com header.s=s110527 header.b=J8ZKi2nu; spf=pass (imf21.hostedemail.com: domain of yangge1116@126.com designates 117.135.210.7 as permitted sender) smtp.mailfrom=yangge1116@126.com; dmarc=pass (policy=none) header.from=126.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=126.com; s=s110527; h=From:Subject:Date:Message-Id; bh=EFyBEGnfljxFoLLjFi /f//r0dupDm0Da3QllS1XtR1w=; b=J8ZKi2nuFusZKXVcqbmE5e5JjhwFt7fQUX sf0b1CyecUffRAaLCWnWjW6XKbE7gkGrfNfEb9s7bWT0iIMe8IjLt41tSrJx0qQd bNf7swFuRLlEDrmhJBJJxwkEXhDwUAbo5pqcniJWs2fEB8ezpfdsjWHiyRA41tgI QUVVMITjw= Received: from hg-OptiPlex-7040.hygon.cn (unknown []) by gzga-smtp-mtada-g1-0 (Coremail) with SMTP id _____wDnL4EH8WBnR6RmAQ--.28907S2; Tue, 17 Dec 2024 11:33:28 +0800 (CST) From: yangge1116@126.com To: akpm@linux-foundation.org Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org, 21cnbao@gmail.com, david@redhat.com, baolin.wang@linux.alibaba.com, vbabka@suse.cz, liuzixing@hygon.cn, yangge Subject: [PATCH V6] mm, compaction: don't use ALLOC_CMA in long term GUP flow Date: Tue, 17 Dec 2024 11:33:25 +0800 Message-Id: <1734406405-25847-1-git-send-email-yangge1116@126.com> X-Mailer: git-send-email 2.7.4 X-CM-TRANSID: _____wDnL4EH8WBnR6RmAQ--.28907S2 X-Coremail-Antispam: 1Uf129KBjvJXoW3Cr4rCFyxGr4fuFy7Kry5twb_yoWkAr47pF 48Za4Iy3yrX3W3GFW8tF4vvF1Yqr4xGF48AryIgw18Zw13KF9F9as7KFy7AFWrWr98AFWY vFWqkrZ7GFsxAaDanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0zKsj8bUUUUU= X-Originating-IP: [118.242.3.34] X-CM-SenderInfo: 51dqwwjhrrila6rslhhfrp/1tbiWQa4G2dg7B5gBwAAsu X-Rspamd-Queue-Id: C64741C0002 X-Rspam-User: X-Rspamd-Server: rspam07 X-Stat-Signature: byigop71pphhiro3ou4oey9uzhmr8emr X-HE-Tag: 1734406359-9717 X-HE-Meta: U2FsdGVkX18nsP0sy3OScjIIx3HzOYrdOnmAUzjPkRCnccrG3UNuXe4wEIc2Y43oWNyiUGJAQ98oy60wPIxEaiC01suB8q/aTJbYfb0nV7SC/k/IFW2vv7W0G5qsvLb08b5H5DkBEX3b+ZYilaM0DTlAkuBKJLSyV0HzbZqdYKAFRnA7u14xu2AJbZacxd/FFIFlHuVBhx8A2IR6MdSvEZKDc6VXnurcdj4IivhwtNQTFhMP4zKgHfJ5w51k5+LFxMeiIAJKrzMoLkfmZJSNdS+Nhg4Jcm2mZGo9Jn30FStM41/zr4Ou5qp+WGQcRp3ipHkCQSW9J4pdpb9/h0vdnU507CjGGzyV7HsY+Jd/vZ9S+5wdL21W0IRB+dMBqUDhgkj1m4nAhjJhA/Jf++NXnOY5N4rgKAhxMeZfpmGd0iDx8Ewtjx2GM39QcDrOU12ehmxJI8M6nsowEymScGlsg9j8q5gthsv9+gyZ8NLbB90kUazB4qVz5KXvoF1UO/FAaeq91s+kn353AlAlAS4iJaOTy6X9QppK2suErbpGlPkCNwrcULOldlnBlKLd9RLiz5hF/+dCdfFt4vZ1oBjTU1RjihbbfcsFUoqrdfoKLoJeV04ZlbaLOx2nCH0BI+oEBNYonR/NEe+qbOEmy2Dx+QXNDDnfZF0fafyWOMSL3L3+3hpQLhE4wEBHYo5PTU7iixeklAG9YqHtjT9vVBPETTVAAZcOOYy5cW5zBEzw2wTC/DTZErdu1eSQJJlIACKETy/wICQqCQr4i+8kO8VaGtf9++LJ6YLGNOM0M298NshQgWTHlepLpeRBi/TN1kuaoaxWW2LdUKo1s2gEd8U26TlbmWk+Sh4drI8862Q6tIYyodnXowt1d0kbs3YQ3Xga6lpwPsR5Xqi/ufKF3M/q/a1OxTvf3ZhclOvcmNS6kQ8bcJO57Bdq4ySkW8WOza/FzIfMJXwkrYEP3EXINnR nCmVVtCX hefte0YHhCzekUQC3LpnaWlRDHewYrDjxaGt4K3Vht7FEC5sdQ4MRuCVP79wSwsVWKeo9VcdJ4Drtb8N2ZspzJVpGCRqMO+vSNBzbyCjaFnetZdZBsHkp9D/snhTK7fSC2YFG8EC7aN6hd4Knjo7Qd3Vyywzdu9an2Rn7pFsLprpB5Zjr8f2ktYWKy+pE3SBzkmzN0aUSSO9+3wPH33snUNWIbFVH6O6CaM9wf2TwDNhcZt6LZBkbZQ77fUi1ndK6W2bjp8aAkmDIn0v8xhUK3JdWUDgiOc6bTUQVEPEvbL4UGuWxaNOWcZQLm6zxpCJqWum2blVftcWZik0a8yX0yfWVL8q8Ii/2eX70a/7wrueLvSsUS83irBuAxg== 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: yangge Since commit 984fdba6a32e ("mm, compaction: use proper alloc_flags in __compaction_suitable()") allow compaction to proceed when free pages required for compaction reside in the CMA pageblocks, it's possible that __compaction_suitable() always returns true, and in some cases, it's not acceptable. There are 4 NUMA nodes on my machine, and each NUMA node has 32GB of memory. I have configured 16GB of CMA memory on each NUMA node, and starting a 32GB virtual machine with device passthrough is extremely slow, taking almost an hour. During the start-up of the virtual machine, it will call pin_user_pages_remote(..., FOLL_LONGTERM, ...) to allocate memory. Long term GUP cannot allocate memory from CMA area, so a maximum of 16 GB of no-CMA memory on a NUMA node can be used as virtual machine memory. Since there is 16G of free CMA memory on the NUMA node, watermark for order-0 always be met for compaction, so __compaction_suitable() always returns true, even if the node is unable to allocate non-CMA memory for the virtual machine. For costly allocations, because __compaction_suitable() always returns true, __alloc_pages_slowpath() can't exit at the appropriate place, resulting in excessively long virtual machine startup times. Call trace: __alloc_pages_slowpath if (compact_result == COMPACT_SKIPPED || compact_result == COMPACT_DEFERRED) goto nopage; // should exit __alloc_pages_slowpath() from here In order to quickly fall back to remote node, we should remove ALLOC_CMA both in __compaction_suitable() and __isolate_free_page() in long term GUP flow. After this fix, starting a 32GB virtual machine with device passthrough takes only a few seconds. Fixes: 984fdba6a32e ("mm, compaction: use proper alloc_flags in __compaction_suitable()") Cc: Signed-off-by: yangge Reviewed-by: Baolin Wang --- V6: -- update cc->alloc_flags to keep the original loginc V5: - add 'alloc_flags' parameter for __isolate_free_page() - remove 'usa_cma' variable V4: - rich the commit log description V3: - fix build errors - add ALLOC_CMA both in should_continue_reclaim() and compaction_ready() V2: - using the 'cc->alloc_flags' to determin if 'ALLOC_CMA' is needed - rich the commit log description include/linux/compaction.h | 6 ++++-- mm/compaction.c | 26 +++++++++++++++----------- mm/internal.h | 3 ++- mm/page_alloc.c | 7 +++++-- mm/page_isolation.c | 3 ++- mm/page_reporting.c | 2 +- mm/vmscan.c | 4 ++-- 7 files changed, 31 insertions(+), 20 deletions(-) diff --git a/include/linux/compaction.h b/include/linux/compaction.h index e947764..b4c3ac3 100644 --- a/include/linux/compaction.h +++ b/include/linux/compaction.h @@ -90,7 +90,8 @@ extern enum compact_result try_to_compact_pages(gfp_t gfp_mask, struct page **page); extern void reset_isolation_suitable(pg_data_t *pgdat); extern bool compaction_suitable(struct zone *zone, int order, - int highest_zoneidx); + int highest_zoneidx, + unsigned int alloc_flags); extern void compaction_defer_reset(struct zone *zone, int order, bool alloc_success); @@ -108,7 +109,8 @@ static inline void reset_isolation_suitable(pg_data_t *pgdat) } static inline bool compaction_suitable(struct zone *zone, int order, - int highest_zoneidx) + int highest_zoneidx, + unsigned int alloc_flags) { return false; } diff --git a/mm/compaction.c b/mm/compaction.c index 07bd227..d92ba6c 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -655,7 +655,7 @@ static unsigned long isolate_freepages_block(struct compact_control *cc, /* Found a free page, will break it into order-0 pages */ order = buddy_order(page); - isolated = __isolate_free_page(page, order); + isolated = __isolate_free_page(page, order, cc->alloc_flags); if (!isolated) break; set_page_private(page, order); @@ -1634,7 +1634,7 @@ static void fast_isolate_freepages(struct compact_control *cc) /* Isolate the page if available */ if (page) { - if (__isolate_free_page(page, order)) { + if (__isolate_free_page(page, order, cc->alloc_flags)) { set_page_private(page, order); nr_isolated = 1 << order; nr_scanned += nr_isolated - 1; @@ -2381,6 +2381,7 @@ static enum compact_result compact_finished(struct compact_control *cc) static bool __compaction_suitable(struct zone *zone, int order, int highest_zoneidx, + unsigned int alloc_flags, unsigned long wmark_target) { unsigned long watermark; @@ -2395,25 +2396,26 @@ static bool __compaction_suitable(struct zone *zone, int order, * even if compaction succeeds. * For costly orders, we require low watermark instead of min for * compaction to proceed to increase its chances. - * ALLOC_CMA is used, as pages in CMA pageblocks are considered - * suitable migration targets + * In addition to long term GUP flow, ALLOC_CMA is used, as pages in + * CMA pageblocks are considered suitable migration targets */ watermark = (order > PAGE_ALLOC_COSTLY_ORDER) ? low_wmark_pages(zone) : min_wmark_pages(zone); watermark += compact_gap(order); return __zone_watermark_ok(zone, 0, watermark, highest_zoneidx, - ALLOC_CMA, wmark_target); + alloc_flags & ALLOC_CMA, wmark_target); } /* * compaction_suitable: Is this suitable to run compaction on this zone now? */ -bool compaction_suitable(struct zone *zone, int order, int highest_zoneidx) +bool compaction_suitable(struct zone *zone, int order, int highest_zoneidx, + unsigned int alloc_flags) { enum compact_result compact_result; bool suitable; - suitable = __compaction_suitable(zone, order, highest_zoneidx, + suitable = __compaction_suitable(zone, order, highest_zoneidx, alloc_flags, zone_page_state(zone, NR_FREE_PAGES)); /* * fragmentation index determines if allocation failures are due to @@ -2474,7 +2476,7 @@ bool compaction_zonelist_suitable(struct alloc_context *ac, int order, available = zone_reclaimable_pages(zone) / order; available += zone_page_state_snapshot(zone, NR_FREE_PAGES); if (__compaction_suitable(zone, order, ac->highest_zoneidx, - available)) + alloc_flags, available)) return true; } @@ -2499,7 +2501,7 @@ compaction_suit_allocation_order(struct zone *zone, unsigned int order, alloc_flags)) return COMPACT_SUCCESS; - if (!compaction_suitable(zone, order, highest_zoneidx)) + if (!compaction_suitable(zone, order, highest_zoneidx, alloc_flags)) return COMPACT_SKIPPED; return COMPACT_CONTINUE; @@ -2893,6 +2895,7 @@ static int compact_node(pg_data_t *pgdat, bool proactive) struct compact_control cc = { .order = -1, .mode = proactive ? MIGRATE_SYNC_LIGHT : MIGRATE_SYNC, + .alloc_flags = ALLOC_CMA, .ignore_skip_hint = true, .whole_zone = true, .gfp_mask = GFP_KERNEL, @@ -3037,7 +3040,7 @@ static bool kcompactd_node_suitable(pg_data_t *pgdat) ret = compaction_suit_allocation_order(zone, pgdat->kcompactd_max_order, - highest_zoneidx, ALLOC_WMARK_MIN); + highest_zoneidx, ALLOC_CMA | ALLOC_WMARK_MIN); if (ret == COMPACT_CONTINUE) return true; } @@ -3058,6 +3061,7 @@ static void kcompactd_do_work(pg_data_t *pgdat) .search_order = pgdat->kcompactd_max_order, .highest_zoneidx = pgdat->kcompactd_highest_zoneidx, .mode = MIGRATE_SYNC_LIGHT, + .alloc_flags = ALLOC_CMA | ALLOC_WMARK_MIN, .ignore_skip_hint = false, .gfp_mask = GFP_KERNEL, }; @@ -3078,7 +3082,7 @@ static void kcompactd_do_work(pg_data_t *pgdat) continue; ret = compaction_suit_allocation_order(zone, - cc.order, zoneid, ALLOC_WMARK_MIN); + cc.order, zoneid, cc.alloc_flags); if (ret != COMPACT_CONTINUE) continue; diff --git a/mm/internal.h b/mm/internal.h index 3922788..6d257c8 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -662,7 +662,8 @@ static inline void clear_zone_contiguous(struct zone *zone) zone->contiguous = false; } -extern int __isolate_free_page(struct page *page, unsigned int order); +extern int __isolate_free_page(struct page *page, unsigned int order, + unsigned int alloc_flags); extern void __putback_isolated_page(struct page *page, unsigned int order, int mt); extern void memblock_free_pages(struct page *page, unsigned long pfn, diff --git a/mm/page_alloc.c b/mm/page_alloc.c index dde19db..1bfdca3 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -2809,7 +2809,8 @@ void split_page(struct page *page, unsigned int order) } EXPORT_SYMBOL_GPL(split_page); -int __isolate_free_page(struct page *page, unsigned int order) +int __isolate_free_page(struct page *page, unsigned int order, + unsigned int alloc_flags) { struct zone *zone = page_zone(page); int mt = get_pageblock_migratetype(page); @@ -2823,7 +2824,8 @@ int __isolate_free_page(struct page *page, unsigned int order) * exists. */ watermark = zone->_watermark[WMARK_MIN] + (1UL << order); - if (!zone_watermark_ok(zone, 0, watermark, 0, ALLOC_CMA)) + if (!zone_watermark_ok(zone, 0, watermark, 0, + alloc_flags & ALLOC_CMA)) return 0; } @@ -6454,6 +6456,7 @@ int alloc_contig_range_noprof(unsigned long start, unsigned long end, .order = -1, .zone = page_zone(pfn_to_page(start)), .mode = MIGRATE_SYNC, + .alloc_flags = ALLOC_CMA, .ignore_skip_hint = true, .no_set_skip_hint = true, .alloc_contig = true, diff --git a/mm/page_isolation.c b/mm/page_isolation.c index c608e9d..a1f2c79 100644 --- a/mm/page_isolation.c +++ b/mm/page_isolation.c @@ -229,7 +229,8 @@ static void unset_migratetype_isolate(struct page *page, int migratetype) buddy = find_buddy_page_pfn(page, page_to_pfn(page), order, NULL); if (buddy && !is_migrate_isolate_page(buddy)) { - isolated_page = !!__isolate_free_page(page, order); + isolated_page = !!__isolate_free_page(page, order, + ALLOC_CMA); /* * Isolating a free page in an isolated pageblock * is expected to always work as watermarks don't diff --git a/mm/page_reporting.c b/mm/page_reporting.c index e4c428e..fd3813b 100644 --- a/mm/page_reporting.c +++ b/mm/page_reporting.c @@ -198,7 +198,7 @@ page_reporting_cycle(struct page_reporting_dev_info *prdev, struct zone *zone, /* Attempt to pull page from list and place in scatterlist */ if (*offset) { - if (!__isolate_free_page(page, order)) { + if (!__isolate_free_page(page, order, ALLOC_CMA)) { next = page; break; } diff --git a/mm/vmscan.c b/mm/vmscan.c index 5e03a61..33f5b46 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -5815,7 +5815,7 @@ static inline bool should_continue_reclaim(struct pglist_data *pgdat, sc->reclaim_idx, 0)) return false; - if (compaction_suitable(zone, sc->order, sc->reclaim_idx)) + if (compaction_suitable(zone, sc->order, sc->reclaim_idx, ALLOC_CMA)) return false; } @@ -6043,7 +6043,7 @@ static inline bool compaction_ready(struct zone *zone, struct scan_control *sc) return true; /* Compaction cannot yet proceed. Do reclaim. */ - if (!compaction_suitable(zone, sc->order, sc->reclaim_idx)) + if (!compaction_suitable(zone, sc->order, sc->reclaim_idx, ALLOC_CMA)) return false; /*