Skip to content

Commit bc5dfb4

Browse files
Baolin Wangctmarinas
authored andcommitted
arm64/hugetlb: Implement arm64 specific huge_ptep_get()
Now we use huge_ptep_get() to get the pte value of a hugetlb page, however it will only return one specific pte value for the CONT-PTE or CONT-PMD size hugetlb on ARM64 system, which can contain several continuous pte or pmd entries with same page table attributes. And it will not take into account the subpages' dirty or young bits of a CONT-PTE/PMD size hugetlb page. So the huge_ptep_get() is inconsistent with huge_ptep_get_and_clear(), which already takes account the dirty or young bits for any subpages in this CONT-PTE/PMD size hugetlb [1]. Meanwhile we can miss dirty or young flags statistics for hugetlb pages with current huge_ptep_get(), such as the gather_hugetlb_stats() function, and CONT-PTE/PMD hugetlb monitoring with DAMON. Thus define an ARM64 specific huge_ptep_get() implementation as well as enabling __HAVE_ARCH_HUGE_PTEP_GET, that will take into account any subpages' dirty or young bits for CONT-PTE/PMD size hugetlb page, for those functions that want to check the dirty and young flags of a hugetlb page. [1] https://lore.kernel.org/linux-mm/[email protected]/ Suggested-by: Muchun Song <[email protected]> Signed-off-by: Baolin Wang <[email protected]> Reviewed-by: Muchun Song <[email protected]> Reviewed-by: Anshuman Khandual <[email protected]> Link: https://lore.kernel.org/r/624109a80ac4bbdf1e462dfa0b49e9f7c31a7c0d.1652496622.git.baolin.wang@linux.alibaba.com Signed-off-by: Catalin Marinas <[email protected]>
1 parent f0d9d79 commit bc5dfb4

File tree

2 files changed

+24
-0
lines changed

2 files changed

+24
-0
lines changed

arch/arm64/include/asm/hugetlb.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ extern void huge_ptep_clear_flush(struct vm_area_struct *vma,
4444
#define __HAVE_ARCH_HUGE_PTE_CLEAR
4545
extern void huge_pte_clear(struct mm_struct *mm, unsigned long addr,
4646
pte_t *ptep, unsigned long sz);
47+
#define __HAVE_ARCH_HUGE_PTEP_GET
48+
extern pte_t huge_ptep_get(pte_t *ptep);
4749
extern void set_huge_swap_pte_at(struct mm_struct *mm, unsigned long addr,
4850
pte_t *ptep, pte_t pte, unsigned long sz);
4951
#define set_huge_swap_pte_at set_huge_swap_pte_at

arch/arm64/mm/hugetlbpage.c

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,28 @@ static inline int num_contig_ptes(unsigned long size, size_t *pgsize)
158158
return contig_ptes;
159159
}
160160

161+
pte_t huge_ptep_get(pte_t *ptep)
162+
{
163+
int ncontig, i;
164+
size_t pgsize;
165+
pte_t orig_pte = ptep_get(ptep);
166+
167+
if (!pte_present(orig_pte) || !pte_cont(orig_pte))
168+
return orig_pte;
169+
170+
ncontig = num_contig_ptes(page_size(pte_page(orig_pte)), &pgsize);
171+
for (i = 0; i < ncontig; i++, ptep++) {
172+
pte_t pte = ptep_get(ptep);
173+
174+
if (pte_dirty(pte))
175+
orig_pte = pte_mkdirty(orig_pte);
176+
177+
if (pte_young(pte))
178+
orig_pte = pte_mkyoung(orig_pte);
179+
}
180+
return orig_pte;
181+
}
182+
161183
/*
162184
* Changing some bits of contiguous entries requires us to follow a
163185
* Break-Before-Make approach, breaking the whole contiguous set

0 commit comments

Comments
 (0)