lkml.org 
[lkml]   [2021]   [Apr]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 3/5] mm/swap_state: fix get_shadow_from_swap_cache() race with swapoff
Date
The function get_shadow_from_swap_cache() can race with swapoff, though
it's only called by do_swap_page() now.

Fixes: aae466b0052e ("mm/swap: implement workingset detection for anonymous LRU")
Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
---
mm/swap_state.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/mm/swap_state.c b/mm/swap_state.c
index 272ea2108c9d..709c260d644a 100644
--- a/mm/swap_state.c
+++ b/mm/swap_state.c
@@ -83,11 +83,14 @@ void show_swap_cache_info(void)

void *get_shadow_from_swap_cache(swp_entry_t entry)
{
- struct address_space *address_space = swap_address_space(entry);
- pgoff_t idx = swp_offset(entry);
+ struct swap_info_struct *si;
struct page *page;

- page = xa_load(&address_space->i_pages, idx);
+ si = get_swap_device(entry);
+ if (!si)
+ return NULL;
+ page = xa_load(&swap_address_space(entry)->i_pages, swp_offset(entry));
+ put_swap_device(si);
if (xa_is_value(page))
return page;
return NULL;
--
2.19.1
\
 
 \ /
  Last update: 2021-04-08 15:10    [W:0.218 / U:0.516 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site