Revert "mm,shmem: fix a typo in shmem_swapin_page()"
Subsystems (3)
PATCH 1/3 Revert "mm,shmem: fix a typo in shmem_swapin_page()"
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 and this fix's fix commit could be reverted as well.
---
This revert is for linux-next/-mm tree only since this commit has not merged into Linus's tree yet.
mm/shmem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
mm/shmem.c +1 -1
@@ -1711,7 +1711,7 @@ static int shmem_swapin_page(struct inode *inode, pgoff_t index,/* Prevent swapoff from happening to us. */ si =get_swap_device (swap);if (!si) { - error = -EINVAL ; + error =EINVAL ; goto failed; }/* Look it up and read it in.. */
Signature · 1 line
2.26.2
PATCH 2/3 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.
--- mm/shmem.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-)
mm/shmem.c +1 -13
@@ -1699,8 +1699,7 @@ static int shmem_swapin_page(struct inode *inode, pgoff_t index,struct 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;
@@ -1708,12 +1707,6 @@ static int shmem_swapin_page(struct inode *inode, pgoff_t index, 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) {
@@ -1775,8 +1768,6 @@ static int shmem_swapin_page(struct inode *inode, pgoff_t index,swap_free (swap); *pagep = page; -if (si) -put_swap_device (si);return 0 ; failed:if (!shmem_confirm_swap (mapping, index, swap))
@@ -1787,9 +1778,6 @@ static int shmem_swapin_page(struct inode *inode, pgoff_t index,put_page (page); } -if (si) -put_swap_device (si); -return error; }
Signature · 1 line
2.26.2
Re: [PATCH 2/3] Revert "mm/shmem: fix shmem_swapin() race with swapoff"
Quoted 7 lines · Yang Shi
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 commit2efa33fc7f6e("mm/shmem:
fixshmem_swapin()race with swapoff"), so the fix commit could be just reverted as well.
The updated commit log per the discussion with Hugh:
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]/
Quoted 58 lines
Suggested-by Hugh Dickins <[email protected]>Cc "Huang, Ying" <[email protected]>Cc Miaohe Lin <[email protected]>Signed-off-by Yang Shi <[email protected]>--- mm/shmem.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-)mm/shmem.c +1
-14@@ -1699,8 +1699,7 @@ static int shmem_swapin_page(struct inode *inode, pgoff_t index,struct 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;@@ -1708,12 +1707,6 @@ static int shmem_swapin_page(struct inode *inode, pgoff_t index, 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) {@@ -1775,8 +1768,6 @@ static int shmem_swapin_page(struct inode *inode, pgoff_t index,swap_free (swap); *pagep = page; -if (si) -put_swap_device (si);return 0 ; failed:if (!shmem_confirm_swap (mapping, index, swap))@@ -1787,9 +1778,6 @@ static int shmem_swapin_page(struct inode *inode, pgoff_t index,put_page (page); } -if (si) -put_swap_device (si); -return error; } --2.26.2
PATCH 3/3 Revert "mm: swap: check if swap backing device is congested or not"
In reply to Yang ShiDue 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"). The fix was reverted by the previous patch.
--- mm/swap_state.c | 7 ------- 1 file changed, 7 deletions(-)
mm/swap_state.c +0 -7
@@ -628,13 +628,6 @@ struct page *swap_cluster_readahead(swp_entry_t entry, gfp_t gfp_mask,if (!mask) goto skip; -/* Test swap type to make sure the dereference is safe */ -if (likely (si->flags & (SWP_BLKDEV |SWP_FS_OPS ))) { -struct inode *inode = si->swap_file->f_mapping->host; -if (inode_read_congested (inode)) - goto skip; - } - do_poll = false;/* Read a page_cluster sized and aligned cluster around offset. */ start_offset = offset & ~mask;
Signature · 1 line
2.26.2
Re: [PATCH 3/3] Revert "mm: swap: check if swap backing device is congested or not"
Quoted 11 lines · Yang Shi
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 commit2efa33fc7f6e("mm/shmem:
fixshmem_swapin()race with swapoff"). The fix was reverted by the previous patch.Suggested-by Hugh Dickins <[email protected]>Cc "Huang, Ying" <[email protected]>Cc Miaohe Lin <[email protected]>Signed-off-by Yang Shi <[email protected]>
Thanks for doing these,
to all three.
I guess 1/3 will vanish now, since what it's reverting has not yet gone forward to Linus: it would have been nice for 2/3 to have mentioned that what it's reverting is kindof buggy: but then you'd have to explain the "kindof", and that takes more words than it's worth - maybe a lore Link to the discussion?
But you've done the work that I've not yet got around to:
so thank you, and ignore my gripes.
Hugh
Quoted 24 lines
--- mm/swap_state.c | 7 ------- 1 file changed, 7 deletions(-)mm/swap_state.c +0
-7@@ -628,13 +628,6 @@ struct page *swap_cluster_readahead(swp_entry_t entry, gfp_t gfp_mask,if (!mask) goto skip; -/* Test swap type to make sure the dereference is safe */ -if (likely (si->flags & (SWP_BLKDEV |SWP_FS_OPS ))) { -struct inode *inode = si->swap_file->f_mapping->host; -if (inode_read_congested (inode)) - goto skip; - } - do_poll = false;/* Read a page_cluster sized and aligned cluster around offset. */ start_offset = offset & ~mask;Signature · 1 line
2.26.2
Re: [PATCH 3/3] Revert "mm: swap: check if swap backing device is congested or not"
Quoted 16 lines · Hugh Dickins
Quoted 11 lines · Yang Shi
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 commit2efa33fc7f6e("mm/shmem:
fixshmem_swapin()race with swapoff"). The fix was reverted by the previous patch.Suggested-by Hugh Dickins <[email protected]>Cc "Huang, Ying" <[email protected]>Cc Miaohe Lin <[email protected]>Signed-off-by Yang Shi <[email protected]>Thanks for doing these,
Quoted 8 lines
Acked-by Hugh Dickins <[email protected]>to all three.
I guess 1/3 will vanish now, since what it's reverting has not yet gone forward to Linus: it would have been nice for 2/3 to have mentioned that what it's reverting is kindof buggy: but then you'd have to explain the "kindof", and that takes more words than it's worth - maybe a lore Link to the discussion?
It is fine, I think this one is the best elaborated the problem:
https://lore.kernel.org/linux-mm/[email protected]/
Quoted 30 lines
But you've done the work that I've not yet got around to:
so thank you, and ignore my gripes.Hugh
Quoted 24 lines
--- mm/swap_state.c | 7 ------- 1 file changed, 7 deletions(-)mm/swap_state.c +0
-8@@ -628,13 +628,6 @@ struct page *swap_cluster_readahead(swp_entry_t entry, gfp_t gfp_mask,if (!mask) goto skip; -/* Test swap type to make sure the dereference is safe */ -if (likely (si->flags & (SWP_BLKDEV |SWP_FS_OPS ))) { -struct inode *inode = si->swap_file->f_mapping->host; -if (inode_read_congested (inode)) - goto skip; - } - do_poll = false;/* Read a page_cluster sized and aligned cluster around offset. */ start_offset = offset & ~mask; --2.26.2
Hugh Dickins
maintainerRe: [PATCH 3/3] Revert "mm: swap: check if swap backing device is congested or not"
Quoted 10 lines · Yang Shi
Quoted 6 lines · Hugh Dickins
I guess 1/3 will vanish now, since what it's reverting has not yet gone forward to Linus: it would have been nice for 2/3 to have mentioned that what it's reverting is kindof buggy: but then you'd have to explain the "kindof", and that takes more words than it's worth - maybe a lore Link to the discussion?
It is fine, I think this one is the best elaborated the problem:
https://lore.kernel.org/linux-mm/[email protected]/
Yes, that best elaborated the problem when I thought it was a problem, then
https://lore.kernel.org/linux-mm/[email protected]/
explained why I later came to think that it wasn't a problem after all.
Hence "kindof" buggy: but good to be reverted anyway.
Whatever!
Thanks,
Hugh