Skip to content

Commit 66b3923

Browse files
David Woodswildea01
David Woods
authored and
wildea01
committed
arm64: hugetlb: add support for PTE contiguous bit
The arm64 MMU supports a Contiguous bit which is a hint that the TTE is one of a set of contiguous entries which can be cached in a single TLB entry. Supporting this bit adds new intermediate huge page sizes. The set of huge page sizes available depends on the base page size. Without using contiguous pages the huge page sizes are as follows. 4KB: 2MB 1GB 64KB: 512MB With a 4KB granule, the contiguous bit groups together sets of 16 pages and with a 64KB granule it groups sets of 32 pages. This enables two new huge page sizes in each case, so that the full set of available sizes is as follows. 4KB: 64KB 2MB 32MB 1GB 64KB: 2MB 512MB 16GB If a 16KB granule is used then the contiguous bit groups 128 pages at the PTE level and 32 pages at the PMD level. If the base page size is set to 64KB then 2MB pages are enabled by default. It is possible in the future to make 2MB the default huge page size for both 4KB and 64KB granules. Reviewed-by: Chris Metcalf <cmetcalf@ezchip.com> Reviewed-by: Steve Capper <steve.capper@linaro.org> Signed-off-by: David Woods <dwoods@ezchip.com> Signed-off-by: Will Deacon <will.deacon@arm.com>
1 parent 0a28714 commit 66b3923

File tree

6 files changed

+313
-38
lines changed

6 files changed

+313
-38
lines changed

‎arch/arm64/Kconfig

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -530,9 +530,6 @@ config HW_PERF_EVENTS
530530
config SYS_SUPPORTS_HUGETLBFS
531531
def_bool y
532532

533-
config ARCH_WANT_GENERAL_HUGETLB
534-
def_bool y
535-
536533
config ARCH_WANT_HUGE_PMD_SHARE
537534
def_bool y if ARM64_4K_PAGES || (ARM64_16K_PAGES && !ARM64_VA_BITS_36)
538535

‎arch/arm64/include/asm/hugetlb.h

Lines changed: 15 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -26,36 +26,7 @@ static inline pte_t huge_ptep_get(pte_t *ptep)
2626
return *ptep;
2727
}
2828

29-
static inline void set_huge_pte_at(struct mm_struct *mm, unsigned long addr,
30-
pte_t *ptep, pte_t pte)
31-
{
32-
set_pte_at(mm, addr, ptep, pte);
33-
}
34-
35-
static inline void huge_ptep_clear_flush(struct vm_area_struct *vma,
36-
unsigned long addr, pte_t *ptep)
37-
{
38-
ptep_clear_flush(vma, addr, ptep);
39-
}
40-
41-
static inline void huge_ptep_set_wrprotect(struct mm_struct *mm,
42-
unsigned long addr, pte_t *ptep)
43-
{
44-
ptep_set_wrprotect(mm, addr, ptep);
45-
}
4629

47-
static inline pte_t huge_ptep_get_and_clear(struct mm_struct *mm,
48-
unsigned long addr, pte_t *ptep)
49-
{
50-
return ptep_get_and_clear(mm, addr, ptep);
51-
}
52-
53-
static inline int huge_ptep_set_access_flags(struct vm_area_struct *vma,
54-
unsigned long addr, pte_t *ptep,
55-
pte_t pte, int dirty)
56-
{
57-
return ptep_set_access_flags(vma, addr, ptep, pte, dirty);
58-
}
5930

6031
static inline void hugetlb_free_pgd_range(struct mmu_gather *tlb,
6132
unsigned long addr, unsigned long end,
@@ -97,4 +68,19 @@ static inline void arch_clear_hugepage_flags(struct page *page)
9768
clear_bit(PG_dcache_clean, &page->flags);
9869
}
9970

71+
extern pte_t arch_make_huge_pte(pte_t entry, struct vm_area_struct *vma,
72+
struct page *page, int writable);
73+
#define arch_make_huge_pte arch_make_huge_pte
74+
extern void set_huge_pte_at(struct mm_struct *mm, unsigned long addr,
75+
pte_t *ptep, pte_t pte);
76+
extern int huge_ptep_set_access_flags(struct vm_area_struct *vma,
77+
unsigned long addr, pte_t *ptep,
78+
pte_t pte, int dirty);
79+
extern pte_t huge_ptep_get_and_clear(struct mm_struct *mm,
80+
unsigned long addr, pte_t *ptep);
81+
extern void huge_ptep_set_wrprotect(struct mm_struct *mm,
82+
unsigned long addr, pte_t *ptep);
83+
extern void huge_ptep_clear_flush(struct vm_area_struct *vma,
84+
unsigned long addr, pte_t *ptep);
85+
10086
#endif /* __ASM_HUGETLB_H */

‎arch/arm64/include/asm/pgtable-hwdef.h

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,23 @@
9090
/*
9191
* Contiguous page definitions.
9292
*/
93-
#define CONT_PTES (_AC(1, UL) << CONT_SHIFT)
93+
#ifdef CONFIG_ARM64_64K_PAGES
94+
#define CONT_PTE_SHIFT 5
95+
#define CONT_PMD_SHIFT 5
96+
#elif defined(CONFIG_ARM64_16K_PAGES)
97+
#define CONT_PTE_SHIFT 7
98+
#define CONT_PMD_SHIFT 5
99+
#else
100+
#define CONT_PTE_SHIFT 4
101+
#define CONT_PMD_SHIFT 4
102+
#endif
103+
104+
#define CONT_PTES (1 << CONT_PTE_SHIFT)
105+
#define CONT_PTE_SIZE (CONT_PTES * PAGE_SIZE)
106+
#define CONT_PTE_MASK (~(CONT_PTE_SIZE - 1))
107+
#define CONT_PMDS (1 << CONT_PMD_SHIFT)
108+
#define CONT_PMD_SIZE (CONT_PMDS * PMD_SIZE)
109+
#define CONT_PMD_MASK (~(CONT_PMD_SIZE - 1))
94110
/* the the numerical offset of the PTE within a range of CONT_PTES */
95111
#define CONT_RANGE_OFFSET(addr) (((addr)>>PAGE_SHIFT)&(CONT_PTES-1))
96112

‎arch/arm64/include/asm/pgtable.h

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -227,14 +227,20 @@ static inline pte_t pte_mkspecial(pte_t pte)
227227

228228
static inline pte_t pte_mkcont(pte_t pte)
229229
{
230-
return set_pte_bit(pte, __pgprot(PTE_CONT));
230+
pte = set_pte_bit(pte, __pgprot(PTE_CONT));
231+
return set_pte_bit(pte, __pgprot(PTE_TYPE_PAGE));
231232
}
232233

233234
static inline pte_t pte_mknoncont(pte_t pte)
234235
{
235236
return clear_pte_bit(pte, __pgprot(PTE_CONT));
236237
}
237238

239+
static inline pmd_t pmd_mkcont(pmd_t pmd)
240+
{
241+
return __pmd(pmd_val(pmd) | PMD_SECT_CONT);
242+
}
243+
238244
static inline void set_pte(pte_t *ptep, pte_t pte)
239245
{
240246
*ptep = pte;
@@ -304,7 +310,7 @@ static inline void set_pte_at(struct mm_struct *mm, unsigned long addr,
304310
/*
305311
* Hugetlb definitions.
306312
*/
307-
#define HUGE_MAX_HSTATE 2
313+
#define HUGE_MAX_HSTATE 4
308314
#define HPAGE_SHIFT PMD_SHIFT
309315
#define HPAGE_SIZE (_AC(1, UL) << HPAGE_SHIFT)
310316
#define HPAGE_MASK (~(HPAGE_SIZE - 1))

0 commit comments

Comments
 (0)