From: Miaohe Lin <linmiaohe@huawei.com>
To: <akpm@linux-foundation.org>
Cc: <linux-mm@kvack.org>, <linux-kernel@vger.kernel.org>,
<linmiaohe@huawei.com>
Subject: [PATCH 2/3] mm/swapfile: avoid confusing swap cache statistics
Date: Fri, 27 May 2022 17:26:25 +0800 [thread overview]
Message-ID: <20220527092626.31883-3-linmiaohe@huawei.com> (raw)
In-Reply-To: <20220527092626.31883-1-linmiaohe@huawei.com>
At swapoff time, we're going to swap in the pages continuously. So calling
lookup_swap_cache would confuse statistics. We should use find_get_page
directly here.
Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
---
mm/swapfile.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/mm/swapfile.c b/mm/swapfile.c
index 960d14a4b19e..e033a53a99df 100644
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -1865,7 +1865,12 @@ static int unuse_pte_range(struct vm_area_struct *vma, pmd_t *pmd,
offset = swp_offset(entry);
pte_unmap(pte);
swap_map = &si->swap_map[offset];
- page = lookup_swap_cache(entry, vma, addr);
+ /*
+ * Since we're going to swap in the pages continuously,
+ * calling lookup_swap_cache() would confuse statistics.
+ */
+ page = find_get_page(swap_address_space(entry),
+ swp_offset(entry));
if (!page) {
struct vm_fault vmf = {
.vma = vma,
--
2.23.0
next prev parent reply other threads:[~2022-05-27 9:26 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-27 9:26 [PATCH 0/3] A few fixup patches for swap Miaohe Lin
2022-05-27 9:26 ` [PATCH 1/3] mm/swapfile: make security_vm_enough_memory_mm() work as expected Miaohe Lin
2022-05-30 23:02 ` Andrew Morton
2022-05-31 2:40 ` Miaohe Lin
2022-05-27 9:26 ` Miaohe Lin [this message]
2022-05-30 23:04 ` [PATCH 2/3] mm/swapfile: avoid confusing swap cache statistics Andrew Morton
2022-05-31 2:55 ` Miaohe Lin
2022-05-31 12:58 ` David Hildenbrand
2022-06-01 2:11 ` Miaohe Lin
2022-06-01 7:53 ` David Hildenbrand
2022-06-02 7:29 ` Miaohe Lin
2022-06-02 8:41 ` David Hildenbrand
2022-06-06 3:14 ` Miaohe Lin
2022-05-27 9:26 ` [PATCH 3/3] mm/swapfile: fix possible data races of inuse_pages Miaohe Lin
2022-05-31 13:02 ` David Hildenbrand
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=20220527092626.31883-3-linmiaohe@huawei.com \
--to=linmiaohe@huawei.com \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.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