mm-swap-avoid-redundant-swap-device-pinning.patch removed from -mm tree
The quilt patch titled
Subject: mm, swap: avoid redundant swap device pinning
has been removed from the -mm tree. Its filename was
mm-swap-avoid-redundant-swap-device-pinning.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: avoid redundant swap device pinning
Date: Fri, 14 Mar 2025 00:59:31 +0800
Currently __read_swap_cache_async() has get/put_swap_device() calls to increase/decrease a swap device reference to prevent swapoff. While some of its callers have already held the swap device reference, e.g in do_swap_page() and shmem_swapin_folio() where __read_swap_cache_async() will finally called. Now there are only two callers not holding a swap device reference, so make them hold a reference instead. And drop the get/put_swap_device calls in __read_swap_cache_async. This should reduce the overhead for swap in during page fault slightly.
---
mm/swap_state.c | 14 ++++++++------ mm/zswap.c | 8 +++++++- 2 files changed, 15 insertions(+), 7 deletions(-)
mm/swap_state.c renamed from mm/swap_state.c~mm-swap-avoid-redundant-swap-device-pinning +8 -6
@@ -426,17 +426,13 @@ struct folio *__read_swap_cache_async(sw struct mempolicy *mpol, pgoff_t ilx, bool *new_page_allocated, bool skip_if_exists) { - struct swap_info_struct *si; + struct swap_info_struct *si = swp_swap_info(entry);struct folio *folio;struct folio *new_folio =NULL ;struct folio *result =NULL ;void *shadow =NULL ; *new_page_allocated = false; - si =get_swap_device (entry); -if (!si) -return NULL ; -for (;;) {int err;/*
@@ -532,7 +528,6 @@ fail_unlock:put_swap_folio (new_folio, entry);folio_unlock (new_folio); put_and_return: -put_swap_device (si);if (!(*new_page_allocated) && new_folio)folio_put (new_folio);return result;
@@ -552,11 +547,16 @@ struct folio *read_swap_cache_async(swp_ struct vm_area_struct *vma, unsigned long addr, struct swap_iocb **plug) { + struct swap_info_struct *si;bool page_allocated;struct mempolicy *mpol;pgoff_t ilx;struct folio *folio; + si =get_swap_device (entry); +if (!si) +return NULL ; + mpol =get_vma_policy (vma, addr,0 , &ilx); folio =__read_swap_cache_async (entry, gfp_mask, mpol, ilx, &page_allocated, false);
@@ -564,6 +564,8 @@ struct folio *read_swap_cache_async(swp_if (page_allocated)swap_read_folio (folio, plug); + +put_swap_device (si);return folio; }
mm/zswap.c renamed from mm/zswap.c~mm-swap-avoid-redundant-swap-device-pinning +7 -1
@@ -1051,14 +1051,20 @@ static int zswap_writeback_entry(structstruct folio *folio;struct mempolicy *mpol;bool folio_was_allocated; +struct swap_info_struct *si;struct writeback_control wbc = { .sync_mode =WB_SYNC_NONE , };/* try to allocate swap cache folio */ + si =get_swap_device (swpentry); +if (!si) +return -EEXIST ; + mpol =get_task_policy (current); folio =__read_swap_cache_async (swpentry,GFP_KERNEL , mpol, -NO_INTERLEAVE_INDEX , &folio_was_allocated, true); +NO_INTERLEAVE_INDEX , &folio_was_allocated, true); +put_swap_device (si);if (!folio)return -ENOMEM ;
_
Patches currently in -mm which might be from [email protected] are