From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 357D828373 for ; Wed, 23 Sep 2026 22:23:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790202207; cv=none; b=VNqNYrNYrrtWA8urtnGy13o9fn7M07axCz+K6xAbI751oBXtIUfBQyuuoRTlCkOCJPvtKwUSy7eZh0nM6GVHSMOBX9LAnlD5J/R4EfKRzUprSvp003qv4NFqLBa2nNZtWY7tqHJsQcA5oCwdMKZ3kiXegCo4dgBWm5sLgZfSqGM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790202207; c=relaxed/simple; bh=CAcOs9cnihXcweQtL4ggvl/XPoRzfHD/sb7Ro7B5iSE=; h=Date:To:From:Subject:Message-Id; b=XLczdS9sIY9dnNOdzFCAsTJSAKu82mYGqlZEDB+/OPCilE1pGRP7TVG7OXIFa5qs9JmrdMeoxgPMwxZL12TEmtcQXmhJhwCIIUd/zDNeJg0ICbMcpTa2jaV9hZenpl8FjrgStNslcB9TfcTyYKGvsJSj8pDZX81T+cmZtVqZblU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b=DM7ddFlV; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b="DM7ddFlV" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0C7891F00893; Wed, 23 Sep 2026 22:23:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux-foundation.org; s=korg; t=1790202206; bh=A54OL6xdFAVICikXuDlmTK3/3q5XcegV3il44bx1MxI=; h=Date:To:From:Subject; b=DM7ddFlVqbeYffdQLxsU6TvVqitzSN9OKZYD7CRth3eh9KJoJo+5OrAX7C41kH/wG NNk36XyRgaOtQaYnSOdwMYKKCBde2oXRs8FoZ/6+436Y1XEY+JYyNibE+c9WYcNM/X YNsy+QPDSYv3wwQIYUlJTwD1g6BNFjnfQURzbfoQ= Date: Wed, 23 Sep 2026 15:23:25 -0700 To: mm-commits@vger.kernel.org,kasong@tencent.com,akpm@linux-foundation.org From: Andrew Morton Subject: [to-be-updated] mm-huge_memory-clean-up-after-split-folio-freeing-in-__folio_split.patch removed from -mm tree Message-Id: <20260923222326.0C7891F00893@smtp.kernel.org> Precedence: bulk X-Mailing-List: mm-commits@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: The quilt patch titled Subject: mm/huge_memory: clean up after-split folio freeing in __folio_split has been removed from the -mm tree. Its filename was mm-huge_memory-clean-up-after-split-folio-freeing-in-__folio_split.patch This patch was dropped because an updated version will be issued ------------------------------------------------------ From: Kairui Song Subject: mm/huge_memory: clean up after-split folio freeing in __folio_split Date: Tue, 15 Sep 2026 01:14:56 +0800 Replace free_folio_and_swap_cache() with an explicit folio_free_swap() and folio_put() in the after-split loop. free_folio_and_swap_cache() must trylock it again and re-check folio_mapped() before freeing the swap cache entries. If the trylock loses a race, the entries are left behind even though the folio reference is dropped. The sub folios are still locked here, so just directly call folio_free_swap() under the lock if it's unmapped, then unlock and drop the reference. This makes the swap cache freeing deterministic and the reference drop explicit. Link: https://lore.kernel.org/20260915-swap-thp-cleanup-v5-15-39878b37dfb0@tencent.com Signed-off-by: Kairui Song Signed-off-by: Andrew Morton Reviewed-by: Zi Yan Reviewed-by: Yeoreum Yun Reviewed-by: Kiryl Shutsemau (Meta) Acked-by: David Hildenbrand (Arm) Cc: Baolin Wang Cc: Baoquan He Cc: Barry Song Cc: Chris Li Cc: Dev Jain Cc: Kemeng Shi Cc: Lance Yang Cc: Liam R. Howlett Cc: Lorenzo Stoakes Cc: Michal Hocko Cc: Mike Rapoport Cc: Nhat Pham Cc: Ryan Roberts Cc: Suren Baghdasaryan Cc: Vlastimil Babka --- mm/huge_memory.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) --- a/mm/huge_memory.c~mm-huge_memory-clean-up-after-split-folio-freeing-in-__folio_split +++ a/mm/huge_memory.c @@ -4326,7 +4326,8 @@ static int __folio_split(struct folio *f struct list_head *list, enum split_type split_type) { struct folio *end_folio = folio_next(folio); - bool is_anon = folio_test_anon(folio); + const bool is_anon = folio_test_anon(folio); + const bool is_swapcache = folio_test_swapcache(folio); int old_order = folio_order(folio); struct folio *new_folio, *next; int ret; @@ -4366,14 +4367,16 @@ static int __folio_split(struct folio *f if (new_folio == page_folio(lock_at)) continue; - folio_unlock(new_folio); /* * Subpages whose mapping has been zapped may be freed * earlier, but freeing them requires taking the - * lru_lock, so we defer put_page() on tail pages until + * lru_lock, so we defer folio_put() on tail pages until * after the split completes. */ - free_folio_and_swap_cache(new_folio); + if (is_swapcache && !folio_mapped(new_folio)) + folio_free_swap(new_folio); + folio_unlock(new_folio); + folio_put(new_folio); } out: @@ -4400,7 +4403,7 @@ out: * isolated from LRU (if applicable) * * Upon return, the folio is not remapped, split folios are not added to LRU, - * free_folio_and_swap_cache() is not called, and new folios remain locked. + * folio_free_swap() is not called, and new folios remain locked. * * Return: 0 on success, -EAGAIN if the folio cannot be split (e.g., due to * insufficient reference count or extra pins). _ Patches currently in -mm which might be from kasong@tencent.com are mm-memcontrol-move-the-lru_zone_size-sanity-check-to-the-reader-side.patch mm-mglru-introduce-helpers-for-manipulating-gen-and-refs-flags.patch mm-migrate-copy-all-referenced-state-via-folio_migrate_lru_refs.patch mm-mglru-move-max_seq-read-into-walk_update_folio.patch mm-mglru-use-explicit-tier-range-in-read_ctrl_pos.patch mm-mglru-fix-potential-generation-folio-number-leak.patch mm-huge_memory-count-only-swap-cache-refs-in-anon-folio-split.patch mm-huge_memory-drop-the-redundant-mapping-argument-of-__split_frozen_folio.patch