Unverified Commit 84798514 authored by Matthew Wilcox (Oracle)'s avatar Matthew Wilcox (Oracle) Committed by Christian Brauner
Browse files

mm: Remove swap_writepage() and shmem_writepage() 



Call swap_writeout() and shmem_writeout() from pageout() instead.

Signed-off-by: default avatar"Matthew Wilcox (Oracle)" <willy@infradead.org>
Link: https://lore.kernel.org/r/20250402150005.2309458-9-willy@infradead.org


Tested-by: default avatarBaolin Wang <baolin.wang@linux.alibaba.com>
Reviewed-by: default avatarBaolin Wang <baolin.wang@linux.alibaba.com>
Signed-off-by: default avatarChristian Brauner <brauner@kernel.org>
parent fe75adff

block/blk-wbt.c

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 
enum wbt_flags {

	WBT_TRACKED		= 1,	/* write, tracked for throttling */

	WBT_READ		= 2,	/* read */

	WBT_SWAP		= 4,	/* write, from swap_writepage() */

	WBT_SWAP		= 4,	/* write, from swap_writeout() */

	WBT_DISCARD		= 8,	/* discard */



	WBT_NR_BITS		= 4,	/* number of bits */

mm/page_io.c

+1 −2
Original line number Diff line number Diff line
@@ -237,9 +237,8 @@ static void swap_zeromap_folio_clear(struct folio *folio) 
 * We may have stale swap cache pages in memory: notice

 * them here and get rid of the unnecessary final write.

 */

int swap_writepage(struct page *page, struct writeback_control *wbc)

int swap_writeout(struct folio *folio, struct writeback_control *wbc)

{

	struct folio *folio = page_folio(page);

	int ret;



	if (folio_free_swap(folio)) {

mm/shmem.c

+5 −18
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ static struct vfsmount *shm_mnt __ro_after_init; 
#define SHORT_SYMLINK_LEN 128



/*

 * shmem_fallocate communicates with shmem_fault or shmem_writepage via

 * shmem_fallocate communicates with shmem_fault or shmem_writeout via

 * inode->i_private (with i_rwsem making sure that it has only one user at

 * a time): we would prefer not to enlarge the shmem inode just for that.

 */
@@ -107,7 +107,7 @@ struct shmem_falloc { 
	pgoff_t start;		/* start of range currently being fallocated */

	pgoff_t next;		/* the next page offset to be fallocated */

	pgoff_t nr_falloced;	/* how many new pages have been fallocated */

	pgoff_t nr_unswapped;	/* how often writepage refused to swap out */

	pgoff_t nr_unswapped;	/* how often writeout refused to swap out */

};



struct shmem_options {
@@ -446,7 +446,7 @@ static void shmem_recalc_inode(struct inode *inode, long alloced, long swapped) 
	/*

	 * Special case: whereas normally shmem_recalc_inode() is called

	 * after i_mapping->nrpages has already been adjusted (up or down),

	 * shmem_writepage() has to raise swapped before nrpages is lowered -

	 * shmem_writeout() has to raise swapped before nrpages is lowered -

	 * to stop a racing shmem_recalc_inode() from thinking that a page has

	 * been freed.  Compensate here, to avoid the need for a followup call.

	 */
@@ -1536,11 +1536,6 @@ int shmem_unuse(unsigned int type) 
	return error;

}



static int shmem_writepage(struct page *page, struct writeback_control *wbc)

{

	return shmem_writeout(page_folio(page), wbc);

}



/**

 * shmem_writeout - Write the folio to swap

 * @folio: The folio to write
@@ -1558,13 +1553,6 @@ int shmem_writeout(struct folio *folio, struct writeback_control *wbc) 
	int nr_pages;

	bool split = false;



	/*

	 * Our capabilities prevent regular writeback or sync from ever calling

	 * shmem_writepage; but a stacking filesystem might use ->writepage of

	 * its underlying filesystem, in which case tmpfs should write out to

	 * swap only in response to memory pressure, and not for the writeback

	 * threads or sync.

	 */

	if (WARN_ON_ONCE(!wbc->for_reclaim))

		goto redirty;
@@ -1653,7 +1641,7 @@ int shmem_writeout(struct folio *folio, struct writeback_control *wbc) 


		mutex_unlock(&shmem_swaplist_mutex);

		BUG_ON(folio_mapped(folio));

		return swap_writepage(&folio->page, wbc);

		return swap_writeout(folio, wbc);

	}



	list_del_init(&info->swaplist);
@@ -3776,7 +3764,7 @@ static long shmem_fallocate(struct file *file, int mode, loff_t offset, 
			index--;



		/*

		 * Inform shmem_writepage() how far we have reached.

		 * Inform shmem_writeout() how far we have reached.

		 * No need for lock or barrier: we have the page lock.

		 */

		if (!folio_test_uptodate(folio))
@@ -5199,7 +5187,6 @@ static int shmem_error_remove_folio(struct address_space *mapping, 
}



static const struct address_space_operations shmem_aops = {

	.writepage	= shmem_writepage,

	.dirty_folio	= noop_dirty_folio,

#ifdef CONFIG_TMPFS

	.write_begin	= shmem_write_begin,

mm/swap.h

+2 −2
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ static inline void swap_read_unplug(struct swap_iocb *plug) 
		__swap_read_unplug(plug);

}

void swap_write_unplug(struct swap_iocb *sio);

int swap_writepage(struct page *page, struct writeback_control *wbc);

int swap_writeout(struct folio *folio, struct writeback_control *wbc);

void __swap_writepage(struct folio *folio, struct writeback_control *wbc);



/* linux/mm/swap_state.c */
@@ -141,7 +141,7 @@ static inline struct folio *swapin_readahead(swp_entry_t swp, gfp_t gfp_mask, 
	return NULL;

}



static inline int swap_writepage(struct page *p, struct writeback_control *wbc)

static inline int swap_writeout(struct folio *f, struct writeback_control *wbc)

{

	return 0;

}

mm/swap_state.c

+0 −1
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ 
 * vmscan's shrink_folio_list.

 */

static const struct address_space_operations swap_aops = {

	.writepage	= swap_writepage,

	.dirty_folio	= noop_dirty_folio,

#ifdef CONFIG_MIGRATION

	.migrate_folio	= migrate_folio,