From patchwork Thu Oct 24 04:13:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hugh Dickins X-Patchwork-Id: 13848296 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 EA1B7D0BB5B for ; Thu, 24 Oct 2024 04:13:51 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7E32E6B0085; Thu, 24 Oct 2024 00:13:51 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 76AA76B0088; Thu, 24 Oct 2024 00:13:51 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5E5186B0089; Thu, 24 Oct 2024 00:13:51 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 36DEC6B0085 for ; Thu, 24 Oct 2024 00:13:51 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 8EC4A1A10DA for ; Thu, 24 Oct 2024 04:13:18 +0000 (UTC) X-FDA: 82707177084.04.192F9AE Received: from mail-ot1-f53.google.com (mail-ot1-f53.google.com [209.85.210.53]) by imf02.hostedemail.com (Postfix) with ESMTP id E5B7880006 for ; Thu, 24 Oct 2024 04:13:14 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=2n8W+QR1; spf=pass (imf02.hostedemail.com: domain of hughd@google.com designates 209.85.210.53 as permitted sender) smtp.mailfrom=hughd@google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1729743151; a=rsa-sha256; cv=none; b=sbGgJuQ+mt790JnAgmUMUMn9HNjJdLd5zLh7zIgVxdsUNFQLiSmeHHhwF06ryEt0VMEwca HWSIVi4+0FXokyyvEzBvQ9L1943Zu/5HlRvlprUuITaSiwExQmsn900anS4uY9BR334p4Z 4zQIweQQagOUZ0D0B7h2q6kYpd5ZsD0= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=2n8W+QR1; spf=pass (imf02.hostedemail.com: domain of hughd@google.com designates 209.85.210.53 as permitted sender) smtp.mailfrom=hughd@google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1729743151; h=from:from:sender: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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=An8fd2BC5jpDla/l0aJnXpodQfRunSo+/SitiqMszDc=; b=iHgEKXy+TSHjBQpq1VDYTx8I+mHMA07u4wJT0eJgHHNdk9Okvbyieu1B0R18lWAcq/7A+b qBoC6S6o0I4rzVpv7/ixBt/K6eg191ztwpFGBYE81dZ1G3FUVVdL+REuiR/esT2qSsUGhl FgerQ7pDJU1DNfwXR2fFTvxYq7UO0Mc= Received: by mail-ot1-f53.google.com with SMTP id 46e09a7af769-718065d6364so269836a34.3 for ; Wed, 23 Oct 2024 21:13:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1729743228; x=1730348028; darn=kvack.org; h=mime-version:references:message-id:in-reply-to:subject:cc:to:from :date:from:to:cc:subject:date:message-id:reply-to; bh=An8fd2BC5jpDla/l0aJnXpodQfRunSo+/SitiqMszDc=; b=2n8W+QR1weTWUSPOAXC/pA3oPJjtp1+OCumMTbgcANDYhZxRyV5jEqDkElsr7KrxX8 KpiwNCENkQDluHVZkLXIaQJyo6zwG5GuONyXV7gvT3SYVp/c0+2onHOl7LZuiBetgmwu 7ua41pYyieamqi77ir1/Fz1axiO6NTt9XqaUrEwRytWeQ4obHRJjF9G6H4I258UiaKqC uAHkQB7zkTofLzjaoc8VbShkR79ZgX+tDROuP3zG9tskc+HFy7DhinxSVuoTGtHZvVjv Jb9sFtkJ5zHqFuFfa5J9G7U2Rq27zw0zvGIpb4rkvdBhlT46ukRjavZ8/56NOtvz0An+ yZKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729743228; x=1730348028; h=mime-version:references:message-id:in-reply-to:subject:cc:to:from :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=An8fd2BC5jpDla/l0aJnXpodQfRunSo+/SitiqMszDc=; b=A/t61+ebE744wk4ncglM3y33HJfI4naFC3Z6rflJoIO83uBlUeNMn+6HGv/mwRjLnD wJxMzB6z72EY9NdEgteQj8GX2KUGq0Y1aG7SWYrhCrhHmLEuVAKPKCUebGa8JQhv04yV 8RBPGE67Uyo6p8TTPvvhYsA+0aNZ4jToJgE0rIEF7eX8/B+2b6QNPYq7FsHUvVfYwqeh BY1x3wKS0YHsN9BSVAEYmZc9eWJcL+0UgIdDLY61ef/25KX+o71Blx9OV7kDEyg+X6Hm c0sHW8Am16gi99gIhN6KH9B32ShxezE450f2VSHMsm15oA2q4p3O9f0jOgecd0YoDQ1v Zyjg== X-Forwarded-Encrypted: i=1; AJvYcCUO8YlHL36nGmikdtgJ5xYlACVW2ir57ecFQMNqcSFSGxzKcSYV+XPeMvlXEoZyPQKgXKrkERB2Gg==@kvack.org X-Gm-Message-State: AOJu0YzhXHOg9U3G9VNppkfv7FMX6/+lXtmyYhWjjBZIKMmxAuK/n98p ZV3gn4p4j6LSZ8vYRy7Z7hQjpuosSdXfAvqZsvNM6sFzcavwgS5gpwby3kzxcg== X-Google-Smtp-Source: AGHT+IG9LoVUSBsrjDvRDAGaa6M0hzzBKYZ/c60rMaA0qPUglbUq+TMXrkZwZNuzAM2H71+tNAgKIw== X-Received: by 2002:a05:6870:d8c9:b0:277:c113:5b26 with SMTP id 586e51a60fabf-28ccb75f302mr4841265fac.7.1729743227903; Wed, 23 Oct 2024 21:13:47 -0700 (PDT) Received: from darker.attlocal.net (172-10-233-147.lightspeed.sntcca.sbcglobal.net. [172.10.233.147]) by smtp.gmail.com with ESMTPSA id 586e51a60fabf-28c7925b9besm2884314fac.16.2024.10.23.21.13.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Oct 2024 21:13:46 -0700 (PDT) Date: Wed, 23 Oct 2024 21:13:44 -0700 (PDT) From: Hugh Dickins To: Andrew Morton cc: Usama Arif , Yang Shi , Wei Yang , "Kirill A. Shutemov" , Matthew Wilcox , David Hildenbrand , Johannes Weiner , Baolin Wang , Barry Song , Kefeng Wang , Ryan Roberts , Nhat Pham , Zi Yan , Chris Li , linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH hotfix 2/2] mm/thp: fix deferred split unqueue naming and locking In-Reply-To: <760237a3-69d6-9197-432d-0306d52c048a@google.com> Message-ID: <7dc6b280-cd87-acd1-1124-e512e3d2217d@google.com> References: <760237a3-69d6-9197-432d-0306d52c048a@google.com> MIME-Version: 1.0 X-Stat-Signature: 3jtz95mgncbeg17mik5u1szcawrcun56 X-Rspamd-Queue-Id: E5B7880006 X-Rspam-User: X-Rspamd-Server: rspam10 X-HE-Tag: 1729743194-112789 X-HE-Meta: U2FsdGVkX185pW5CR+iqwrsI4zkQTgbrbYf08MohmNbSKt/WfWzcYNtMDdIXcsgcwnCqTzBUNcHN+u/HKIOCMarEyvmxJspgIa6cHK3w60mMpS8+/aG4s/X1QTSyasYpW9hJ20hFs08PXEBy21fa3wuglG8Rjn7ylpkdg73YiM6hwy956KU6aOwpo4zPtCf4OsgsbSGHHzkMEOkyYR+5CxlneqlXUdLnFYTqFJUtP5tp/WyiQwVNUKsOOTe18Wg8DBcKOHTIQOGzRmJQ13t9NFs3cY5wv5Qty9nqtJyoxoZ8axxvByk55eMS80ovikv39JeVKs29170+VwthXkIySt+UbLwFkFhQZVPnCA0Jg3oLVoCrnmYzqNroYDhcJ20Nydbi6YD97Kbs0QnHzIA9+AZyA+i9IeAiYQ7EjGCBxfY17dTOTAkHgihV/GI9KJF8rljoXjwUxXRynWNZmJF3J6M79X3iWsUxH8qL06pFT1lA2TPdt56Gfd/NhIP99aClnRn3Mb4GiNBWhHkmvv78bBLUXa4NjJe5yXT4Jwz36eYT2A/qZIbtkk8X1m5CIrUE9ujSO4TLGFfAOJP8KLinbOd3rCDSRrYo7t7OcEqzBet2Ut4wo6h9ax3sJStOzHxU2X3VxYHppjtOcNtCqIv1pZpvK8Exglo2ratisjSC4xCMQy0oQnl4EHyobdvsHnHm0oSfOp26lTf1NuNev1ubG3jpmALDBv4Rah2HIGS7XNCYKJ4+iZaOyMz3W+qw6FR08SDeWXtp9oI/pCpoNZkdJpifMEpBNg5UbPLMomMLYfLvZ1zz/Hc62kj67IWqKlfVcVaziUNggcSOIOVLoNDvOkMDpIg8TYRbYVfjrhZs2jLnRdEWp+WwXNws5axDHJ3M/auNaBihPPigNYtfDqZhpMj9zM+vwdhlBAE4FQ2OEAIEAPP72KBx5gcww8L0qW8OAiau7i0xKPoFmGWQqCb lx1IjBwZ lmst3niXMFYlmC7MqsJ8jR7coJSKPC7j9iYaN/CiEKIJ6VADO4azOctdGmFw4mrBAoEmqWVPRrSs+m3vNxKWzCU0LOT3PB24l4PgF+MYJ5WP1t3k/tvUlfTAX0N9NRx9Y0k+pfB1Gu49hBG1XiNESWT2OLSTPWYkofilaK+084mIVbaTVdIG01R5TEocdTqncZOeFE+bz8wsQ0GkUR/dJZK4QwdBK+iVCkVKHToN1Yjq3zOk/e1AmD/MAuqh9tbS1BdrHZFLkNt99cCTCoim3n8nmBNNQ/QdV9gi4m3sQAq7uFB8zHWtNT56whoEvUc4TywHb2/HupQLMM4gxhq1gywQrOFF1Ro4AXx6W1LJScxVB8sKlOijneVEi8H4hzUO15+QcXLWk3QVjuE4qbFXOXnNYgwuoAeYA+XsS6OD4hvvkkNStBTtNUZe41sMRvsPaMkds 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: Recent changes are putting more pressure on THP deferred split queues: under load revealing long-standing races, causing list_del corruptions, "Bad page state"s and worse (I keep BUGs in both of those, so usually don't get to see how badly they end up without). The relevant recent changes being 6.8's mTHP, 6.10's mTHP swapout, and 6.12's mTHP swapin, improved swap allocation, and underused THP splitting. Before fixing locking: rename misleading folio_undo_large_rmappable(), which does not undo large_rmappable, to folio_unqueue_deferred_split(), which is what it does. But that and its out-of-line __callee are mm internals of very limited usability: add comment and WARN_ON_ONCEs to check usage; and return a bool to say if a deferred split was unqueued, which can then be used in WARN_ON_ONCEs around safety checks (sparing callers the arcane conditionals in __folio_unqueue_deferred_split()). Swapout: mem_cgroup_swapout() has been resetting folio->memcg_data 0 without checking and unqueueing a THP folio from deferred split list; which is unfortunate, since the split_queue_lock depends on the memcg (when memcg is enabled); so swapout has been unqueueing such THPs later, when freeing the folio, using the pgdat's lock instead: potentially corrupting the memcg's list. __remove_mapping() has frozen refcount to 0 here, so no problem with calling folio_unqueue_deferred_split() before resetting memcg_data. That goes back to 5.4 commit 87eaceb3faa5 ("mm: thp: make deferred split shrinker memcg aware"): which included a check on swapcache before adding to deferred queue (which can now be removed), but no check on deferred queue before adding THP to swapcache (maybe other circumstances prevented it at that time, but not now). Memcg-v1 move (deprecated): mem_cgroup_move_account() has been changing folio->memcg_data without checking and unqueueing a THP folio from the deferred list, sometimes corrupting "from" memcg's list, like swapout. Refcount is non-zero here, so folio_unqueue_deferred_split() can only be used in a WARN_ON_ONCE to validate the fix, which must be done earlier: mem_cgroup_move_charge_pte_range() first try to split the THP (splitting of course unqueues), or skip it if that fails. Not ideal, but moving charge has been requested, and khugepaged should repair the THP later: nobody wants new custom unqueueing code just for this deprecated case. The 87eaceb3faa5 commit did have the code to move from one deferred list to another (but was not conscious of its unsafety while refcount non-0); but that was removed by 5.6 commit fac0516b5534 ("mm: thp: don't need care deferred split queue in memcg charge move path"), which argued that the existence of a PMD mapping guarantees that the THP cannot be on a deferred list. I'm not sure if that was true at the time (swapcache remapped?), but it's clearly not true since 6.12 commit dafff3f4c850 ("mm: split underused THPs"). [Note in passing: mem_cgroup_move_charge_pte_range() just skips mTHPs, large but not PMD-mapped: that's safe, but perhaps not intended: it's arguable whether the deprecated feature should be updated to work better with the new feature; but certainly not in this patch.] Backport to 6.11 should be straightforward. Earlier backports must take care that other _deferred_list fixes and dependencies are included. It is unclear whether these fixes are realistically needed before 6.12. Fixes: 87eaceb3faa5 ("mm: thp: make deferred split shrinker memcg aware") Signed-off-by: Hugh Dickins Cc: --- mm/huge_memory.c | 35 +++++++++++++++++++++-------------- mm/internal.h | 10 +++++----- mm/memcontrol-v1.c | 25 +++++++++++++++++++++++++ mm/memcontrol.c | 8 +++++--- mm/migrate.c | 4 ++-- mm/page_alloc.c | 4 +++- mm/swap.c | 4 ++-- mm/vmscan.c | 4 ++-- 8 files changed, 65 insertions(+), 29 deletions(-) diff --git a/mm/huge_memory.c b/mm/huge_memory.c index a1d345f1680c..dc7d5bb76495 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -3588,10 +3588,27 @@ int split_folio_to_list(struct folio *folio, struct list_head *list) return split_huge_page_to_list_to_order(&folio->page, list, ret); } -void __folio_undo_large_rmappable(struct folio *folio) +/* + * __folio_unqueue_deferred_split() is not to be called directly: + * the folio_unqueue_deferred_split() inline wrapper in mm/internal.h + * limits its calls to those folios which may have a _deferred_list for + * queueing THP splits, and that list is (racily observed to be) non-empty. + * + * It is unsafe to call folio_unqueue_deferred_split() until folio refcount is + * zero: because even when split_queue_lock is held, a non-empty _deferred_list + * might be in use on deferred_split_scan()'s unlocked on-stack list. + * + * If memory cgroups are enabled, split_queue_lock is in the mem_cgroup: it is + * therefore important to unqueue deferred split before changing folio memcg. + */ +bool __folio_unqueue_deferred_split(struct folio *folio) { struct deferred_split *ds_queue; unsigned long flags; + bool unqueued = false; + + WARN_ON_ONCE(folio_ref_count(folio)); + WARN_ON_ONCE(!mem_cgroup_disabled() && !folio_memcg(folio)); ds_queue = get_deferred_split_queue(folio); spin_lock_irqsave(&ds_queue->split_queue_lock, flags); @@ -3603,8 +3620,11 @@ void __folio_undo_large_rmappable(struct folio *folio) MTHP_STAT_NR_ANON_PARTIALLY_MAPPED, -1); } list_del_init(&folio->_deferred_list); + unqueued = true; } spin_unlock_irqrestore(&ds_queue->split_queue_lock, flags); + + return unqueued; /* useful for debug warnings */ } /* partially_mapped=false won't clear PG_partially_mapped folio flag */ @@ -3626,19 +3646,6 @@ void deferred_split_folio(struct folio *folio, bool partially_mapped) if (!partially_mapped && !split_underused_thp) return; - /* - * The try_to_unmap() in page reclaim path might reach here too, - * this may cause a race condition to corrupt deferred split queue. - * And, if page reclaim is already handling the same folio, it is - * unnecessary to handle it again in shrinker. - * - * Check the swapcache flag to determine if the folio is being - * handled by page reclaim since THP swap would add the folio into - * swap cache before calling try_to_unmap(). - */ - if (folio_test_swapcache(folio)) - return; - spin_lock_irqsave(&ds_queue->split_queue_lock, flags); if (partially_mapped) { if (!folio_test_partially_mapped(folio)) { diff --git a/mm/internal.h b/mm/internal.h index 93083bbeeefa..16c1f3cd599e 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -639,11 +639,11 @@ static inline void folio_set_order(struct folio *folio, unsigned int order) #endif } -void __folio_undo_large_rmappable(struct folio *folio); -static inline void folio_undo_large_rmappable(struct folio *folio) +bool __folio_unqueue_deferred_split(struct folio *folio); +static inline bool folio_unqueue_deferred_split(struct folio *folio) { if (folio_order(folio) <= 1 || !folio_test_large_rmappable(folio)) - return; + return false; /* * At this point, there is no one trying to add the folio to @@ -651,9 +651,9 @@ static inline void folio_undo_large_rmappable(struct folio *folio) * to check without acquiring the split_queue_lock. */ if (data_race(list_empty(&folio->_deferred_list))) - return; + return false; - __folio_undo_large_rmappable(folio); + return __folio_unqueue_deferred_split(folio); } static inline struct folio *page_rmappable_folio(struct page *page) diff --git a/mm/memcontrol-v1.c b/mm/memcontrol-v1.c index 81d8819f13cd..f8744f5630bb 100644 --- a/mm/memcontrol-v1.c +++ b/mm/memcontrol-v1.c @@ -848,6 +848,8 @@ static int mem_cgroup_move_account(struct folio *folio, css_get(&to->css); css_put(&from->css); + /* Warning should never happen, so don't worry about refcount non-0 */ + WARN_ON_ONCE(folio_unqueue_deferred_split(folio)); folio->memcg_data = (unsigned long)to; __folio_memcg_unlock(from); @@ -1217,7 +1219,9 @@ static int mem_cgroup_move_charge_pte_range(pmd_t *pmd, enum mc_target_type target_type; union mc_target target; struct folio *folio; + bool tried_split_before = false; +retry_pmd: ptl = pmd_trans_huge_lock(pmd, vma); if (ptl) { if (mc.precharge < HPAGE_PMD_NR) { @@ -1227,6 +1231,27 @@ static int mem_cgroup_move_charge_pte_range(pmd_t *pmd, target_type = get_mctgt_type_thp(vma, addr, *pmd, &target); if (target_type == MC_TARGET_PAGE) { folio = target.folio; + /* + * Deferred split queue locking depends on memcg, + * and unqueue is unsafe unless folio refcount is 0: + * split or skip if on the queue? first try to split. + */ + if (!list_empty(&folio->_deferred_list)) { + spin_unlock(ptl); + if (!tried_split_before) + split_folio(folio); + folio_unlock(folio); + folio_put(folio); + if (tried_split_before) + return 0; + tried_split_before = true; + goto retry_pmd; + } + /* + * So long as that pmd lock is held, the folio cannot + * be racily added to the _deferred_list, because + * __folio_remove_rmap() will find !partially_mapped. + */ if (folio_isolate_lru(folio)) { if (!mem_cgroup_move_account(folio, true, mc.from, mc.to)) { diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 2703227cce88..06df2af97415 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -4629,9 +4629,6 @@ static void uncharge_folio(struct folio *folio, struct uncharge_gather *ug) struct obj_cgroup *objcg; VM_BUG_ON_FOLIO(folio_test_lru(folio), folio); - VM_BUG_ON_FOLIO(folio_order(folio) > 1 && - !folio_test_hugetlb(folio) && - !list_empty(&folio->_deferred_list), folio); /* * Nobody should be changing or seriously looking at @@ -4678,6 +4675,7 @@ static void uncharge_folio(struct folio *folio, struct uncharge_gather *ug) ug->nr_memory += nr_pages; ug->pgpgout++; + WARN_ON_ONCE(folio_unqueue_deferred_split(folio)); folio->memcg_data = 0; } @@ -4789,6 +4787,9 @@ void mem_cgroup_migrate(struct folio *old, struct folio *new) /* Transfer the charge and the css ref */ commit_charge(new, memcg); + + /* Warning should never happen, so don't worry about refcount non-0 */ + WARN_ON_ONCE(folio_unqueue_deferred_split(old)); old->memcg_data = 0; } @@ -4975,6 +4976,7 @@ void mem_cgroup_swapout(struct folio *folio, swp_entry_t entry) VM_BUG_ON_FOLIO(oldid, folio); mod_memcg_state(swap_memcg, MEMCG_SWAP, nr_entries); + folio_unqueue_deferred_split(folio); folio->memcg_data = 0; if (!mem_cgroup_is_root(memcg)) diff --git a/mm/migrate.c b/mm/migrate.c index df91248755e4..691f25ee2489 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -489,7 +489,7 @@ static int __folio_migrate_mapping(struct address_space *mapping, folio_test_large_rmappable(folio)) { if (!folio_ref_freeze(folio, expected_count)) return -EAGAIN; - folio_undo_large_rmappable(folio); + folio_unqueue_deferred_split(folio); folio_ref_unfreeze(folio, expected_count); } @@ -514,7 +514,7 @@ static int __folio_migrate_mapping(struct address_space *mapping, } /* Take off deferred split queue while frozen and memcg set */ - folio_undo_large_rmappable(folio); + folio_unqueue_deferred_split(folio); /* * Now we know that no one else is looking at the folio: diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 4b21a368b4e2..57f64b5d0004 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -2681,7 +2681,9 @@ void free_unref_folios(struct folio_batch *folios) unsigned long pfn = folio_pfn(folio); unsigned int order = folio_order(folio); - folio_undo_large_rmappable(folio); + if (mem_cgroup_disabled()) + folio_unqueue_deferred_split(folio); + if (!free_pages_prepare(&folio->page, order)) continue; /* diff --git a/mm/swap.c b/mm/swap.c index 835bdf324b76..b8e3259ea2c4 100644 --- a/mm/swap.c +++ b/mm/swap.c @@ -121,7 +121,7 @@ void __folio_put(struct folio *folio) } page_cache_release(folio); - folio_undo_large_rmappable(folio); + folio_unqueue_deferred_split(folio); mem_cgroup_uncharge(folio); free_unref_page(&folio->page, folio_order(folio)); } @@ -988,7 +988,7 @@ void folios_put_refs(struct folio_batch *folios, unsigned int *refs) free_huge_folio(folio); continue; } - folio_undo_large_rmappable(folio); + folio_unqueue_deferred_split(folio); __page_cache_release(folio, &lruvec, &flags); if (j != i) diff --git a/mm/vmscan.c b/mm/vmscan.c index eb4e8440c507..635d45745b73 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -1475,7 +1475,7 @@ static unsigned int shrink_folio_list(struct list_head *folio_list, */ nr_reclaimed += nr_pages; - folio_undo_large_rmappable(folio); + folio_unqueue_deferred_split(folio); if (folio_batch_add(&free_folios, folio) == 0) { mem_cgroup_uncharge_folios(&free_folios); try_to_unmap_flush(); @@ -1863,7 +1863,7 @@ static unsigned int move_folios_to_lru(struct lruvec *lruvec, if (unlikely(folio_put_testzero(folio))) { __folio_clear_lru_flags(folio); - folio_undo_large_rmappable(folio); + folio_unqueue_deferred_split(folio); if (folio_batch_add(&free_folios, folio) == 0) { spin_unlock_irq(&lruvec->lru_lock); mem_cgroup_uncharge_folios(&free_folios);