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

Commit 084bd298 authored by Steve Capper's avatar Steve Capper
Browse files

ARM64: mm: HugeTLB support. 



Add huge page support to ARM64, different huge page sizes are
supported depending on the size of normal pages:

PAGE_SIZE is 4KB:
   2MB - (pmds) these can be allocated at any time.
1024MB - (puds) usually allocated on bootup with the command line
         with something like: hugepagesz=1G hugepages=6

PAGE_SIZE is 64KB:
 512MB - (pmds) usually allocated on bootup via command line.

Signed-off-by: default avatarSteve Capper <steve.capper@linaro.org>
Acked-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent 59911ca4

arch/arm64/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -180,6 +180,15 @@ 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



config ARCH_WANT_GENERAL_HUGETLB

	def_bool y



config ARCH_WANT_HUGE_PMD_SHARE

	def_bool y if !ARM64_64K_PAGES



source "mm/Kconfig"



endmenu

arch/arm64/include/asm/hugetlb.h

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

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

 *

 * Copyright (C) 2013 Linaro 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_HUGETLB_H

#define __ASM_HUGETLB_H



#include <asm-generic/hugetlb.h>

#include <asm/page.h>



static inline pte_t huge_ptep_get(pte_t *ptep)

{

	return *ptep;

}



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);

}



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_HUGETLB_H */

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

+8 −0
Original line number Diff line number Diff line
@@ -25,12 +25,19 @@ 
/*

 * Hardware page table definitions.

 *

 * Level 1 descriptor (PUD).

 */



#define PUD_TABLE_BIT		(_AT(pgdval_t, 1) << 1)



/*

 * Level 2 descriptor (PMD).

 */

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

#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)



/*

 * Section
@@ -53,6 +60,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_USER		(_AT(pteval_t, 1) << 6)		/* AP[1] */

#define PTE_RDONLY		(_AT(pteval_t, 1) << 7)		/* AP[2] */

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

arch/arm64/include/asm/pgtable.h

+11 −2
Original line number Diff line number Diff line
@@ -173,8 +173,17 @@ static inline void set_pte_at(struct mm_struct *mm, unsigned long addr, 
/*

 * Huge pte definitions.

 */

#define pte_huge(pte)		((pte_val(pte) & PTE_TYPE_MASK) == PTE_TYPE_HUGEPAGE)

#define pte_mkhuge(pte)		(__pte((pte_val(pte) & ~PTE_TYPE_MASK) | PTE_TYPE_HUGEPAGE))

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

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



/*

 * Hugetlb definitions.

 */

#define HUGE_MAX_HSTATE		2

#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)



#define __HAVE_ARCH_PTE_SPECIAL

arch/arm64/mm/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -2,3 +2,4 @@ obj-y := dma-mapping.o extable.o fault.o init.o \ 
				   cache.o copypage.o flush.o \

				   ioremap.o mmap.o pgd.o mmu.o \

				   context.o tlb.o proc.o

obj-$(CONFIG_HUGETLB_PAGE)	+= hugetlbpage.o