mm-remove-the-implementation-of-swap_free-and-always-use-swap_free_nr.patch removed from -mm tree
The quilt patch titled
Subject: mm: remove the implementation of swap_free() and always use swap_free_nr()
has been removed from the -mm tree. Its filename was
mm-remove-the-implementation-of-swap_free-and-always-use-swap_free_nr.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: Barry Song <[email protected]>
Subject: mm: remove the implementation of swap_free() and always use swap_free_nr()
Date: Wed, 29 May 2024 20:28:20 +1200
To streamline maintenance efforts, we propose removing the implementation of swap_free(). Instead, we can simply invoke swap_free_nr() with nr set to 1. swap_free_nr() is designed with a bitmap consisting of only one long, resulting in overhead that can be ignored for cases where nr equals 1.
A prime candidate for leveraging swap_free_nr() lies within kernel/power/swap.c. Implementing this change facilitates the adoption of batch processing for hibernation.
---
include/linux/swap.h | 10 +++++----- kernel/power/swap.c | 5 ++--- mm/swapfile.c | 17 ++++------------- 3 files changed, 11 insertions(+), 21 deletions(-)
include/linux/swap.h renamed from include/linux/swap.h~mm-remove-the-implementation-of-swap_free-and-always-use-swap_free_nr +5 -5
@@ -477,7 +477,6 @@ extern int add_swap_count_continuation(sextern void swap_shmem_alloc (swp_entry_t );extern int swap_duplicate (swp_entry_t );extern int swapcache_prepare (swp_entry_t ); -extern void swap_free (swp_entry_t );extern void swap_free_nr (swp_entry_t entry,int nr_pages);extern void swapcache_free_entries (swp_entry_t *entries,int n);extern void free_swap_and_cache_nr (swp_entry_t entry,int nr);
@@ -556,10 +555,6 @@ static inline int swapcache_prepare(swp_return 0 ; } -static inline void swap_free (swp_entry_t swp) -{ -} -static inline void swap_free_nr (swp_entry_t entry,int nr_pages) { }
@@ -608,6 +603,11 @@ static inline void free_swap_and_cache(sfree_swap_and_cache_nr (entry,1 ); } +static inline void swap_free (swp_entry_t entry) +{ +swap_free_nr (entry,1 ); +} +#ifdef CONFIG_MEMCG static inline int mem_cgroup_swappiness (struct mem_cgroup *memcg) {
kernel/power/swap.c renamed from kernel/power/swap.c~mm-remove-the-implementation-of-swap_free-and-always-use-swap_free_nr +2 -3
@@ -200,12 +200,11 @@ void free_all_swap_pages(int swap)while ((node = swsusp_extents.rb_node)) {struct swsusp_extent *ext; -unsigned long offset; ext = rb_entry(node, struct swsusp_extent, node);rb_erase (node, &swsusp_extents); -for (offset = ext->start; offset <= ext->end; offset++) -swap_free (swp_entry (swap, offset)); +swap_free_nr (swp_entry (swap, ext->start), + ext->end - ext->start +1 );kfree (ext); }
mm/swapfile.c renamed from mm/swapfile.c~mm-remove-the-implementation-of-swap_free-and-always-use-swap_free_nr +4 -13
@@ -1343,19 +1343,6 @@ static void swap_entry_free(struct swap_swap_range_free (p, offset,1 ); } -/* -* Caller has made sure that the swap device corresponding to entry -* is still around or has not been recycled. -*/ -void swap_free (swp_entry_t entry) -{ -struct swap_info_struct *p; - - p =_swap_info_get (entry); -if (p) -__swap_entry_free (p, entry); -} -static void cluster_swap_free_nr (struct swap_info_struct *sis,unsigned long offset,int nr_pages) {
@@ -1385,6 +1372,10 @@ static void cluster_swap_free_nr(structunlock_cluster_or_swap_info (sis, ci); } +/* +* Caller has made sure that the swap device corresponding to entry +* is still around or has not been recycled. +*/ void swap_free_nr (swp_entry_t entry,int nr_pages) {int nr;
_
Patches currently in -mm which might be from [email protected] are
mm-extend-rmap-flags-arguments-for-folio_add_new_anon_rmap.patch mm-extend-rmap-flags-arguments-for-folio_add_new_anon_rmap-fix-2.patch mm-extend-rmap-flags-arguments-for-folio_add_new_anon_rmap-fix-3.patch mm-use-folio_add_new_anon_rmap-if-folio_test_anonfolio==false.patch mm-use-folio_add_new_anon_rmap-if-folio_test_anonfolio==false-fix-2.patch mm-remove-folio_test_anonfolio==false-path-in-__folio_add_anon_rmap.patch tools-mm-introduce-a-tool-to-assess-swap-entry-allocation-for-thp_swapout.patch