mm-swap-get-the-swap-device-offset-directly.patch removed from -mm tree
The quilt patch titled
Subject: mm/swap: get the swap device offset directly
has been removed from the -mm tree. Its filename was
mm-swap-get-the-swap-device-offset-directly.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: Kairui Song <[email protected]>
Subject: mm/swap: get the swap device offset directly
Date: Wed, 22 May 2024 01:58:50 +0800
folio_file_pos and page_file_offset are for mixed usage of swap cache and page cache, it can't be page cache here, so introduce a new helper to get the swap offset in swap device directly.
Need to include swapops.h in mm/swap.h to ensure swp_offset is always defined before use.
---
mm/page_io.c | 6 +++--- mm/swap.h | 9 +++++++++ 2 files changed, 12 insertions(+), 3 deletions(-)
mm/page_io.c renamed from mm/page_io.c~mm-swap-get-the-swap-device-offset-directly +3 -3
@@ -280,7 +280,7 @@ static void sio_write_complete(struct ki* be temporary. */ pr_err_ratelimited ("Write error %ld on dio swapfile (%llu)\n" , - ret,page_file_offset (page)); + ret,swap_dev_pos (page_swap_entry (page)));for (p =0 ; p < sio->pages; p++) { page = sio->bvec[p].bv_page;set_page_dirty (page);
@@ -299,7 +299,7 @@ static void swap_writepage_fs(struct folstruct swap_iocb *sio =NULL ;struct swap_info_struct *sis =swp_swap_info (folio->swap);struct file *swap_file = sis->swap_file; -loff_t pos =folio_file_pos (folio); +loff_t pos =swap_dev_pos (folio->swap);count_swpout_vm_event (folio);folio_start_writeback (folio);
@@ -430,7 +430,7 @@ static void swap_read_folio_fs(struct fo {struct swap_info_struct *sis =swp_swap_info (folio->swap);struct swap_iocb *sio =NULL ; -loff_t pos =folio_file_pos (folio); +loff_t pos =swap_dev_pos (folio->swap);if (plug) sio = *plug;
mm/swap.h renamed from mm/swap.h~mm-swap-get-the-swap-device-offset-directly +9 -0
@@ -5,6 +5,7 @@struct mempolicy ;#ifdef CONFIG_SWAP +#include <linux/swapops.h> /* for swp_offset */ #include <linux/blk_types.h> /* for bio_end_io_t */ /* linux/mm/page_io.c */
@@ -31,6 +32,14 @@ extern struct address_space *swapper_spa (&swapper_spaces[swp_type (entry)][swp_offset (entry) \ >>SWAP_ADDRESS_SPACE_SHIFT ]) +/* +* Return the swap device position of the swap entry. + */ +static inline loff_t swap_dev_pos (swp_entry_t entry) +{ +return ((loff_t )swp_offset (entry)) <<PAGE_SHIFT ; +} +void show_swap_cache_info (void );bool add_to_swap (struct folio *folio);void *get_shadow_from_swap_cache (swp_entry_t entry);
_
Patches currently in -mm which might be from [email protected] are