Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1355e2a6 authored by Catalin Marinas's avatar Catalin Marinas Committed by Steve Capper
Browse files

ARM: mm: HugeTLB support for LPAE systems. 



This patch adds support for hugetlbfs based on the x86 implementation.
It allows mapping of 2MB sections (see Documentation/vm/hugetlbpage.txt
for usage). The 64K pages configuration is not supported (section size
is 512MB in this case).

Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
[steve.capper@linaro.org: symbolic constants replace numbers in places.
Split up into multiple files, to simplify future non-LPAE support,
removed huge_pmd_share code, as this is very rarely executed,
Added PROT_NONE support].
Signed-off-by: default avatarSteve Capper <steve.capper@linaro.org>
Reviewed-by: default avatarWill Deacon <will.deacon@arm.com>
parent 0b19f933

arch/arm/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -1707,6 +1707,10 @@ config HW_PERF_EVENTS 
	  Enable hardware performance counter support for perf events. If

	  disabled, perf events will use software events only.



config SYS_SUPPORTS_HUGETLBFS

       def_bool y

       depends on ARM_LPAE



source "mm/Kconfig"



config FORCE_MAX_ZONEORDER

arch/arm/include/asm/hugetlb-3level.h

0 → 100644
+71 −0
Original line number Diff line number Diff line 
/*

 * arch/arm/include/asm/hugetlb-3level.h

 *

 * Copyright (C) 2012 ARM Ltd.

 *

 * Based on arch/x86/include/asm/hugetlb.h.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA

 */



#ifndef _ASM_ARM_HUGETLB_3LEVEL_H

#define _ASM_ARM_HUGETLB_3LEVEL_H





/*

 * If our huge pte is non-zero then mark the valid bit.

 * This allows pte_present(huge_ptep_get(ptep)) to return true for non-zero

 * ptes.

 * (The valid bit is automatically cleared by set_pte_at for PROT_NONE ptes).

 */

static inline pte_t huge_ptep_get(pte_t *ptep)

{

	pte_t retval = *ptep;

	if (pte_val(retval))

		pte_val(retval) |= L_PTE_VALID;

	return retval;

}



static inline void set_huge_pte_at(struct mm_struct *mm, unsigned long addr,

				   pte_t *ptep, pte_t pte)

{

	set_pte_at(mm, addr, ptep, pte);

}



static inline void huge_ptep_clear_flush(struct vm_area_struct *vma,

					 unsigned long addr, pte_t *ptep)

{

	ptep_clear_flush(vma, addr, ptep);

}



static inline void huge_ptep_set_wrprotect(struct mm_struct *mm,

					   unsigned long addr, pte_t *ptep)

{

	ptep_set_wrprotect(mm, addr, ptep);

}



static inline pte_t huge_ptep_get_and_clear(struct mm_struct *mm,

					    unsigned long addr, pte_t *ptep)

{

	return ptep_get_and_clear(mm, addr, ptep);

}



static inline int huge_ptep_set_access_flags(struct vm_area_struct *vma,

					     unsigned long addr, pte_t *ptep,

					     pte_t pte, int dirty)

{

	return ptep_set_access_flags(vma, addr, ptep, pte, dirty);

}



#endif /* _ASM_ARM_HUGETLB_3LEVEL_H */

arch/arm/include/asm/hugetlb.h

0 → 100644
+84 −0
Original line number Diff line number Diff line 
/*

 * arch/arm/include/asm/hugetlb.h

 *

 * Copyright (C) 2012 ARM Ltd.

 *

 * Based on arch/x86/include/asm/hugetlb.h

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA

 */



#ifndef _ASM_ARM_HUGETLB_H

#define _ASM_ARM_HUGETLB_H



#include <asm/page.h>

#include <asm-generic/hugetlb.h>



#include <asm/hugetlb-3level.h>



static inline void hugetlb_free_pgd_range(struct mmu_gather *tlb,

					  unsigned long addr, unsigned long end,

					  unsigned long floor,

					  unsigned long ceiling)

{

	free_pgd_range(tlb, addr, end, floor, ceiling);

}





static inline int is_hugepage_only_range(struct mm_struct *mm,

					 unsigned long addr, unsigned long len)

{

	return 0;

}



static inline int prepare_hugepage_range(struct file *file,

					 unsigned long addr, unsigned long len)

{

	struct hstate *h = hstate_file(file);

	if (len & ~huge_page_mask(h))

		return -EINVAL;

	if (addr & ~huge_page_mask(h))

		return -EINVAL;

	return 0;

}



static inline void hugetlb_prefault_arch_hook(struct mm_struct *mm)

{

}



static inline int huge_pte_none(pte_t pte)

{

	return pte_none(pte);

}



static inline pte_t huge_pte_wrprotect(pte_t pte)

{

	return pte_wrprotect(pte);

}



static inline int arch_prepare_hugepage(struct page *page)

{

	return 0;

}



static inline void arch_release_hugepage(struct page *page)

{

}



static inline void arch_clear_hugepage_flags(struct page *page)

{

	clear_bit(PG_dcache_clean, &page->flags);

}



#endif /* _ASM_ARM_HUGETLB_H */

arch/arm/include/asm/pgtable-3level-hwdef.h

+2 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
#define PMD_TYPE_FAULT		(_AT(pmdval_t, 0) << 0)

#define PMD_TYPE_TABLE		(_AT(pmdval_t, 3) << 0)

#define PMD_TYPE_SECT		(_AT(pmdval_t, 1) << 0)

#define PMD_TABLE_BIT		(_AT(pmdval_t, 1) << 1)

#define PMD_BIT4		(_AT(pmdval_t, 0))

#define PMD_DOMAIN(x)		(_AT(pmdval_t, 0))

#define PMD_APTABLE_SHIFT	(61)
@@ -66,6 +67,7 @@ 
#define PTE_TYPE_MASK		(_AT(pteval_t, 3) << 0)

#define PTE_TYPE_FAULT		(_AT(pteval_t, 0) << 0)

#define PTE_TYPE_PAGE		(_AT(pteval_t, 3) << 0)

#define PTE_TABLE_BIT		(_AT(pteval_t, 1) << 1)

#define PTE_BUFFERABLE		(_AT(pteval_t, 1) << 2)		/* AttrIndx[0] */

#define PTE_CACHEABLE		(_AT(pteval_t, 1) << 3)		/* AttrIndx[1] */

#define PTE_EXT_SHARED		(_AT(pteval_t, 3) << 8)		/* SH[1:0], inner shareable */

arch/arm/include/asm/pgtable-3level.h

+11 −0
Original line number Diff line number Diff line
@@ -61,6 +61,14 @@ 


#define USER_PTRS_PER_PGD	(PAGE_OFFSET / PGDIR_SIZE)



/*

 * Hugetlb definitions.

 */

#define HPAGE_SHIFT		PMD_SHIFT

#define HPAGE_SIZE		(_AC(1, UL) << HPAGE_SHIFT)

#define HPAGE_MASK		(~(HPAGE_SIZE - 1))

#define HUGETLB_PAGE_ORDER	(HPAGE_SHIFT - PAGE_SHIFT)



/*

 * "Linux" PTE definitions for LPAE.

 *
@@ -185,6 +193,9 @@ static inline pmd_t *pmd_offset(pud_t *pud, unsigned long addr) 


#define set_pte_ext(ptep,pte,ext) cpu_set_pte_ext(ptep,__pte(pte_val(pte)|(ext)))



#define pte_huge(pte)		(pte_val(pte) && !(pte_val(pte) & PTE_TABLE_BIT))

#define pte_mkhuge(pte)		(__pte(pte_val(pte) & ~PTE_TABLE_BIT))



#endif /* __ASSEMBLY__ */



#endif /* _ASM_PGTABLE_3LEVEL_H */