From patchwork Mon Jan 22 01:00:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Byungchul Park X-Patchwork-Id: 13524737 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 5022EC47DD3 for ; Mon, 22 Jan 2024 02:48:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C2B4C6B0072; Sun, 21 Jan 2024 21:48:41 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id BB4758D0001; Sun, 21 Jan 2024 21:48:41 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A55646B007D; Sun, 21 Jan 2024 21:48:41 -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 912AB6B0072 for ; Sun, 21 Jan 2024 21:48:41 -0500 (EST) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 67439A11E0 for ; Mon, 22 Jan 2024 02:48:41 +0000 (UTC) X-FDA: 81705414042.27.709029D Received: from invmail4.hynix.com (exvmail4.hynix.com [166.125.252.92]) by imf14.hostedemail.com (Postfix) with ESMTP id 86BDA10000B for ; Mon, 22 Jan 2024 02:48:39 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf14.hostedemail.com: domain of byungchul@sk.com designates 166.125.252.92 as permitted sender) smtp.mailfrom=byungchul@sk.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1705891719; a=rsa-sha256; cv=none; b=tKjco4UCtC/TQxWS6p0PHDy+oTPe+8GUVTon6hXahYyfmkrnZon2iELeAuPmS8erLh0MHz 7ZZi1ErDSIzdyukWaanv2hp7UZCKz/bI1u6RzmT31TUWPsd65s/+PjOfYL30zPu6zpniW2 9cWSBjrfTjKTTM4KkpJGQBz9V5p44lY= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf14.hostedemail.com: domain of byungchul@sk.com designates 166.125.252.92 as permitted sender) smtp.mailfrom=byungchul@sk.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1705891719; 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:in-reply-to: references:references; bh=z8N3K7cEzP29wp8OmV1x4SKhsG69RUNKzzZ3XrSlbEU=; b=FEtVaomDKb601EiLwC1sxl3X8Mtl425FwYmiSX8PT9RtQP3giUTk6NN8UzW8PBnGpUMhlK Af8oAN84jZKjCNGIMU4hjLvMi4wBgPkT0JxlsVFdoLA9FFNWFwBPyJ7rvIMqqrWyTOdJ1o 6AIEIurC96ySzzpamfdkZD20L6Ezi+g= X-AuditID: a67dfc5b-d85ff70000001748-95-65adbe43199d From: Byungchul Park To: linux-kernel@vger.kernel.org, linux-mm@kvack.org Cc: kernel_team@skhynix.com, akpm@linux-foundation.org, ying.huang@intel.com, namit@vmware.com, vernhao@tencent.com, mgorman@techsingularity.net, hughd@google.com, willy@infradead.org, david@redhat.com, peterz@infradead.org, luto@kernel.org, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, rjgolo@gmail.com Subject: [PATCH v7 8/8] mm: Pause migrc mechanism at high memory pressure Date: Mon, 22 Jan 2024 10:00:40 +0900 Message-Id: <20240122010040.74346-9-byungchul@sk.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20240122010040.74346-1-byungchul@sk.com> References: <20240122010040.74346-1-byungchul@sk.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrALMWRmVeSWpSXmKPExsXC9ZZnoa7zvrWpBv0tlhZz1q9hs/i84R+b xYsN7YwWX9f/YrZ4+qmPxeLyrjlsFvfW/Ge1OL9rLavFjqX7mCwuHVjAZHF910NGi+O9B5gs 5t/7zGaxedNUZovjU6YyWvz+AdRxctZkFgdBj++tfSweO2fdZfdYsKnUY/MKLY/Fe14yeWxa 1cnmsenTJHaPd+fOsXucmPGbxWPeyUCP9/uusnls/WXn0Tj1GpvH501yHu/mv2UL4I/isklJ zcksSy3St0vgyuhq+89WMFWl4vcmqwbG/bJdjJwcEgImEn+XPWSEsc9O38wGYrMJqEvcuPGT GcQWETCTONj6h72LkYuDWeAjk8Tq7x0sIAlhAU+J+4tngzWwCKhKzN23CyzOK2Aq8XjGAyaI ofISqzccABvECTRoyq8usLgQUM3cDzsZQYZKCPxnk7g++wgrRIOkxMEVN1gmMPIuYGRYxSiU mVeWm5iZY6KXUZmXWaGXnJ+7iREYD8tq/0TvYPx0IfgQowAHoxIPrwP72lQh1sSy4srcQ4wS HMxKIrz8qqtShXhTEiurUovy44tKc1KLDzFKc7AoifMafStPERJITyxJzU5NLUgtgskycXBK NTAmNca9qon/vGAqq/PkesONL//mz38uozZjjZLeqskW3PLXMzsO3Fpy7ETnkjjlN4xZKUoX u3ks+FuYwhOzzWoXpUwL32z+43D1pyg9jUl+CVbtFc5V/u77FOqLMk+vss5f17LVTTj29uWX /vP/fUvn6ViXHlI8O7f9jdeJ1LeyIXZeoTIXriixFGckGmoxFxUnAgAdfhCsgwIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrOLMWRmVeSWpSXmKPExsXC5WfdrOu8b22qwfs2XYs569ewWXze8I/N 4sWGdkaLr+t/MVs8/dTHYnF47klWi8u75rBZ3Fvzn9Xi/K61rBY7lu5jsrh0YAGTxfVdDxkt jvceYLKYf+8zm8XmTVOZLY5Pmcpo8fsHUMfJWZNZHIQ8vrf2sXjsnHWX3WPBplKPzSu0PBbv ecnksWlVJ5vHpk+T2D3enTvH7nFixm8Wj3knAz3e77vK5rH4xQcmj62/7Dwap15j8/i8Sc7j 3fy3bAECUVw2Kak5mWWpRfp2CVwZXW3/2QqmqlT83mTVwLhftouRk0NCwETi7PTNbCA2m4C6 xI0bP5lBbBEBM4mDrX/Yuxi5OJgFPjJJrP7ewQKSEBbwlLi/eDZYA4uAqsTcfbvA4rwCphKP ZzxgghgqL7F6wwGwQZxAg6b86gKLCwHVzP2wk3ECI9cCRoZVjCKZeWW5iZk5pnrF2RmVeZkV esn5uZsYgcG9rPbPxB2MXy67H2IU4GBU4uF1YF+bKsSaWFZcmXuIUYKDWUmEl191VaoQb0pi ZVVqUX58UWlOavEhRmkOFiVxXq/w1AQhgfTEktTs1NSC1CKYLBMHp1QDo93xug+yIhccdm+b cqr6p337zc+uiesLuSd1Xdi6fhVfdI/iFIFzXTtuLj7U25n/5MI3r0j5DbZFDpxLZb/fuq7Q 3sdXMjlrx9JVX1MPK+5qv+6nGPlb9d3eyc660Q+0CszSQh3tj7vyv3SSP/dyW0Wi13sxt7YN vzzFfbI/9F/YwJlg28joocRSnJFoqMVcVJwIAOxAnm9qAgAA X-CFilter-Loop: Reflected X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 86BDA10000B X-Stat-Signature: r8nr7ow4g9zi5dhfd8bg69pbk9djwoqs X-Rspam-User: X-HE-Tag: 1705891719-622546 X-HE-Meta: U2FsdGVkX1/eyqP69SgSeWAkf19g2CGRC5HuCfkL0+/LX6xjYIihWXApfwhwptk0AMq4szk8Zp1nAf18VfVzQN2o0ERkpcMsEnGPvgBPMglSNb1U3mEL/nRiCqDqym/0NVm8BGJ/ys+bOQ0It7OHoPsPKBCfmFArYbcghtAoGQEkf/fYWZR0Y2KpHChXsQPYl8MVO62NhJ3xptrk/AKwOF+Giu5rSB5n6gvwvC/asnXzi0HRJ2CFF/gqlDWeMvu/yT2a/Vd7wGIfKX8M5yKs8iDzVZwFKBl3063s1aLmXtqlfaT0WL+qAbCygocXu0KxhB2rJ7JsV1dLA28cQloyMQM4+ow78sHw+r0BgOwxCRQGULjKtNAekbabHQrbga5MHLVL+jJBjZ/6OjH597dryjPGEl61Fyyb1OoJJROpq2ORF2qWPsd/40SJxMUPeqz5RScmfQBiQr2Zi5HUUPIayYuyrPabLOtQ5LGvMfRNWVaxcKxjFDYGOq4oK0OLu/nvLQ+COngd7C/FPLWwbolAyhNhl7yc+rmQI9AL/sOIrad2tKEMLqaJggZceQ3sLg4QrvTxUwY1GumlBI3P707L8/Cfg4XafitWV1Mb/iAg8snXOwH/RDhD7sutkryYXKb4fDvv3sArGQ1ttck6+cwuwZuLrlj1v4dsI2pwk9kLCx69XfcdNaDOsSNkMicTRXtmHNfnC8nSQUfIpnvkznGsLF0NQWzleUuKYQz5ivyB/aYNBOzyK0R88VPa2p30423OIWG669NakYxpRHJUeMKMDGWl3gN/n9/41CKRZQmeBwe28gxbF9DersP4w+0OKBYG4DlVtNU+17GYlEKnoC7cORS4AktDRxX9CwR/qe5NAkzpCdzgIXucN4jRRt89Q8tqO+NHlSQspcKEAc1sUsJrzSJAmcBvjZGtAzo4fffIIwwDkrwYqFxpJNwoYLdLpINjYjf7MEWoFxsehe/5Xpe AeQ== 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: Regression was observed when the system is in high memory pressure with swap on, where migrc might keep a number of folios in its pending queue, which possibly makes it worse. So temporarily prevented migrc from working on that condition. Signed-off-by: Byungchul Park --- mm/internal.h | 20 ++++++++++++++++++++ mm/migrate.c | 18 +++++++++++++++++- mm/page_alloc.c | 13 +++++++++++++ 3 files changed, 50 insertions(+), 1 deletion(-) diff --git a/mm/internal.h b/mm/internal.h index ab02cb8306e2..55781f879fb2 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -1285,6 +1285,8 @@ static inline void shrinker_debugfs_remove(struct dentry *debugfs_entry, #endif /* CONFIG_SHRINKER_DEBUG */ #if defined(CONFIG_MIGRATION) && defined(CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH) +extern atomic_t migrc_pause_cnt; + /* * Reset the indicator indicating there are no writable mappings at the * beginning of every rmap traverse for unmap. Migrc can work only when @@ -1313,6 +1315,21 @@ static inline bool can_migrc_test(void) return current->can_migrc && current->tlb_ubc_ro.flush_required; } +static inline void migrc_pause(void) +{ + atomic_inc(&migrc_pause_cnt); +} + +static inline void migrc_resume(void) +{ + atomic_dec(&migrc_pause_cnt); +} + +static inline bool migrc_paused(void) +{ + return !!atomic_read(&migrc_pause_cnt); +} + /* * Return the number of folios pending TLB flush that have yet to get * freed in the zone. @@ -1332,6 +1349,9 @@ void migrc_flush_end(struct tlbflush_unmap_batch *batch); static inline void can_migrc_init(void) {} static inline void can_migrc_fail(void) {} static inline bool can_migrc_test(void) { return false; } +static inline void migrc_pause(void) {} +static inline void migrc_resume(void) {} +static inline bool migrc_paused(void) { return false; } static inline int migrc_pending_nr_in_zone(struct zone *z) { return 0; } static inline bool migrc_flush_free_folios(void) { return false; } static inline void migrc_flush_start(void) {} diff --git a/mm/migrate.c b/mm/migrate.c index cbe5372f159e..fbc8586ed735 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -62,6 +62,12 @@ static struct tlbflush_unmap_batch migrc_ubc; static LIST_HEAD(migrc_folios); static DEFINE_SPINLOCK(migrc_lock); +/* + * Increase on entry of handling high memory pressure e.g. direct + * reclaim, decrease on the exit. See __alloc_pages_slowpath(). + */ +atomic_t migrc_pause_cnt = ATOMIC_INIT(0); + static void init_tlb_ubc(struct tlbflush_unmap_batch *ubc) { arch_tlbbatch_clear(&ubc->arch); @@ -1922,7 +1928,8 @@ static int migrate_pages_batch(struct list_head *from, */ init_tlb_ubc(&pending_ubc); do_migrc = IS_ENABLED(CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH) && - (reason == MR_DEMOTION || reason == MR_NUMA_MISPLACED); + (reason == MR_DEMOTION || reason == MR_NUMA_MISPLACED) && + !migrc_paused(); for (pass = 0; pass < nr_pass && retry; pass++) { retry = 0; @@ -1961,6 +1968,15 @@ static int migrate_pages_batch(struct list_head *from, continue; } + /* + * In case that the system is in high memory + * pressure, give up migrc mechanism this turn. + */ + if (unlikely(do_migrc && migrc_paused())) { + fold_ubc(tlb_ubc, &pending_ubc); + do_migrc = false; + } + can_migrc_init(); rc = migrate_folio_unmap(get_new_folio, put_new_folio, private, folio, &dst, mode, reason, diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 6ef0c22b1109..366777afce7f 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -4072,6 +4072,7 @@ __alloc_pages_slowpath(gfp_t gfp_mask, unsigned int order, unsigned int cpuset_mems_cookie; unsigned int zonelist_iter_cookie; int reserve_flags; + bool migrc_paused = false; restart: compaction_retries = 0; @@ -4203,6 +4204,16 @@ __alloc_pages_slowpath(gfp_t gfp_mask, unsigned int order, if (page) goto got_pg; + /* + * The system is in very high memory pressure. Pause migrc from + * expanding its pending queue temporarily. + */ + if (!migrc_paused) { + migrc_pause(); + migrc_paused = true; + migrc_flush_free_folios(); + } + /* Caller is not willing to reclaim, we can't balance anything */ if (!can_direct_reclaim) goto nopage; @@ -4330,6 +4341,8 @@ __alloc_pages_slowpath(gfp_t gfp_mask, unsigned int order, warn_alloc(gfp_mask, ac->nodemask, "page allocation failure: order:%u", order); got_pg: + if (migrc_paused) + migrc_resume(); return page; }