From patchwork Mon Dec 16 11:54:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ge Yang X-Patchwork-Id: 13909617 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 79EFBE77180 for ; Mon, 16 Dec 2024 11:54:33 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0D3226B0089; Mon, 16 Dec 2024 06:54:33 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 083C16B008A; Mon, 16 Dec 2024 06:54:33 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E66166B008C; Mon, 16 Dec 2024 06:54:32 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id C7DFB6B0089 for ; Mon, 16 Dec 2024 06:54:32 -0500 (EST) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 26B8C160C4C for ; Mon, 16 Dec 2024 11:54:32 +0000 (UTC) X-FDA: 82900663860.23.30BD8A3 Received: from m16.mail.126.com (m16.mail.126.com [117.135.210.7]) by imf13.hostedemail.com (Postfix) with ESMTP id 36CEA2000B for ; Mon, 16 Dec 2024 11:54:00 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=126.com header.s=s110527 header.b=loZNMNdq; spf=pass (imf13.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=1734350056; 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=UKrvP/Ymp5jq0pAVdRg5jcH+ViqV5yReScKB+YOXh1Q=; b=wsn1B1p/DmEvve9qK3rioLFAOgkd6IM58mCB6NgzeXXblg+2XdKsKD3bDHk/4V7U6hQRyu qJhybLBiCse98ozRhr0oPvmy0ht+wApZ7sO+vxbmtRkziIUBFq04Aa0CS1K/0KDNrQbvFT 8UwzNVfUUYyiphucE/S5/YSQT7I1+4s= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1734350056; a=rsa-sha256; cv=none; b=8SLdKlmSM4b4/gV6Na8pajAfw25cqK3nCpz7nQ6mum0EaQ4/hCp25XLA9H3r5QB6p4m5QX BM9/mUXgRnrOWrltSN7jhugmJpQhBBF7WDQcm97YK0x6aeBRnZHSG+0AqtoiszOgq9IlIg eSvT66NPP2yeGGrRGsG1Ad/IYDKaO08= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=126.com header.s=s110527 header.b=loZNMNdq; spf=pass (imf13.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=UKrvP/Ymp5jq0pAVdR g5jcH+ViqV5yReScKB+YOXh1Q=; b=loZNMNdqCCuwB8aZY3ZLIRV3eaFrX5LFHK lem8vfSFUYH/sSj/nVGDOzzRP1zkBPKbcbEXOxMGXVhZ/dzLgZYrjsrYd0c4jccv f8HpYsMn9TP0Qc6nGUBmfHX6CwolVv5+OhkgWqBF2IzwU4QnryrR2++PP3qg2zxX 92s1wQHOs= Received: from hg-OptiPlex-7040.hygon.cn (unknown []) by gzga-smtp-mtada-g0-2 (Coremail) with SMTP id _____wDHjwjdFGBnGCMaAg--.3044S2; Mon, 16 Dec 2024 19:54:06 +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 V5] mm, compaction: don't use ALLOC_CMA in long term GUP flow Date: Mon, 16 Dec 2024 19:54:04 +0800 Message-Id: <1734350044-12928-1-git-send-email-yangge1116@126.com> X-Mailer: git-send-email 2.7.4 X-CM-TRANSID: _____wDHjwjdFGBnGCMaAg--.3044S2 X-Coremail-Antispam: 1Uf129KBjvJXoWxtry8Zr4kJrWUGr4xCr1kuFg_yoWDGr18pF 48X3WIy3yrX3W3CrW8JF4vv3WYqw4xGF48AryIgw18Zw13KF92v3Z7KFy7AFy5Wr95AFWY vFWqkrWkGFsxAaDanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0zKsj8bUUUUU= X-Originating-IP: [118.242.3.34] X-CM-SenderInfo: 51dqwwjhrrila6rslhhfrp/1tbiOgW3G2dgFFkEhwABsb X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 36CEA2000B X-Stat-Signature: za9fiia9fn18r7oqhw4icg9gostqk8m5 X-Rspam-User: X-HE-Tag: 1734350040-100554 X-HE-Meta: U2FsdGVkX1/rvOoo8hxWLc5AM3x0k3FuAFTUeWoh/6PSIf4dMj69tL+yVtSm2bncyd1IblJ+93vVHJIj9hRKzISO1IQIdoIsCvgj7TbEFZxrE2Xj02fLxDGLuON5cN5I/naXSSdaaD5+vjXJw57akRvYjq1TMvOdE5Cnx6QcxFDzP4ncODe0WBHwB9Fxiu4VSDXXXQgQKZf8t5zpH7wf6QucSKFyPWUrkp6Dl6fIQD5RYaMFw2m3+qrEgeWq8ITZWs5MtxPR6LH4Zw7PSSdqCfITlFHjRcgctA0sfbZMh1wiQRZMYGryb+rDx0Rb7g3K8WyOyRkY5lt9r79V58qY4FuMsrRF9Y7zmaFwXh6MqRoeRn6CSYozDGYreyKIs/tI8TlDO5xgs0sFGwOobiD0ggSAtUbqXVFYvI1Rer7AR9Dzs95waZzWE7x+O2ADhFEGe1KIHtSZBwlJ5JrI6WFw7GaS7HFqVrnrBBfcY5WsHCFH42Uiss2Xe1aNXr3S5kg8rZsOvNgGhHDJZZ5esZ2cK0GYh9wAb4Gxe9nLAUwMo0uEolHEk+ahMfOzGkqTkb4T8QkRcUxgwqmKmy3q5Tkm3snb+HxGHbvX2VNyOHkFHDlVtqa8vt1lXudlNTQ7gI2JHNIBrHVIFX4rXZArfGpjSZ7ipC21vn1rP2WjoS2gBDhnJLn1VVtGNtpsRtNnGSWmV4da19olbwJ7OqQ6XAITvSgkHu3SsgMgy8R9GhK523xeL4MBZ+K8TlwOtlVvvgsziBoGTua+vnasMRTcS/4ZUQ0WtsJSosFC/F3h35y/5drue+r2jx42LhB+4dfcp5dbY7O0wQI+lKPcdfmKBF8vS19a7Ov7b1PSw94xTq6kfmfKQbbZV55M72KXG82m5xCCoKSv+IrR1eaelt/hm05LoJl+zNPSVNJdog08DveySFrlfspn5mIbl8+r+CTi9hTFc7zbXOfQo76cv8EQkvG lQOujM8j HzHGcETRFz7OrAIWbFY+5Ovlm5aLho7IntiVk7knOl7IiQrMiuGUmTHzumcr2bouZFBuWHB+P38MNiQ6mso07AnS7ke3VYi7YyGF9N6ASajZzIwi5i9TaQGK2eOOvts966AAtA1TFTr3zFVg0sVSkla4auapnb3iHtd4KIxw5E973zsdU41rzJ/zjx2dq5lFcnN4dXoeWrdNu1rtUgbW0N4c22sG0+5Ol8U9nxqY2wGFSqylA0dVtzUwvn1WeQBSC+PkkiA18DC+BjKOw1gxrOLpIr485oaP15GeZxPd8WBsejxOeveIGNUII9yyx23iQpaQ9BNwMryiRDVID279BctfoQd09QvEYMF58 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 --- 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 | 20 +++++++++++--------- mm/internal.h | 3 ++- mm/page_alloc.c | 6 ++++-- mm/page_isolation.c | 3 ++- mm/page_reporting.c | 2 +- mm/vmscan.c | 4 ++-- 7 files changed, 26 insertions(+), 18 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..b10d921 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; 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..ecb2fd7 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; } 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; /*