diff options
| author | Steve Capper <steve.capper@arm.com> | 2012-07-19 12:00:10 +0100 |
|---|---|---|
| committer | Steve Capper <steve.capper@linaro.org> | 2013-05-14 15:22:25 +0100 |
| commit | 6b5757462e052eb07f2304b591e6d02c9af1256b (patch) | |
| tree | 5065948e034f7e7f62897648c54a7a0c6c84cf56 /arch/arm/include/asm/pgtable-2level.h | |
| parent | 35ab7d4c8310839b04b7053afab4b307abb7b367 (diff) | |
ARM: mm: Transparent huge page support for non-LPAE systems.tracking-hugepages-llct-20130715.0tracking-hugepages-llct-20130708.0tracking-hugepages-llct-20130701.0tracking-hugepages-llct-20130626.0tracking-hugepages-llct-20130625.0tracking-hugepages-llct-20130618.0tracking-hugepages-llct-20130617.1tracking-hugepages-llct-20130617.0tracking-hugepages-llct-20130613.0tracking-hugepages-llct-20130610.0tracking-hugepages-llct-20130606.0tracking-hugepages-llct-20130604.1tracking-hugepages-llct-20130604.0tracking-hugepages-llct-20130521.0tracking-hugepages-llct-20130518.0tracking-hugepages-llct-20130515.1tracking-hugepages-llct-20130515.0tracking-hugepages-llct-20130514.0arm-hugepages-20130514
Much of the required code for THP has been implemented in the
earlier non-LPAE HugeTLB patch.
One more domain bit is used (to store whether or not the THP is
splitting).
Some THP helper functions are defined; and we have to re-define
pmd_page such that it distinguishes between page tables and
sections.
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Steve Capper <steve.capper@arm.com>
Diffstat (limited to 'arch/arm/include/asm/pgtable-2level.h')
| -rw-r--r-- | arch/arm/include/asm/pgtable-2level.h | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/arch/arm/include/asm/pgtable-2level.h b/arch/arm/include/asm/pgtable-2level.h index 7423ecf31808..e3b5ec2d2398 100644 --- a/arch/arm/include/asm/pgtable-2level.h +++ b/arch/arm/include/asm/pgtable-2level.h @@ -207,6 +207,7 @@ static inline pmd_t *pmd_offset(pud_t *pud, unsigned long addr) #define PMD_DOMAIN_MASK (_AT(pmdval_t, 0xF) << 5) #define PMD_DSECT_DIRTY (_AT(pmdval_t, 1) << 5) #define PMD_DSECT_AF (_AT(pmdval_t, 1) << 6) +#define PMD_DSECT_SPLITTING (_AT(pmdval_t, 1) << 7) #define PMD_BIT_FUNC(fn,op) \ static inline pmd_t pmd_##fn(pmd_t pmd) { pmd_val(pmd) op; return pmd; } @@ -285,6 +286,52 @@ PMD_BIT_FUNC(mknexec, |= PMD_SECT_XN); #define HPAGE_SIZE 0 #endif /* CONFIG_SYS_SUPPORTS_HUGETLBFS */ +#ifdef CONFIG_TRANSPARENT_HUGEPAGE +#define pmd_mkhuge(pmd) (__pmd((pmd_val(pmd) & ~PMD_TYPE_MASK) | PMD_TYPE_SECT)) + +PMD_BIT_FUNC(mksplitting, |= PMD_DSECT_SPLITTING); +#define pmd_trans_splitting(pmd) (pmd_val(pmd) & PMD_DSECT_SPLITTING) +#define pmd_trans_huge(pmd) ((pmd_val(pmd) & PMD_TYPE_MASK) == PMD_TYPE_SECT) + +static inline unsigned long pmd_pfn(pmd_t pmd) +{ + /* + * for a section, we need to mask off more of the pmd + * before looking up the pfn + */ + if ((pmd_val(pmd) & PMD_TYPE_MASK) == PMD_TYPE_SECT) + return __phys_to_pfn(pmd_val(pmd) & HPAGE_MASK); + else + return __phys_to_pfn(pmd_val(pmd) & PHYS_MASK); +} + +#define pfn_pmd(pfn,prot) pmd_modify(__pmd(__pfn_to_phys(pfn)),prot); +#define mk_pmd(page,prot) pfn_pmd(page_to_pfn(page),prot); + +static inline int has_transparent_hugepage(void) +{ + return 1; +} + +#define _PMD_HUGE(pmd) ((pmd_val(pmd) & PMD_TYPE_MASK) == PMD_TYPE_SECT) +#define _PMD_HPAGE(pmd) (phys_to_page(pmd_val(pmd) & HPAGE_MASK)) +#else +#define _PMD_HUGE(pmd) (0) +#define _PMD_HPAGE(pmd) (0) +#endif /* CONFIG_TRANSPARENT_HUGEPAGE */ + +static inline struct page *pmd_page(pmd_t pmd) +{ + /* + * for a section, we need to mask off more of the pmd + * before looking up the page as it is a section descriptor. + */ + if (_PMD_HUGE(pmd)) + return _PMD_HPAGE(pmd); + + return phys_to_page(pmd_val(pmd) & PHYS_MASK); +} + #endif /* __ASSEMBLY__ */ #endif /* _ASM_PGTABLE_2LEVEL_H */ |