From patchwork Sun Dec 15 10:01:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ge Yang X-Patchwork-Id: 13908709 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 CCEE9E7716A for ; Sun, 15 Dec 2024 10:01:24 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B5E6B6B007B; Sun, 15 Dec 2024 05:01:23 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id B0E686B0083; Sun, 15 Dec 2024 05:01:23 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9AF7A6B0085; Sun, 15 Dec 2024 05:01:23 -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 78B016B007B for ; Sun, 15 Dec 2024 05:01:23 -0500 (EST) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id F0AF44622A for ; Sun, 15 Dec 2024 10:01:22 +0000 (UTC) X-FDA: 82896749670.27.4724303 Received: from m16.mail.126.com (m16.mail.126.com [220.197.31.7]) by imf04.hostedemail.com (Postfix) with ESMTP id CE6184000D for ; Sun, 15 Dec 2024 10:00:50 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=126.com header.s=s110527 header.b=KcNv0AL4; dmarc=pass (policy=none) header.from=126.com; spf=pass (imf04.hostedemail.com: domain of yangge1116@126.com designates 220.197.31.7 as permitted sender) smtp.mailfrom=yangge1116@126.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1734256868; 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=E2givfVT7WoQ/zZbJFGmioUFY0A/62R2IIhwhOxB6+w=; b=V4umsxog9Se7sMRRhJZtal6k6+qu2Qa+eX2a8tGhYw74JavvzjLci436NjBZIdKx2f/HOQ BkIJlA64hthIPrJFaNARCQDbuVS4dmoH0AtJuNib4ZwpERN7U4wBIBco2EdsE0q0G5zCDz Dm66sEd1rOXSDF7e98rEwabYmOztoxM= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1734256868; a=rsa-sha256; cv=none; b=PJbqA1WTHgoKj9+iZMAWTbo5Jpce9AMJkDOmECeWv5kQHsYXLD6oM0WWfZEHz6IP+0Bbc4 YSMQEm5Cg1mT0nkxsjry0fHJV0f+c6IeJe89Eo8oxWYPKP+dlDtGOSRzLFNOdBQOFAiZp+ ZJbap3aEsAjfmcrgFgOwO1DuJoe89FI= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=126.com header.s=s110527 header.b=KcNv0AL4; dmarc=pass (policy=none) header.from=126.com; spf=pass (imf04.hostedemail.com: domain of yangge1116@126.com designates 220.197.31.7 as permitted sender) smtp.mailfrom=yangge1116@126.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=126.com; s=s110527; h=From:Subject:Date:Message-Id; bh=E2givfVT7WoQ/zZbJF GmioUFY0A/62R2IIhwhOxB6+w=; b=KcNv0AL4MjbfTxxU3dyjLbxiQY5c2jSB5u VYscjGIbDNBAA0H0xmfDeAEWb3H0DO0So0vhTM6/L9iJhsi0ovoBubzQTfxZ629z 3KapyBJUwJ0VKl4HiuCXGri8m8VLS9jiy7GAzwmevzAeozva2aNEcOXsvUx/aPFb ngHoqzmPY= Received: from hg-OptiPlex-7040.hygon.cn (unknown []) by gzga-smtp-mtada-g0-3 (Coremail) with SMTP id _____wBXbn3kqF5njZLWAQ--.23908S2; Sun, 15 Dec 2024 18:01:09 +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 V4] mm, compaction: don't use ALLOC_CMA in long term GUP flow Date: Sun, 15 Dec 2024 18:01:07 +0800 Message-Id: <1734256867-19614-1-git-send-email-yangge1116@126.com> X-Mailer: git-send-email 2.7.4 X-CM-TRANSID: _____wBXbn3kqF5njZLWAQ--.23908S2 X-Coremail-Antispam: 1Uf129KBjvJXoWxtry8Zr4kJrWUGr4xCr1kuFg_yoW3Jw45pF 18Za4Yy395XF13GrW8tF409a1Yqw4xGF18JryIgw1xZw1akFn2v3WkKFy7AF15XryYyF4Y qFWq9ryDGFsxAFJanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0zNAp5UUUUUU= X-Originating-IP: [118.242.3.34] X-CM-SenderInfo: 51dqwwjhrrila6rslhhfrp/1tbiOhO2G2deopcx1AAAst X-Stat-Signature: dsj9f5dcdgwyqqfehm1cguiyki9bsbtp X-Rspamd-Queue-Id: CE6184000D X-Rspam-User: X-Rspamd-Server: rspam01 X-HE-Tag: 1734256850-119525 X-HE-Meta: U2FsdGVkX19uNydV/Pm4iaJjf8ybbKmmzLfHyioWvuUC2OViupZOn2CGYkiIb4ByqjYtSSHqGmoIx8CSH6++VKQaxzmX7XKr2NCUgJGWKg2DolILAnwWwTNaOJ4EvmJ0uddx8NRipufzNcwocV86sTpIEWuQsI1HJmBFA8U83V/p949nhhwZ7e6pzKMz+Mhmd3ZTuirZHESqDxq5dbE4U98vl0pA1ulDAcGpIQfuX3GpI0O06qS66uZQK8OlDe00XO4ijhN4YbhwXidK3ngHN0AJgB2/IaikE99C5dauh35CcCyVG1+ibOZY2tSs5Sv8BvMmUbyxJr4WAvSrC5lxm54Q8nlV5wBMNvMiXv907KBYIfdjWIhLuvHZ1eJSOXvN5jrx77V5ryS/kMTA6BKy9LKr6IIEWiJk8Q5HBY7OPHRGYoEmjI/XPcKcMXxQ/jIB5ZGxowGted3Z389oHpuPT/5Fx9LJNYIyQD+KnGbwg5x276cYNHYrqdD4ZuYK4d738J8VUtjDKbSPd9DSO0qtN+mtquY5GmL6uoDrz3o7LUNkXDpM4y6AAdyAw2alvDlz8DQPasclmMlfcIf6INEL0OWB6eYVFAOGlRJdZjIgjqAnLbZG4V3w1WlUQmBHtigVwM0ZYORk+AcETswf8fSv+OgXdVztqOGGcXa8VzNuE/jOBFHx+WhOhvZXv09h1aEeL2pZ76nkrtfqsMxyEq9rZDaPW/00nzawByzOT8E1NdrSiWjM8z8/YhWfs628S6DVt7SQpgJVl6qs6Bh/LsAYTjlfzQsX8rXNDna0nR3C7PRRaeIpzuzS3SOick17AIM551QJI9GKxkhAv6loWrA6gweMgIIJlu8X3NC/Yrds01aTtcpow7Zch028wL3Bg2/LWEod6/cI1t+5yvMvXcHteYkQwBKeeWXtDvs+FQK/O6tgetkUI+G/TunQN/ElSgeoPkbCmCTjJKB/2jdzIFO 5QnynX9h vQcG8EjmZsJJRa5XXi0jP+KKLX1h020FzRh2fl4yx1EU74S0PkKGy3IiODr8rHVnCEqO1nOupZNy9MwFlyz4sNDp9PQY7dXDCuwLMWwl4Qq3LWxJhTuxbCsutwHLUlucpyYxMLzaK6toUXNGhDTzECXV6llYh2kVvZTVBvtZ/6x2TxVZ8+js6Whag+DGPcpABQLJ+ywL4Jid7dGKjzPWXTsx55tvSyz0VTewx8YX2udNh8Xae8Kq7uLMVNefD3R79hviTC6uP176Yv/CyyN+Xh7ENYxzbxhD5CfLw8RI6wiGiDzCVRwB63Aca88gr8DiS3F71oz39n/YJb9FBd3V7nf3aPw== 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 --- 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 | 18 +++++++++++------- mm/page_alloc.c | 4 +++- mm/vmscan.c | 4 ++-- 4 files changed, 20 insertions(+), 12 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..585f5ab 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -2381,9 +2381,11 @@ 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; + bool use_cma; /* * Watermarks for order-0 must be met for compaction to be able to * isolate free pages for migration targets. This means that the @@ -2395,25 +2397,27 @@ 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); + use_cma = !!(alloc_flags & ALLOC_CMA); return __zone_watermark_ok(zone, 0, watermark, highest_zoneidx, - ALLOC_CMA, wmark_target); + use_cma ? ALLOC_CMA : 0, 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 +2478,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 +2503,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; diff --git a/mm/page_alloc.c b/mm/page_alloc.c index dde19db..9a5dfda 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -2813,6 +2813,7 @@ int __isolate_free_page(struct page *page, unsigned int order) { struct zone *zone = page_zone(page); int mt = get_pageblock_migratetype(page); + bool pin; if (!is_migrate_isolate(mt)) { unsigned long watermark; @@ -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)) + pin = !!(current->flags & PF_MEMALLOC_PIN); + if (!zone_watermark_ok(zone, 0, watermark, 0, pin ? 0 : ALLOC_CMA)) return 0; } 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; /*