From: "HORIGUCHI NAOYA(堀口 直也)" <naoya.horiguchi@nec.com>
To: Miaohe Lin <linmiaohe@huawei.com>
Cc: "akpm@linux-foundation.org" <akpm@linux-foundation.org>,
"hughd@google.com" <hughd@google.com>,
"willy@infradead.org" <willy@infradead.org>,
"vbabka@suse.cz" <vbabka@suse.cz>,
"dhowells@redhat.com" <dhowells@redhat.com>,
"neilb@suse.de" <neilb@suse.de>,
"apopple@nvidia.com" <apopple@nvidia.com>,
"david@redhat.com" <david@redhat.com>,
"surenb@google.com" <surenb@google.com>,
"peterx@redhat.com" <peterx@redhat.com>,
"rcampbell@nvidia.com" <rcampbell@nvidia.com>,
"linux-mm@kvack.org" <linux-mm@kvack.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH v4 5/5] mm: filter out swapin error entry in shmem mapping
Date: Wed, 25 May 2022 04:53:49 +0000 [thread overview]
Message-ID: <20220525045348.GB808704@hori.linux.bs1.fc.nec.co.jp> (raw)
In-Reply-To: <20220519125030.21486-6-linmiaohe@huawei.com>
On Thu, May 19, 2022 at 08:50:30PM +0800, Miaohe Lin wrote:
> There might be swapin error entries in shmem mapping. Filter them out to
> avoid "Bad swap file entry" complaint.
>
> Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
> ---
> mm/madvise.c | 5 ++++-
> mm/swap_state.c | 3 +++
> 2 files changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/mm/madvise.c b/mm/madvise.c
> index a42165bc4735..31582b6ff551 100644
> --- a/mm/madvise.c
> +++ b/mm/madvise.c
> @@ -248,10 +248,13 @@ static void force_shm_swapin_readahead(struct vm_area_struct *vma,
>
> if (!xa_is_value(page))
> continue;
> + swap = radix_to_swp_entry(page);
> + /* There might be swapin error entries in shmem mapping. */
> + if (non_swap_entry(swap))
> + continue;
The inline comment mentions swapin error entries but other types of
non-swap entries should be skipped by this check, which is helpful too.
So I'm fine with the change, thank you.
Reviewed-by: Naoya Horiguchi <naoya.horiguchi@nec.com>
> xas_pause(&xas);
> rcu_read_unlock();
>
> - swap = radix_to_swp_entry(page);
> page = read_swap_cache_async(swap, GFP_HIGHUSER_MOVABLE,
> NULL, 0, false, &splug);
> if (page)
> diff --git a/mm/swap_state.c b/mm/swap_state.c
> index b9e4ed2e90bf..778d57d2d92d 100644
> --- a/mm/swap_state.c
> +++ b/mm/swap_state.c
> @@ -410,6 +410,9 @@ struct page *find_get_incore_page(struct address_space *mapping, pgoff_t index)
> return NULL;
>
> swp = radix_to_swp_entry(page);
> + /* There might be swapin error entries in shmem mapping. */
> + if (non_swap_entry(swp))
> + return NULL;
> /* Prevent swapoff from happening to us */
> si = get_swap_device(swp);
> if (!si)
> --
> 2.23.0
prev parent reply other threads:[~2022-05-25 4:53 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-19 12:50 [PATCH v4 0/5] A few fixup patches for mm Miaohe Lin
2022-05-19 12:50 ` [PATCH v4 1/5] mm/swapfile: unuse_pte can map random data if swap read fails Miaohe Lin
2022-05-19 12:50 ` [PATCH v4 2/5] mm/swapfile: Fix lost swap bits in unuse_pte() Miaohe Lin
2022-05-19 12:50 ` [PATCH v4 3/5] mm/madvise: free hwpoison and swapin error entry in madvise_free_pte_range Miaohe Lin
2022-05-19 12:50 ` [PATCH v4 4/5] mm/shmem: fix infinite loop when swap in shmem error at swapoff time Miaohe Lin
2022-05-20 6:34 ` HORIGUCHI NAOYA(堀口 直也)
2022-05-20 8:17 ` Miaohe Lin
2022-05-22 23:53 ` HORIGUCHI NAOYA(堀口 直也)
2022-05-23 3:01 ` Miaohe Lin
2022-05-23 11:23 ` Miaohe Lin
2022-05-24 6:44 ` HORIGUCHI NAOYA(堀口 直也)
2022-05-24 10:56 ` Miaohe Lin
2022-05-21 9:34 ` Miaohe Lin
2022-05-24 22:10 ` Andrew Morton
2022-05-25 1:42 ` Miaohe Lin
2022-05-25 4:32 ` HORIGUCHI NAOYA(堀口 直也)
2022-05-25 6:40 ` Miaohe Lin
2022-05-26 6:08 ` HORIGUCHI NAOYA(堀口 直也)
2022-05-19 12:50 ` [PATCH v4 5/5] mm: filter out swapin error entry in shmem mapping Miaohe Lin
2022-05-25 4:53 ` HORIGUCHI NAOYA(堀口 直也) [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220525045348.GB808704@hori.linux.bs1.fc.nec.co.jp \
--to=naoya.horiguchi@nec.com \
--cc=akpm@linux-foundation.org \
--cc=apopple@nvidia.com \
--cc=david@redhat.com \
--cc=dhowells@redhat.com \
--cc=hughd@google.com \
--cc=linmiaohe@huawei.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=neilb@suse.de \
--cc=peterx@redhat.com \
--cc=rcampbell@nvidia.com \
--cc=surenb@google.com \
--cc=vbabka@suse.cz \
--cc=willy@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).