mm/swap: use swap_ops to register swap device's methods
Subsystems (3)
Baoquan He
reviewerv3 cover mm/swap: use swap_ops to register swap device's methods
This can simplify the code logic and benefit any new type of swap device added later.
And also do renaming in this patchset:
-------
file renaming:
---
mm/page_io.c to mm/swap_io.c
function renaming:
---
swap_writepage_* to swap_write_folio_* in file mm/swap_io.c
Changlog:
===
-v3:
* Rename setup_swap_ops() to init_swap_ops() which reflect the function behaviour a little better
* Check if sis->ops, sis->ops->read_folio and sis->ops->write_folio is NULL in init_swap_ops(), but not spread them where they are called. And once the checking failed, fail swapon immediately. This is suggested by Chris.
* Call init_swap_ops() before setup_swap_extents() invocation. This doesn't harm anything and can benefit later adding sis->ops->swap_activate method.
-v2:
* lots of cleanup for patch 2/3: renaming, moving data structures, and using const properly
* collected tags from Kairui, Nhat and Barry
-v1:
https://lore.kernel.org/linux-mm/[email protected]/
Baoquan He (3):
mm/swap: rename mm/page_io.c to mm/swap_io.c mm/swap: use swap_ops to register swap device's methods mm/swap_io.c: rename swap_writepage_* to swap_write_folio_*
MAINTAINERS | 2 +-
include/linux/swap.h | 2 +
mm/Makefile | 2 +-
mm/swap.h | 12 ++++-
mm/{page_io.c => swap_io.c} | 104 ++++++++++++++++++++----------------
mm/swapfile.c | 5 ++
mm/zswap.c | 2 +-
7 files changed, 79 insertions(+), 50 deletions(-)
rename mm/{page_io.c => swap_io.c} (90%)Signature · 1 line
2.52.0
Baoquan He
reviewerPATCH v3 1/3 mm/swap: rename mm/page_io.c to mm/swap_io.c
Codes in mm/page_io.c are only related to swap io, it has nothing to do with other page io.
Rename it to avoid confusion.
---
MAINTAINERS | 2 +-
mm/Makefile | 2 +-
mm/swap.h | 2 +-
mm/{page_io.c => swap_io.c} | 2 --
4 files changed, 3 insertions(+), 5 deletions(-)
rename mm/{page_io.c => swap_io.c} (99%)MAINTAINERS +1 -1
@@ -16948,7 +16948,7 @@ F: Documentation/mm/swap-table.rst F: include/linux/swap.h F: include/linux/swapfile.h F: include/linux/swapops.h -F: mm/page_io.c +F: mm/swap_io.c F: mm/swap.c F: mm/swap.h F: mm/swap_table.h
mm/Makefile +1 -1
@@ -75,7 +75,7 @@ ifdef CONFIG_MMU obj-$(CONFIG_ADVISE_SYSCALLS) += madvise.o endif -obj-$(CONFIG_SWAP) += page_io.o swap_state.o swapfile.o +obj-$(CONFIG_SWAP) += swap_io.o swap_state.o swapfile.o obj-$(CONFIG_ZSWAP) += zswap.o obj-$(CONFIG_HAS_DMA) += dmapool.o obj-$(CONFIG_HUGETLBFS) += hugetlb.o hugetlb_sysfs.o hugetlb_sysctl.o
mm/swap.h +1 -1
@@ -210,7 +210,7 @@ extern void swap_entries_free(struct swap_info_struct *si,struct swap_cluster_info *ci, unsigned long offset, unsigned int nr_pages); -/* linux/mm/page_io.c */ +/* linux/mm/swap_io.c */ int sio_pool_init (void );struct swap_iocb ;void swap_read_folio (struct folio *folio,struct swap_iocb **plug);
mm/swap_io.c renamed from mm/page_io.c +0 -2
@@ -1,7 +1,5 @@// SPDX-License-Identifier: GPL-2.0 /* -* linux/mm/page_io.c -* * Copyright (C) 1991, 1992, 1993, 1994 Linus Torvalds * * Swap reorganised 29.12.95,
Signature · 1 line
2.52.0
Re: [PATCH v3 1/3] mm/swap: rename mm/page_io.c to mm/swap_io.c
Quoted 10 lines · Baoquan He
Codes in
mm/page_io.care only related to swap io, it has nothing to do with other page io.Rename it to avoid confusion.
Reviewed-by Nhat Pham <[email protected]>Reviewed-by Barry Song <[email protected]>Acked-by Kairui Song <[email protected]>Signed-off-by Baoquan He <[email protected]>
Chris
Baoquan He
reviewerPATCH v3 2/3 mm/swap: use swap_ops to register swap device's methods
In reply to Baoquan HeThis simplifies codes and makes logic clearer. And also makes later any new swap device type being added easier to handle.
Currently there are three types of swap devices: bdev_fs, bdev_sync and bdev_async, and only operations read_folio and write_folio are included. In the future, there could be more swap device types added and more appropriate opeations adapted into swap_ops.
--- include/linux/swap.h | 2 + mm/swap.h | 10 ++++- mm/swap_io.c | 102 +++++++++++++++++++++++++------------------ mm/swapfile.c | 5 +++ mm/zswap.c | 2 +- 5 files changed, 76 insertions(+), 45 deletions(-)
include/linux/swap.h +2 -0
@@ -255,6 +255,7 @@ struct swap_sequential_cluster {unsigned int next[SWAP_NR_ORDERS ];/* Likely next allocation offset */ }; +struct swap_ops ;/* * The in-memory structure used to track swap areas. */
@@ -300,6 +301,7 @@ struct swap_info_struct {struct work_struct reclaim_work;/* reclaim worker */ struct list_head discard_clusters;/* discard clusters list */ struct plist_node avail_list;/* entry in swap_avail_head */ +const struct swap_ops *ops; };static inline swp_entry_t page_swap_entry (struct page *page)
mm/swap.h +9 -1
@@ -213,6 +213,15 @@ extern void swap_entries_free(struct swap_info_struct *si,/* linux/mm/swap_io.c */ int sio_pool_init (void );struct swap_iocb ; +struct swap_ops { +void (*read_folio)(struct swap_info_struct *sis, +struct folio *folio, +struct swap_iocb **plug); +void (*write_folio)(struct swap_info_struct *sis, +struct folio *folio, +struct swap_iocb **plug); +}; +int init_swap_ops (struct swap_info_struct *sis);void swap_read_folio (struct folio *folio,struct swap_iocb **plug);void __swap_read_unplug (struct swap_iocb *plug);static inline void swap_read_unplug (struct swap_iocb *plug)
@@ -222,7 +231,6 @@ static inline void swap_read_unplug(struct swap_iocb *plug) }void swap_write_unplug (struct swap_iocb *sio);int swap_writeout (struct folio *folio,struct swap_iocb **swap_plug); -void __swap_writepage (struct folio *folio,struct swap_iocb **swap_plug);/* linux/mm/swap_state.c */ extern struct address_space swap_space__read_mostly ;
mm/swap_io.c +59 -43
171 lines not on this page · raw message
mm/swapfile.c +5 -0
@@ -3413,6 +3413,11 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags) goto bad_swap_unlock_inode; } +if (init_swap_ops (si)) { + error = -EINVAL ; + goto bad_swap_unlock_inode; + } + si->max = maxpages; si->pages = maxpages -1 ; nr_extents =setup_swap_extents (si, &span);
mm/zswap.c +1 -1
@@ -1061,7 +1061,7 @@ static int zswap_writeback_entry(struct zswap_entry *entry,folio_set_reclaim (folio);/* start writeback */ -__swap_writepage (folio,NULL ); + si->ops->write_folio (si, folio,NULL ); out:if (ret && ret != -EEXIST ) {
Signature · 1 line
2.52.0
Quoted 7 lines · On Wed, 15 Apr 2026 16:56:57 +0800 Baoquan He <[email protected]> wrote:
This simplifies codes and makes logic clearer. And also makes later any new swap device type being added easier to handle.
Currently there are three types of swap devices:
bdev_fs,bdev_syncandbdev_async, and only operationsread_folioandwrite_folioare included. In the future, there could be more swap device types added and more appropriate opeations adapted intoswap_ops.
s/opeations/operations/
Quoted 215 lines
Suggested-by Chris Li <[email protected]>Co-developed-by Barry Song <[email protected]>Signed-off-by Barry Song <[email protected]>Signed-off-by Baoquan He <[email protected]>--- include/linux/swap.h | 2 + mm/swap.h | 10 ++++- mm/swap_io.c | 102 +++++++++++++++++++++++++------------------ mm/swapfile.c | 5 +++ mm/zswap.c | 2 +- 5 files changed, 76 insertions(+), 45 deletions(-)include/linux/swap.h +2
-0@@ -255,6 +255,7 @@ struct swap_sequential_cluster {unsigned int next[SWAP_NR_ORDERS ];/* Likely next allocation offset */ }; +struct swap_ops ;/* * The in-memory structure used to track swap areas. */ @@ -300,6 +301,7 @@ struct swap_info_struct {struct work_struct reclaim_work;/* reclaim worker */ struct list_head discard_clusters;/* discard clusters list */ struct plist_node avail_list;/* entry in swap_avail_head */ +const struct swap_ops *ops; };static inline swp_entry_t page_swap_entry (struct page *page)mm/swap.h +9
-1@@ -213,6 +213,15 @@ extern void swap_entries_free(struct swap_info_struct *si,/* linux/mm/swap_io.c */ int sio_pool_init (void );struct swap_iocb ; +struct swap_ops { +void (*read_folio)(struct swap_info_struct *sis, +struct folio *folio, +struct swap_iocb **plug); +void (*write_folio)(struct swap_info_struct *sis, +struct folio *folio, +struct swap_iocb **plug); +}; +int init_swap_ops (struct swap_info_struct *sis);void swap_read_folio (struct folio *folio,struct swap_iocb **plug);void __swap_read_unplug (struct swap_iocb *plug);static inline void swap_read_unplug (struct swap_iocb *plug)@@ -222,7 +231,6 @@ static inline void swap_read_unplug(struct swap_iocb *plug) }void swap_write_unplug (struct swap_iocb *sio);int swap_writeout (struct folio *folio,struct swap_iocb **swap_plug); -void __swap_writepage (struct folio *folio,struct swap_iocb **swap_plug);/* linux/mm/swap_state.c */ extern struct address_space swap_space__read_mostly ;mm/swap_io.c +44
-36@@ -238,6 +238,7 @@ static void swap_zeromap_folio_clear(struct folio *folio)int swap_writeout (struct folio *folio,struct swap_iocb **swap_plug) {int ret =0 ; +struct swap_info_struct *sis =__swap_entry_to_info (folio->swap);if (folio_free_swap (folio)) goto out_unlock;@@ -279,7 +280,7 @@ int swap_writeout(struct folio *folio, struct swap_iocb **swap_plug)return AOP_WRITEPAGE_ACTIVATE ; } -__swap_writepage (folio, swap_plug); + sis->ops->write_folio (sis, folio, swap_plug);return 0 ; out_unlock:folio_unlock (folio);@@ -369,10 +370,11 @@ static void sio_write_complete(struct kiocb *iocb, long ret)mempool_free (sio, sio_pool); } -static void swap_writepage_fs (struct folio *folio,struct swap_iocb **swap_plug) +static void swap_writepage_fs (struct swap_info_struct *sis, +struct folio *folio, +struct swap_iocb **swap_plug) {struct swap_iocb *sio = swap_plug ? *swap_plug :NULL ; -struct swap_info_struct *sis =__swap_entry_to_info (folio->swap);struct file *swap_file = sis->swap_file;loff_t pos =swap_dev_pos (folio->swap);@@ -405,8 +407,9 @@ static void swap_writepage_fs(struct folio *folio, struct swap_iocb **swap_plug) *swap_plug = sio; } -static void swap_writepage_bdev_sync (struct folio *folio, -struct swap_info_struct *sis) +static void swap_writepage_bdev_sync (struct swap_info_struct *sis, +struct folio *folio, +struct swap_iocb **plug) {struct bio_vec bv;struct bio bio;@@ -425,8 +428,9 @@ static void swap_writepage_bdev_sync(struct folio *folio,__end_swap_bio_write (&bio); } -static void swap_writepage_bdev_async (struct folio *folio, -struct swap_info_struct *sis) +static void swap_writepage_bdev_async (struct swap_info_struct *sis, +struct folio *folio, +struct swap_iocb **plug) {struct bio *bio;@@ -442,29 +446,6 @@ static void swap_writepage_bdev_async(struct folio *folio,submit_bio (bio); } -void __swap_writepage (struct folio *folio,struct swap_iocb **swap_plug) -{ -struct swap_info_struct *sis =__swap_entry_to_info (folio->swap); - -VM_BUG_ON_FOLIO (!folio_test_swapcache (folio), folio); -/* -* ->flags can be updated non-atomically (scan_swap_map_slots), -* but that will never affect SWP_FS_OPS, so the data_race -* is safe. -*/ -if (data_race (sis->flags &SWP_FS_OPS )) -swap_writepage_fs (folio, swap_plug); -/* -* ->flags can be updated non-atomically (scan_swap_map_slots), -* but that will never affect SWP_SYNCHRONOUS_IO, so the data_race -* is safe. -*/ -else if (data_race (sis->flags &SWP_SYNCHRONOUS_IO )) -swap_writepage_bdev_sync (folio, sis); -else -swap_writepage_bdev_async (folio, sis); -} -void swap_write_unplug (struct swap_iocb *sio) {struct iov_iter from;@@ -533,9 +514,10 @@ static bool swap_read_folio_zeromap(struct folio *folio)return true; } -static void swap_read_folio_fs (struct folio *folio,struct swap_iocb **plug) +static void swap_read_folio_fs (struct swap_info_struct *sis, +struct folio *folio, +struct swap_iocb **plug) { -struct swap_info_struct *sis =__swap_entry_to_info (folio->swap);struct swap_iocb *sio =NULL ;loff_t pos =swap_dev_pos (folio->swap);@@ -567,8 +549,9 @@ static void swap_read_folio_fs(struct folio *folio, struct swap_iocb **plug) *plug = sio; } -static void swap_read_folio_bdev_sync (struct folio *folio, -struct swap_info_struct *sis) +static void swap_read_folio_bdev_sync (struct swap_info_struct *sis, +struct folio *folio, +struct swap_iocb **plug) {struct bio_vec bv;struct bio bio;@@ -589,8 +572,9 @@ static void swap_read_folio_bdev_sync(struct folio *folio,put_task_struct (current); } -static void swap_read_folio_bdev_async (struct folio *folio, -struct swap_info_struct *sis) +static void swap_read_folio_bdev_async (struct swap_info_struct *sis, +struct folio *folio, +struct swap_iocb **plug) {struct bio *bio;@@ -604,6 +588,44 @@ static void swap_read_folio_bdev_async(struct folio *folio,submit_bio (bio); } +static const struct swap_ops bdev_fs_swap_ops = { + .read_folio = swap_read_folio_fs, + .write_folio = swap_writepage_fs, +}; + +static const struct swap_ops bdev_sync_swap_ops = { + .read_folio = swap_read_folio_bdev_sync, + .write_folio = swap_writepage_bdev_sync, +}; + +static const struct swap_ops bdev_async_swap_ops = { + .read_folio = swap_read_folio_bdev_async, + .write_folio = swap_writepage_bdev_async, +}; + +int init_swap_ops (struct swap_info_struct *sis) +{ +/* +* ->flags can be updated non-atomically, but that will +* never affect SWP_FS_OPS, so the data_race is safe. +*/ +if (data_race (sis->flags &SWP_FS_OPS )) + sis->ops = &bdev_fs_swap_ops; +/*
mm/swap_io.c static void swap_read_folio_bdev_async(struct folio *folio, · line 624
Quoted 10 lines
mm/swap_io.c +10
-0+* ->flags can be updated non-atomically, but that will +* never affect SWP_SYNCHRONOUS_IO, so the data_race is safe. +*/ + else if (data_race(sis->flags & SWP_SYNCHRONOUS_IO)) + sis->ops = &bdev_sync_swap_ops; + else + sis->ops = &bdev_async_swap_ops; + +if (sis->ops || sis->ops->read_folio || sis->ops->write_folio) +return -1 ;
sis->ops is always non-NULL, and you will return -1 here and swapon will always fail with -EINVAL.
You probably wanted?
if (!sis->ops || !sis->ops->read_folio || !sis->ops->write_folio)
return -1;Quoted 55 lines
mm/swap_io.c +5
-7+ +return 0 ; +} +void swap_read_folio (struct folio *folio,struct swap_iocb **plug) {struct swap_info_struct *sis =__swap_entry_to_info (folio->swap);@@ -638,13 +660,7 @@ void swap_read_folio(struct folio *folio, struct swap_iocb **plug)/* We have to read from slower devices. Increase zswap protection. */ zswap_folio_swapin (folio); -if (data_race (sis->flags &SWP_FS_OPS )) { -swap_read_folio_fs (folio, plug); - }else if (synchronous) { -swap_read_folio_bdev_sync (folio, sis); - }else { -swap_read_folio_bdev_async (folio, sis); - } + sis->ops->read_folio (sis, folio, plug); finish:if (workingset) {mm/swapfile.c +5
-0@@ -3413,6 +3413,11 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags) goto bad_swap_unlock_inode; } +if (init_swap_ops (si)) { + error = -EINVAL ; + goto bad_swap_unlock_inode; + } + si->max = maxpages; si->pages = maxpages -1 ; nr_extents =setup_swap_extents (si, &span);mm/zswap.c +1
-1@@ -1061,7 +1061,7 @@ static int zswap_writeback_entry(struct zswap_entry *entry,folio_set_reclaim (folio);/* start writeback */ -__swap_writepage (folio,NULL ); + si->ops->write_folio (si, folio,NULL ); out:if (ret && ret != -EEXIST ) {Signature · 1 line
2.52.0
Baoquan He
reviewerQuoted 11 lines · Usama Arif
Quoted 7 lines · On Wed, 15 Apr 2026 16:56:57 +0800 Baoquan He <[email protected]> wrote:
This simplifies codes and makes logic clearer. And also makes later any new swap device type being added easier to handle.
Currently there are three types of swap devices:
bdev_fs,bdev_syncandbdev_async, and only operationsread_folioandwrite_folioare included. In the future, there could be more swap device types added and more appropriate opeations adapted intoswap_ops.s/opeations/operations/
Good catch, thanks.
Quoted 14 lines
Quoted 14 lines
Suggested-by Chris Li <[email protected]>Co-developed-by Barry Song <[email protected]>Signed-off-by Barry Song <[email protected]>Signed-off-by Baoquan He <[email protected]>--- include/linux/swap.h | 2 + mm/swap.h | 10 ++++- mm/swap_io.c | 102 +++++++++++++++++++++++++------------------ mm/swapfile.c | 5 +++ mm/zswap.c | 2 +- 5 files changed, 76 insertions(+), 45 deletions(-)
...snip...
Quoted 4 lines
Quoted 4 lines
mm/swap_io.c +0
-0
...snip...
Quoted 42 lines
Quoted 28 lines
mm/swap_io.c +24
-0@@ -604,6 +588,44 @@ static void swap_read_folio_bdev_async(struct folio *folio,submit_bio (bio); } +static const struct swap_ops bdev_fs_swap_ops = { + .read_folio = swap_read_folio_fs, + .write_folio = swap_writepage_fs, +}; + +static const struct swap_ops bdev_sync_swap_ops = { + .read_folio = swap_read_folio_bdev_sync, + .write_folio = swap_writepage_bdev_sync, +}; + +static const struct swap_ops bdev_async_swap_ops = { + .read_folio = swap_read_folio_bdev_async, + .write_folio = swap_writepage_bdev_async, +}; + +int init_swap_ops (struct swap_info_struct *sis) +{ +/* +* ->flags can be updated non-atomically, but that will +* never affect SWP_FS_OPS, so the data_race is safe. +*/ +if (data_race (sis->flags &SWP_FS_OPS )) + sis->ops = &bdev_fs_swap_ops; +/* mm/swap_io.c static void swap_read_folio_bdev_async(struct folio *folio, · line 624
Quoted 10 lines
mm/swap_io.c +10
-0+* ->flags can be updated non-atomically, but that will +* never affect SWP_SYNCHRONOUS_IO, so the data_race is safe. +*/ + else if (data_race(sis->flags & SWP_SYNCHRONOUS_IO)) + sis->ops = &bdev_sync_swap_ops; + else + sis->ops = &bdev_async_swap_ops; + +if (sis->ops || sis->ops->read_folio || sis->ops->write_folio) +return -1 ;
sis->opsis always non-NULL, and you will return -1 here and swapon will always fail with-EINVAL.
Quoted 4 lines
You probably wanted?
if (!sis->ops || !sis->ops->read_folio || !sis->ops->write_folio) return -1;
You are right. Think one thing, write another. Will fix it in v4. Thanks a lot for your careful reviewing.
Quoted 8 lines
Quoted 8 lines
mm/swap_io.c +4
-0+ +return 0 ; +} +void swap_read_folio (struct folio *folio,struct swap_iocb **plug) {struct swap_info_struct *sis =__swap_entry_to_info (folio->swap);
Baoquan He
reviewerPATCH v3 3/3 mm/swap_io.c: rename swap_writepage_* to swap_write_folio_*
In reply to Baoquan HeAll these swap_writepage_* functions are hanlding passed in folio, but not page. And this renaming make them consistent with the their counterpart swap_read_folio_* functions.
--- mm/swap_io.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
mm/swap_io.c +6 -6
@@ -370,7 +370,7 @@ static void sio_write_complete(struct kiocb *iocb, long ret)mempool_free (sio, sio_pool); } -static void swap_writepage_fs (struct swap_info_struct *sis, +static void swap_write_folio_fs (struct swap_info_struct *sis,struct folio *folio,struct swap_iocb **swap_plug) {
@@ -407,7 +407,7 @@ static void swap_writepage_fs(struct swap_info_struct *sis, *swap_plug = sio; } -static void swap_writepage_bdev_sync (struct swap_info_struct *sis, +static void swap_write_folio_bdev_sync (struct swap_info_struct *sis,struct folio *folio,struct swap_iocb **plug) {
@@ -428,7 +428,7 @@ static void swap_writepage_bdev_sync(struct swap_info_struct *sis,__end_swap_bio_write (&bio); } -static void swap_writepage_bdev_async (struct swap_info_struct *sis, +static void swap_write_folio_bdev_async (struct swap_info_struct *sis,struct folio *folio,struct swap_iocb **plug) {
@@ -590,17 +590,17 @@ static void swap_read_folio_bdev_async(struct swap_info_struct *sis,static const struct swap_ops bdev_fs_swap_ops = { .read_folio = swap_read_folio_fs, - .write_folio = swap_writepage_fs, + .write_folio = swap_write_folio_fs, };static const struct swap_ops bdev_sync_swap_ops = { .read_folio = swap_read_folio_bdev_sync, - .write_folio = swap_writepage_bdev_sync, + .write_folio = swap_write_folio_bdev_sync, };static const struct swap_ops bdev_async_swap_ops = { .read_folio = swap_read_folio_bdev_async, - .write_folio = swap_writepage_bdev_async, + .write_folio = swap_write_folio_bdev_async, };int init_swap_ops (struct swap_info_struct *sis)
Signature · 1 line
2.52.0
Re: [PATCH v3 3/3] mm/swap_io.c: rename swap_writepage_* to swap_write_folio_*
Quoted 8 lines · Baoquan He
All these swap_writepage_* functions are hanlding passed in folio, but not page. And this renaming make them consistent with the their counterpart swap_read_folio_* functions.
Reviewed-by Barry Song <[email protected]>Reviewed-by Nhat Pham <[email protected]>Signed-off-by Baoquan He <[email protected]>
Chris