Skip to contentSkip to conversation

mm-swap-cleanup-swap-cache-api-and-add-kerneldoc.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message Sep 21, 2025

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: mm, swap: cleanup swap cache API and add kerneldoc
has been removed from the -mm tree. Its filename was
mm-swap-cleanup-swap-cache-api-and-add-kerneldoc.patch

This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: Kairui Song <[email protected]>
Subject: mm, swap: cleanup swap cache API and add kerneldoc
Date: Wed, 17 Sep 2025 00:00:53 +0800

In preparation for replacing the swap cache backend with the swap table, clean up and add proper kernel doc for all swap cache APIs. Now all swap cache APIs are well-defined with consistent names.

No feature change, only renaming and documenting.

---

 mm/filemap.c        |    2 
 mm/memory-failure.c |    2 
 mm/memory.c         |    2 
 mm/shmem.c          |   10 ++--
 mm/swap.h           |   48 +++++++++++++----------
 mm/swap_state.c     |   86 ++++++++++++++++++++++++++++++------------
 mm/swapfile.c       |    8 +--
 mm/vmscan.c         |    2 
 mm/zswap.c          |    2 
 9 files changed, 103 insertions(+), 59 deletions(-)
mm/filemap.c renamed from mm/filemap.c~mm-swap-cleanup-swap-cache-api-and-add-kerneldoc +1 -1
@@ -4525,7 +4525,7 @@ static void filemap_cachestat(struct add
 				 * invalidation, so there might not be
 				 * a shadow in the swapcache (yet).
 				 */
-				shadow = get_shadow_from_swap_cache(swp);
+				shadow = swap_cache_get_shadow(swp);
 				if (!shadow)
 					goto resched;
 			}
mm/memory.c renamed from mm/memory.c~mm-swap-cleanup-swap-cache-api-and-add-kerneldoc +1 -1
@@ -4699,7 +4699,7 @@ vm_fault_t do_swap_page(struct vm_fault
 
 				memcg1_swapin(entry, nr_pages);
 
-				shadow = get_shadow_from_swap_cache(entry);
+				shadow = swap_cache_get_shadow(entry);
 				if (shadow)
 					workingset_refault(folio, shadow);
 
mm/memory-failure.c renamed from mm/memory-failure.c~mm-swap-cleanup-swap-cache-api-and-add-kerneldoc +1 -1
@@ -1127,7 +1127,7 @@ static int me_swapcache_clean(struct pag
 	struct folio *folio = page_folio(p);
 	int ret;
 
-	delete_from_swap_cache(folio);
+	swap_cache_del_folio(folio);
 
 	ret = delete_from_lru_cache(folio) ? MF_FAILED : MF_RECOVERED;
 	folio_unlock(folio);
mm/shmem.c renamed from mm/shmem.c~mm-swap-cleanup-swap-cache-api-and-add-kerneldoc +5 -5
@@ -1661,13 +1661,13 @@ try_split:
 		}
 
 		/*
-		 * The delete_from_swap_cache() below could be left for
+		 * The swap_cache_del_folio() below could be left for
 		 * shrink_folio_list()'s folio_free_swap() to dispose of;
 		 * but I'm a little nervous about letting this folio out of
 		 * shmem_writeout() in a hybrid half-tmpfs-half-swap state
 		 * e.g. folio_mapping(folio) might give an unexpected answer.
 		 */
-		delete_from_swap_cache(folio);
+		swap_cache_del_folio(folio);
 		goto redirty;
 	}
 	if (nr_pages > 1)
@@ -2045,7 +2045,7 @@ retry:
 	new->swap = entry;
 
 	memcg1_swapin(entry, nr_pages);
-	shadow = get_shadow_from_swap_cache(entry);
+	shadow = swap_cache_get_shadow(entry);
 	if (shadow)
 		workingset_refault(new, shadow);
 	folio_add_lru(new);
@@ -2183,7 +2183,7 @@ static void shmem_set_folio_swapin_error
 	nr_pages = folio_nr_pages(folio);
 	folio_wait_writeback(folio);
 	if (!skip_swapcache)
-		delete_from_swap_cache(folio);
+		swap_cache_del_folio(folio);
 	/*
 	 * Don't treat swapin error folio as alloced. Otherwise inode->i_blocks
 	 * won't be 0 when inode is released and thus trigger WARN_ON(i_blocks)
@@ -2422,7 +2422,7 @@ static int shmem_swapin_folio(struct ino
 		folio->swap.val = 0;
 		swapcache_clear(si, swap, nr_pages);
 	} else {
-		delete_from_swap_cache(folio);
+		swap_cache_del_folio(folio);
 	}
 	folio_mark_dirty(folio);
 	swap_free_nr(swap, nr_pages);
mm/swapfile.c renamed from mm/swapfile.c~mm-swap-cleanup-swap-cache-api-and-add-kerneldoc +4 -4
@@ -267,7 +267,7 @@ again:
 	if (!need_reclaim)
 		goto out_unlock;
 
-	delete_from_swap_cache(folio);
+	swap_cache_del_folio(folio);
 	folio_set_dirty(folio);
 	ret = nr_pages;
 out_unlock:
@@ -1124,7 +1124,7 @@ static void swap_range_free(struct swap_
 			swap_slot_free_notify(si->bdev, offset);
 		offset++;
 	}
-	clear_shadow_from_swap_cache(si->type, begin, end);
+	swap_cache_clear_shadow(si->type, begin, end);
 
 	/*
 	 * Make sure that try_to_unuse() observes si->inuse_pages reaching 0
@@ -1289,7 +1289,7 @@ int folio_alloc_swap(struct folio *folio
 	 * TODO: this could cause a theoretical memory reclaim
 	 * deadlock in the swap out path.
 	 */
-	if (add_to_swap_cache(folio, entry, gfp | __GFP_NOMEMALLOC, NULL))
+	if (swap_cache_add_folio(folio, entry, gfp | __GFP_NOMEMALLOC, NULL))
 		goto out_free;
 
 	return 0;
@@ -1759,7 +1759,7 @@ bool folio_free_swap(struct folio *folio
 	if (folio_swapped(folio))
 		return false;
 
-	delete_from_swap_cache(folio);
+	swap_cache_del_folio(folio);
 	folio_set_dirty(folio);
 	return true;
 }
mm/swap.h renamed from mm/swap.h~mm-swap-cleanup-swap-cache-api-and-add-kerneldoc +27 -21

72 lines not on this page · raw message

mm/swap_state.c renamed from mm/swap_state.c~mm-swap-cleanup-swap-cache-api-and-add-kerneldoc +62 -24

142 lines not on this page · raw message

mm/vmscan.c renamed from mm/vmscan.c~mm-swap-cleanup-swap-cache-api-and-add-kerneldoc +1 -1
@@ -776,7 +776,7 @@ static int __remove_mapping(struct addre
 
 		if (reclaimed && !mapping_exiting(mapping))
 			shadow = workingset_eviction(folio, target_memcg);
-		__delete_from_swap_cache(folio, swap, shadow);
+		__swap_cache_del_folio(folio, swap, shadow);
 		memcg1_swapout(folio, swap);
 		xa_unlock_irq(&mapping->i_pages);
 		put_swap_folio(folio, swap);
mm/zswap.c renamed from mm/zswap.c~mm-swap-cleanup-swap-cache-api-and-add-kerneldoc +1 -1
@@ -1069,7 +1069,7 @@ static int zswap_writeback_entry(struct
 
 out:
 	if (ret && ret != -EEXIST) {
-		delete_from_swap_cache(folio);
+		swap_cache_del_folio(folio);
 		folio_unlock(folio);
 	}
 	folio_put(folio);

_

Patches currently in -mm which might be from [email protected] are