Commit 06340b92 authored by Fan Ni's avatar Fan Ni Committed by Andrew Morton
Browse files

mm: convert free_page_and_swap_cache() to free_folio_and_swap_cache() 

free_page_and_swap_cache() takes a struct page pointer as input parameter,
but it will immediately convert it to folio and all operations following
within use folio instead of page.  It makes more sense to pass in folio
directly.

Convert free_page_and_swap_cache() to free_folio_and_swap_cache() to
consume folio directly.

Link: https://lkml.kernel.org/r/20250416201720.41678-1-nifan.cxl@gmail.com


Signed-off-by: default avatarFan Ni <fan.ni@samsung.com>
Acked-by: default avatarDavidlohr Bueso <dave@stgolabs.net>
Acked-by: default avatarDavid Hildenbrand <david@redhat.com>
Reviewed-by: default avatarZi Yan <ziy@nvidia.com>
Reviewed-by: default avatarVishal Moola (Oracle) <vishal.moola@gmail.com>
Reviewed-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Cc: Adam Manzanares <a.manzanares@samsung.com>
Cc: "Aneesh Kumar K.V" <aneesh.kumar@kernel.org>
Cc: Heiko Carstens <hca@linux.ibm.com>
Cc: Luis Chamberalin <mcgrof@kernel.org>
Cc: Vasily Gorbik <gor@linux.ibm.com>
Cc: Will Deacon <will@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 4f219913

arch/s390/include/asm/tlb.h

+2 −2
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ static inline bool __tlb_remove_folio_pages(struct mmu_gather *tlb, 
/*

 * Release the page cache reference for a pte removed by

 * tlb_ptep_clear_flush. In both flush modes the tlb for a page cache page

 * has already been freed, so just do free_page_and_swap_cache.

 * has already been freed, so just do free_folio_and_swap_cache.

 *

 * s390 doesn't delay rmap removal.

 */
@@ -49,7 +49,7 @@ static inline bool __tlb_remove_page_size(struct mmu_gather *tlb, 
{

	VM_WARN_ON_ONCE(delay_rmap);



	free_page_and_swap_cache(page);

	free_folio_and_swap_cache(page_folio(page));

	return false;

}

include/linux/swap.h

+3 −5
Original line number Diff line number Diff line
@@ -450,7 +450,7 @@ static inline unsigned long total_swapcache_pages(void) 
}



void free_swap_cache(struct folio *folio);

void free_page_and_swap_cache(struct page *);

void free_folio_and_swap_cache(struct folio *folio);

void free_pages_and_swap_cache(struct encoded_page **, int);

/* linux/mm/swapfile.c */

extern atomic_long_t nr_swap_pages;
@@ -520,10 +520,8 @@ static inline void put_swap_device(struct swap_info_struct *si) 


#define si_swapinfo(val) \

	do { (val)->freeswap = (val)->totalswap = 0; } while (0)

/* only sparc can not include linux/pagemap.h in this file

 * so leave put_page and release_pages undeclared... */

#define free_page_and_swap_cache(page) \

	put_page(page)

#define free_folio_and_swap_cache(folio) \

	folio_put(folio)

#define free_pages_and_swap_cache(pages, nr) \

	release_pages((pages), (nr));

mm/huge_memory.c

+1 −1
Original line number Diff line number Diff line
@@ -3653,7 +3653,7 @@ static int __split_unmapped_folio(struct folio *folio, int new_order, 
		 * requires taking the lru_lock so we do the put_page

		 * of the tail pages after the split is complete.

		 */

		free_page_and_swap_cache(&new_folio->page);

		free_folio_and_swap_cache(new_folio);

	}

	return ret;

}

mm/khugepaged.c

+1 −1
Original line number Diff line number Diff line
@@ -746,7 +746,7 @@ static void __collapse_huge_page_copy_succeeded(pte_t *pte, 
			ptep_clear(vma->vm_mm, address, _pte);

			folio_remove_rmap_pte(src, src_page, vma);

			spin_unlock(ptl);

			free_page_and_swap_cache(src_page);

			free_folio_and_swap_cache(src);

		}

	}

mm/swap_state.c

+3 −5
Original line number Diff line number Diff line
@@ -232,13 +232,11 @@ void free_swap_cache(struct folio *folio) 
}



/*

 * Perform a free_page(), also freeing any swap cache associated with

 * this page if it is the last user of the page.

 * Freeing a folio and also freeing any swap cache associated with

 * this folio if it is the last user.

 */

void free_page_and_swap_cache(struct page *page)

void free_folio_and_swap_cache(struct folio *folio)

{

	struct folio *folio = page_folio(page);



	free_swap_cache(folio);

	if (!is_huge_zero_folio(folio))

		folio_put(folio);