mm/swap_state: skip meaningless swap cache readahead when ra_info.win == 0

swap_ra_info() may leave ra_info untouched in non_swap_entry() case as
page table lock is not held.  In this case, we have ra_info.nr_pte == 0
and it is meaningless to continue with swap cache readahead.  Skip such
ops by init ra_info.win = 1.

[akpm@linux-foundation.org: clean up struct init]

Link: https://lkml.kernel.org/r/20201009133059.58407-1-linmiaohe@huawei.com
Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
Cc: Hugh Dickins <hughd@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/mm/swap_state.c b/mm/swap_state.c
index ee465827420e6284b0659f3fa34cb224b649a1a9..cf7b322a9abcbf8c1f58bfca30272199bcfd72f2 100644 (file)
--- a/mm/swap_state.c
+++ b/mm/swap_state.c
@@ -839,7 +839,9 @@ static struct page *swap_vma_readahead(swp_entry_t fentry, gfp_t gfp_mask,
        swp_entry_t entry;
        unsigned int i;
        bool page_allocated;
-       struct vma_swap_readahead ra_info = {0,};
+       struct vma_swap_readahead ra_info = {
+               .win = 1,
+       };
 
        swap_ra_info(vmf, &ra_info);
        if (ra_info.win == 1)