From: Kefeng Wang <wangkefeng.wang@huawei.com>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: <willy@infradead.org>, <linux-mm@kvack.org>,
<linux-kernel@vger.kernel.org>, <ying.huang@intel.com>,
<david@redhat.com>, Zi Yan <ziy@nvidia.com>,
Ingo Molnar <mingo@redhat.com>,
Peter Zijlstra <peterz@infradead.org>,
Juri Lelli <juri.lelli@redhat.com>,
Vincent Guittot <vincent.guittot@linaro.org>,
Kefeng Wang <wangkefeng.wang@huawei.com>
Subject: [PATCH v3 10/19] mm: huge_memory: use a folio in change_huge_pmd()
Date: Wed, 18 Oct 2023 22:07:57 +0800 [thread overview]
Message-ID: <20231018140806.2783514-11-wangkefeng.wang@huawei.com> (raw)
In-Reply-To: <20231018140806.2783514-1-wangkefeng.wang@huawei.com>
Use a folio in change_huge_pmd(), which helps to remove last
xchg_page_access_time() caller.
Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
---
mm/huge_memory.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index 5455dfe4c3c7..f01f345141da 100644
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -1856,7 +1856,7 @@ int change_huge_pmd(struct mmu_gather *tlb, struct vm_area_struct *vma,
#ifdef CONFIG_ARCH_ENABLE_THP_MIGRATION
if (is_swap_pmd(*pmd)) {
swp_entry_t entry = pmd_to_swp_entry(*pmd);
- struct page *page = pfn_swap_entry_to_page(entry);
+ struct folio *folio = page_folio(pfn_swap_entry_to_page(entry));
pmd_t newpmd;
VM_BUG_ON(!is_pmd_migration_entry(*pmd));
@@ -1865,7 +1865,7 @@ int change_huge_pmd(struct mmu_gather *tlb, struct vm_area_struct *vma,
* A protection check is difficult so
* just be safe and disable write
*/
- if (PageAnon(page))
+ if (folio_test_anon(folio))
entry = make_readable_exclusive_migration_entry(swp_offset(entry));
else
entry = make_readable_migration_entry(swp_offset(entry));
@@ -1887,7 +1887,7 @@ int change_huge_pmd(struct mmu_gather *tlb, struct vm_area_struct *vma,
#endif
if (prot_numa) {
- struct page *page;
+ struct folio *folio;
bool toptier;
/*
* Avoid trapping faults against the zero page. The read-only
@@ -1900,8 +1900,8 @@ int change_huge_pmd(struct mmu_gather *tlb, struct vm_area_struct *vma,
if (pmd_protnone(*pmd))
goto unlock;
- page = pmd_page(*pmd);
- toptier = node_is_toptier(page_to_nid(page));
+ folio = page_folio(pmd_page(*pmd));
+ toptier = node_is_toptier(folio_nid(folio));
/*
* Skip scanning top tier node if normal numa
* balancing is disabled
@@ -1912,7 +1912,8 @@ int change_huge_pmd(struct mmu_gather *tlb, struct vm_area_struct *vma,
if (sysctl_numa_balancing_mode & NUMA_BALANCING_MEMORY_TIERING &&
!toptier)
- xchg_page_access_time(page, jiffies_to_msecs(jiffies));
+ folio_xchg_access_time(folio,
+ jiffies_to_msecs(jiffies));
}
/*
* In case prot_numa, we are under mmap_read_lock(mm). It's critical
--
2.27.0
next prev parent reply other threads:[~2023-10-18 14:26 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-18 14:07 [PATCH -next v3 00/19] mm: convert page cpupid functions to folios Kefeng Wang
2023-10-18 14:07 ` [PATCH v3 01/19] mm_types: add virtual and _last_cpupid into struct folio Kefeng Wang
2023-10-18 14:07 ` [PATCH v3 02/19] mm: add folio_last_cpupid() Kefeng Wang
2023-10-18 14:07 ` [PATCH v3 03/19] mm: memory: use folio_last_cpupid() in do_numa_page() Kefeng Wang
2023-10-18 14:07 ` [PATCH v3 04/19] mm: huge_memory: use folio_last_cpupid() in do_huge_pmd_numa_page() Kefeng Wang
2023-10-18 14:07 ` [PATCH v3 05/19] mm: huge_memory: use folio_last_cpupid() in __split_huge_page_tail() Kefeng Wang
2023-10-18 14:07 ` [PATCH v3 06/19] mm: remove page_cpupid_last() Kefeng Wang
2023-10-18 14:07 ` [PATCH v3 07/19] mm: add folio_xchg_access_time() Kefeng Wang
2023-10-18 14:07 ` [PATCH v3 08/19] sched/fair: use folio_xchg_access_time() in numa_hint_fault_latency() Kefeng Wang
2023-10-18 14:07 ` [PATCH v3 09/19] mm: mprotect: use a folio in change_pte_range() Kefeng Wang
2023-10-18 14:07 ` Kefeng Wang [this message]
2023-10-18 14:07 ` [PATCH v3 11/19] mm: remove xchg_page_access_time() Kefeng Wang
2023-10-18 14:07 ` [PATCH v3 12/19] mm: add folio_xchg_last_cpupid() Kefeng Wang
2023-10-18 14:08 ` [PATCH v3 13/19] sched/fair: use folio_xchg_last_cpupid() in should_numa_migrate_memory() Kefeng Wang
2023-10-18 14:08 ` [PATCH v3 14/19] mm: migrate: use folio_xchg_last_cpupid() in folio_migrate_flags() Kefeng Wang
2023-10-18 14:08 ` [PATCH v3 15/19] mm: huge_memory: use folio_xchg_last_cpupid() in __split_huge_page_tail() Kefeng Wang
2023-10-18 14:08 ` [PATCH v3 16/19] mm: make finish_mkwrite_fault() static Kefeng Wang
2023-10-18 14:08 ` [PATCH v3 17/19] mm: convert wp_page_reuse() and finish_mkwrite_fault() to take a folio Kefeng Wang
2023-10-18 14:08 ` [PATCH v3 18/19] mm: use folio_xchg_last_cpupid() in wp_page_reuse() Kefeng Wang
2023-10-18 14:08 ` [PATCH v3 19/19] mm: remove page_cpupid_xchg_last() Kefeng Wang
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=20231018140806.2783514-11-wangkefeng.wang@huawei.com \
--to=wangkefeng.wang@huawei.com \
--cc=akpm@linux-foundation.org \
--cc=david@redhat.com \
--cc=juri.lelli@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mingo@redhat.com \
--cc=peterz@infradead.org \
--cc=vincent.guittot@linaro.org \
--cc=willy@infradead.org \
--cc=ying.huang@intel.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