From: Miaohe Lin <linmiaohe@huawei.com>
To: <akpm@linux-foundation.org>
Cc: <ziy@nvidia.com>, <willy@infradead.org>,
<william.kucharski@oracle.com>, <vbabka@suse.cz>,
<peterx@redhat.com>, <yulei.kernel@gmail.com>,
<walken@google.com>, <aneesh.kumar@linux.ibm.com>,
<rcampbell@nvidia.com>, <thomas_os@shipmail.org>,
<yang.shi@linux.alibaba.com>, <richard.weiyang@linux.alibaba.com>,
<linux-kernel@vger.kernel.org>, <linux-mm@kvack.org>,
<linmiaohe@huawei.com>
Subject: [PATCH v3 6/6] mm/huge_memory.c: use helper function migration_entry_to_page()
Date: Thu, 18 Mar 2021 08:27:22 -0400 [thread overview]
Message-ID: <20210318122722.13135-7-linmiaohe@huawei.com> (raw)
In-Reply-To: <20210318122722.13135-1-linmiaohe@huawei.com>
It's more recommended to use helper function migration_entry_to_page() to
get the page via migration entry. We can also enjoy the PageLocked()
check there.
Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
---
mm/huge_memory.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index 52acc3954afd..9b31ef84bf7e 100644
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -1693,7 +1693,7 @@ int zap_huge_pmd(struct mmu_gather *tlb, struct vm_area_struct *vma,
VM_BUG_ON(!is_pmd_migration_entry(orig_pmd));
entry = pmd_to_swp_entry(orig_pmd);
- page = pfn_to_page(swp_offset(entry));
+ page = migration_entry_to_page(entry);
flush_needed = 0;
} else
WARN_ONCE(1, "Non present huge pmd without pmd migration enabled!");
@@ -2101,7 +2101,7 @@ static void __split_huge_pmd_locked(struct vm_area_struct *vma, pmd_t *pmd,
swp_entry_t entry;
entry = pmd_to_swp_entry(old_pmd);
- page = pfn_to_page(swp_offset(entry));
+ page = migration_entry_to_page(entry);
write = is_write_migration_entry(entry);
young = false;
soft_dirty = pmd_swp_soft_dirty(old_pmd);
--
2.19.1
next prev parent reply other threads:[~2021-03-18 12:28 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-18 12:27 [PATCH v3 0/6] Some cleanups for huge_memory Miaohe Lin
2021-03-18 12:27 ` [PATCH v3 1/6] mm/huge_memory.c: rework the function vma_adjust_trans_huge() Miaohe Lin
2021-03-18 12:27 ` [PATCH v3 2/6] mm/huge_memory.c: make get_huge_zero_page() return bool Miaohe Lin
2021-03-18 14:00 ` Zi Yan
2021-03-18 12:27 ` [PATCH v3 3/6] mm/huge_memory.c: rework the function do_huge_pmd_numa_page() slightly Miaohe Lin
2021-03-18 14:04 ` Zi Yan
2021-03-18 12:27 ` [PATCH v3 4/6] mm/huge_memory.c: remove redundant PageCompound() check Miaohe Lin
2021-03-18 12:27 ` [PATCH v3 5/6] mm/huge_memory.c: remove unused macro TRANSPARENT_HUGEPAGE_DEBUG_COW_FLAG Miaohe Lin
2021-03-18 14:12 ` Zi Yan
2021-03-18 12:27 ` Miaohe Lin [this message]
2021-03-18 15:07 ` [PATCH v3 0/6] Some cleanups for huge_memory Peter Xu
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=20210318122722.13135-7-linmiaohe@huawei.com \
--to=linmiaohe@huawei.com \
--cc=akpm@linux-foundation.org \
--cc=aneesh.kumar@linux.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=peterx@redhat.com \
--cc=rcampbell@nvidia.com \
--cc=richard.weiyang@linux.alibaba.com \
--cc=thomas_os@shipmail.org \
--cc=vbabka@suse.cz \
--cc=walken@google.com \
--cc=william.kucharski@oracle.com \
--cc=willy@infradead.org \
--cc=yang.shi@linux.alibaba.com \
--cc=yulei.kernel@gmail.com \
--cc=ziy@nvidia.com \
/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).