mm-factor-out-a-swap_readpage_bdev-helper.patch removed from -mm tree
The quilt patch titled
Subject: mm: factor out a swap_readpage_bdev helper
has been removed from the -mm tree. Its filename was
mm-factor-out-a-swap_readpage_bdev-helper.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: Christoph Hellwig <[email protected]>
Subject: mm: factor out a swap_readpage_bdev helper
Date: Wed, 25 Jan 2023 14:34:32 +0100
Split the block device case from swap_readpage into a separate helper, following the abstraction for file based swap and frontswap.
Signed-off-by Christoph Hellwig <[email protected]>
Reviewed-by Dan Williams <[email protected]>
Cc Dave Jiang <[email protected]>
Cc Ira Weiny <[email protected]>
Cc Jens Axboe <[email protected]>
Cc Keith Busch <[email protected]>
Cc Minchan Kim <[email protected]>
Cc Sergey Senozhatsky <[email protected]>
Cc Vishal Verma <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
mm/page_io.c renamed from mm/page_io.c~mm-factor-out-a-swap_readpage_bdev-helper +35 -33
@@ -444,44 +444,15 @@ static void swap_readpage_fs(struct page *plug = sio; } -void swap_readpage (struct page *page,bool synchronous,struct swap_iocb **plug) +static void swap_readpage_bdev (struct page *page,bool synchronous, +struct swap_info_struct *sis) {struct bio *bio; -struct swap_info_struct *sis =page_swap_info (page); -bool workingset =PageWorkingset (page); -unsigned long pflags; -bool in_thrashing; - -VM_BUG_ON_PAGE (!PageSwapCache (page) && !synchronous, page); -VM_BUG_ON_PAGE (!PageLocked (page), page); -VM_BUG_ON_PAGE (PageUptodate (page), page); - -/* -* Count submission time as memory stall and delay. When the device -* is congested, or the submitting cgroup IO-throttled, submission -* can be a significant part of overall IO time. -*/ -if (workingset) { -delayacct_thrashing_start (&in_thrashing); -psi_memstall_enter (&pflags); - } -delayacct_swapin_start (); - -if (frontswap_load (page) ==0 ) { -SetPageUptodate (page); -unlock_page (page); - goto out; - } - -if (data_race (sis->flags &SWP_FS_OPS )) { -swap_readpage_fs (page, plug); - goto out; - }if ((sis->flags &SWP_SYNCHRONOUS_IO ) && !bdev_read_page (sis->bdev,swap_page_sector (page), page)) {count_vm_event (PSWPIN ); - goto out; +return ; } bio =bio_alloc (sis->bdev,1 ,REQ_OP_READ ,GFP_KERNEL );
@@ -508,8 +479,39 @@ void swap_readpage(struct page *page, bo }__set_current_state (TASK_RUNNING );bio_put (bio); +} + +void swap_readpage (struct page *page,bool synchronous,struct swap_iocb **plug) +{ +struct swap_info_struct *sis =page_swap_info (page); +bool workingset =PageWorkingset (page); +unsigned long pflags; +bool in_thrashing; + +VM_BUG_ON_PAGE (!PageSwapCache (page) && !synchronous, page); +VM_BUG_ON_PAGE (!PageLocked (page), page); +VM_BUG_ON_PAGE (PageUptodate (page), page); + +/* +* Count submission time as memory stall and delay. When the device +* is congested, or the submitting cgroup IO-throttled, submission +* can be a significant part of overall IO time. +*/ +if (workingset) { +delayacct_thrashing_start (&in_thrashing); +psi_memstall_enter (&pflags); + } +delayacct_swapin_start (); + +if (frontswap_load (page) ==0 ) { +SetPageUptodate (page); +unlock_page (page); + }else if (data_race (sis->flags &SWP_FS_OPS )) { +swap_readpage_fs (page, plug); + }else { +swap_readpage_bdev (page, synchronous, sis); + } -out:if (workingset) {delayacct_thrashing_end (&in_thrashing);psi_memstall_leave (&pflags);
_
Patches currently in -mm which might be from [email protected] are