revert-mm-shmem-fix-shmem_swapin-race-with-swapoff.patch removed from -mm tree
The patch titled
Subject: Revert "mm/shmem: fix shmem_swapin() race with swapoff"
has been removed from the -mm tree. Its filename was
revert-mm-shmem-fix-shmem_swapin-race-with-swapoff.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Yang Shi <[email protected]>
Subject: Revert "mm/shmem: fix shmem_swapin() race with swapoff"
Due to the change about how block layer detects congestion the justification of commit 8fd2e0b505d1 ("mm: swap: check if swap backing device is congested or not") doesn't stand anymore, so the commit could be just reverted in order to solve the race reported by commit 2efa33fc7f6e ("mm/shmem:
fix shmem_swapin() race with swapoff"), so the fix commit could be just reverted as well.
And that fix is also kind of buggy as discussed by [1] and [2].
[1] https://lore.kernel.org/linux-mm/[email protected]/
[2] https://lore.kernel.org/linux-mm/[email protected]/
---
mm/shmem.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-)
mm/shmem.c renamed from mm/shmem.c~revert-mm-shmem-fix-shmem_swapin-race-with-swapoff +1 -13
@@ -1696,8 +1696,7 @@ static int shmem_swapin_page(struct inodstruct address_space *mapping = inode->i_mapping;struct shmem_inode_info *info =SHMEM_I (inode);struct mm_struct *charge_mm = vma ? vma->vm_mm :NULL ; -struct swap_info_struct *si; -struct page *page =NULL ; +struct page *page;swp_entry_t swap;int error;
@@ -1705,12 +1704,6 @@ static int shmem_swapin_page(struct inod swap =radix_to_swp_entry (*pagep); *pagep =NULL ; -/* Prevent swapoff from happening to us. */ - si =get_swap_device (swap); -if (!si) { - error =EINVAL ; - goto failed; - }/* Look it up and read it in.. */ page =lookup_swap_cache (swap,NULL ,0 );if (!page) {
@@ -1772,8 +1765,6 @@ static int shmem_swapin_page(struct inodswap_free (swap); *pagep = page; -if (si) -put_swap_device (si);return 0 ; failed:if (!shmem_confirm_swap (mapping, index, swap))
@@ -1784,9 +1775,6 @@ unlock:put_page (page); } -if (si) -put_swap_device (si); -return error; }
_
Patches currently in -mm which might be from [email protected] are
mm-hwpoison-dont-drop-slab-caches-for-offlining-non-lru-page.patch doc-hwpoison-correct-the-support-for-hugepage.patch mm-hwpoison-dump-page-for-unhandlable-page.patch