Commit 44b1b073 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Andrew Morton
Browse files

mm: stop passing a writeback_control structure to shmem_writeout 

shmem_writeout only needs the swap_iocb cookie and the split folio list. 
Pass those explicitly and remove the now unused list member from struct
writeback_control.

Link: https://lkml.kernel.org/r/20250610054959.2057526-3-hch@lst.de


Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Cc: Baolin Wang <baolin.wang@linux.alibaba.com>
Cc: Chengming Zhou <chengming.zhou@linux.dev>
Cc: Hugh Dickins <hughd@google.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: Nhat Pham <nphamcs@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 86c4a946

drivers/gpu/drm/i915/gem/i915_gem_shmem.c

+1 −1
Original line number Diff line number Diff line
@@ -317,7 +317,7 @@ void __shmem_writeback(size_t size, struct address_space *mapping) 
		if (folio_mapped(folio))

			folio_redirty_for_writepage(&wbc, folio);

		else

			error = shmem_writeout(folio, &wbc);

			error = shmem_writeout(folio, NULL, NULL);

	}

}

drivers/gpu/drm/ttm/ttm_backup.c

+1 −8
Original line number Diff line number Diff line
@@ -112,15 +112,8 @@ ttm_backup_backup_page(struct file *backup, struct page *page, 


	if (writeback && !folio_mapped(to_folio) &&

	    folio_clear_dirty_for_io(to_folio)) {

		struct writeback_control wbc = {

			.sync_mode = WB_SYNC_NONE,

			.nr_to_write = SWAP_CLUSTER_MAX,

			.range_start = 0,

			.range_end = LLONG_MAX,

			.for_reclaim = 1,

		};

		folio_set_reclaim(to_folio);

		ret = shmem_writeout(to_folio, &wbc);

		ret = shmem_writeout(to_folio, NULL, NULL);

		if (!folio_test_writeback(to_folio))

			folio_clear_reclaim(to_folio);

		/*

include/linux/shmem_fs.h

+4 −1
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ 
#include <linux/fs_parser.h>

#include <linux/userfaultfd_k.h>



struct swap_iocb;



/* inode in-kernel data */



#ifdef CONFIG_TMPFS_QUOTA
@@ -107,7 +109,8 @@ static inline bool shmem_mapping(struct address_space *mapping) 
void shmem_unlock_mapping(struct address_space *mapping);

struct page *shmem_read_mapping_page_gfp(struct address_space *mapping,

					pgoff_t index, gfp_t gfp_mask);

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

int shmem_writeout(struct folio *folio, struct swap_iocb **plug,

		struct list_head *folio_list);

void shmem_truncate_range(struct inode *inode, loff_t start, loff_t end);

int shmem_unuse(unsigned int type);

include/linux/writeback.h

+0 −3
Original line number Diff line number Diff line
@@ -79,9 +79,6 @@ struct writeback_control { 
	 */

	struct swap_iocb **swap_plug;



	/* Target list for splitting a large folio */

	struct list_head *list;



	/* internal fields used by the ->writepages implementation: */

	struct folio_batch fbatch;

	pgoff_t index;

mm/shmem.c

+15 −11
Original line number Diff line number Diff line
@@ -1540,11 +1540,13 @@ int shmem_unuse(unsigned int type) 
/**

 * shmem_writeout - Write the folio to swap

 * @folio: The folio to write

 * @wbc: How writeback is to be done

 * @plug: swap plug

 * @folio_list: list to put back folios on split

 *

 * Move the folio from the page cache to the swap cache.

 */

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

int shmem_writeout(struct folio *folio, struct swap_iocb **plug,

		struct list_head *folio_list)

{

	struct address_space *mapping = folio->mapping;

	struct inode *inode = mapping->host;
@@ -1554,9 +1556,6 @@ int shmem_writeout(struct folio *folio, struct writeback_control *wbc) 
	int nr_pages;

	bool split = false;



	if (WARN_ON_ONCE(!wbc->for_reclaim))

		goto redirty;



	if ((info->flags & VM_LOCKED) || sbinfo->noswap)

		goto redirty;
@@ -1583,7 +1582,7 @@ int shmem_writeout(struct folio *folio, struct writeback_control *wbc) 
try_split:

		/* Ensure the subpages are still dirty */

		folio_test_set_dirty(folio);

		if (split_folio_to_list(folio, wbc->list))

		if (split_folio_to_list(folio, folio_list))

			goto redirty;

		folio_clear_dirty(folio);

	}
@@ -1636,13 +1635,21 @@ int shmem_writeout(struct folio *folio, struct writeback_control *wbc) 
		list_add(&info->swaplist, &shmem_swaplist);



	if (!folio_alloc_swap(folio, __GFP_HIGH | __GFP_NOMEMALLOC | __GFP_NOWARN)) {

		struct writeback_control wbc = {

			.sync_mode	= WB_SYNC_NONE,

			.nr_to_write	= SWAP_CLUSTER_MAX,

			.range_start	= 0,

			.range_end	= LLONG_MAX,

			.for_reclaim	= 1,

			.swap_plug	= plug,

		};

		shmem_recalc_inode(inode, 0, nr_pages);

		swap_shmem_alloc(folio->swap, nr_pages);

		shmem_delete_from_page_cache(folio, swp_to_radix_entry(folio->swap));



		mutex_unlock(&shmem_swaplist_mutex);

		BUG_ON(folio_mapped(folio));

		return swap_writeout(folio, wbc);

		return swap_writeout(folio, &wbc);

	}

	if (!info->swapped)

		list_del_init(&info->swaplist);
@@ -1651,10 +1658,7 @@ int shmem_writeout(struct folio *folio, struct writeback_control *wbc) 
		goto try_split;

redirty:

	folio_mark_dirty(folio);

	if (wbc->for_reclaim)

	return AOP_WRITEPAGE_ACTIVATE;	/* Return with folio locked */

	folio_unlock(folio);

	return 0;

}

EXPORT_SYMBOL_GPL(shmem_writeout);