Commit a5516438 authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds
Browse files

hugetlb: modular state for hugetlb page size 



The goal of this patchset is to support multiple hugetlb page sizes.  This
is achieved by introducing a new struct hstate structure, which
encapsulates the important hugetlb state and constants (eg.  huge page
size, number of huge pages currently allocated, etc).

The hstate structure is then passed around the code which requires these
fields, they will do the right thing regardless of the exact hstate they
are operating on.

This patch adds the hstate structure, with a single global instance of it
(default_hstate), and does the basic work of converting hugetlb to use the
hstate.

Future patches will add more hstate structures to allow for different
hugetlbfs mounts to have different page sizes.

[akpm@linux-foundation.org: coding-style fixes]
Acked-by: default avatarAdam Litke <agl@us.ibm.com>
Acked-by: default avatarNishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarNick Piggin <npiggin@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b7ba30c6

arch/ia64/mm/hugetlbpage.c

+4 −3
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
unsigned int hpage_shift=HPAGE_SHIFT_DEFAULT;



pte_t *

huge_pte_alloc (struct mm_struct *mm, unsigned long addr)

huge_pte_alloc(struct mm_struct *mm, unsigned long addr, unsigned long sz)

{

	unsigned long taddr = htlbpage_to_page(addr);

	pgd_t *pgd;
@@ -75,7 +75,8 @@ int huge_pmd_unshare(struct mm_struct *mm, unsigned long *addr, pte_t *ptep) 
 * Don't actually need to do any preparation, but need to make sure

 * the address is in the right region.

 */

int prepare_hugepage_range(unsigned long addr, unsigned long len)

int prepare_hugepage_range(struct file *file,

			unsigned long addr, unsigned long len)

{

	if (len & ~HPAGE_MASK)

		return -EINVAL;
@@ -149,7 +150,7 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr, u 


	/* Handle MAP_FIXED */

	if (flags & MAP_FIXED) {

		if (prepare_hugepage_range(addr, len))

		if (prepare_hugepage_range(file, addr, len))

			return -EINVAL;

		return addr;

	}

arch/powerpc/mm/hugetlbpage.c

+2 −1
Original line number Diff line number Diff line
@@ -128,7 +128,8 @@ pte_t *huge_pte_offset(struct mm_struct *mm, unsigned long addr) 
	return NULL;

}



pte_t *huge_pte_alloc(struct mm_struct *mm, unsigned long addr)

pte_t *huge_pte_alloc(struct mm_struct *mm,

			unsigned long addr, unsigned long sz)

{

	pgd_t *pg;

	pud_t *pu;

arch/s390/mm/hugetlbpage.c

+2 −1
Original line number Diff line number Diff line
@@ -72,7 +72,8 @@ void arch_release_hugepage(struct page *page) 
	page[1].index = 0;

}



pte_t *huge_pte_alloc(struct mm_struct *mm, unsigned long addr)

pte_t *huge_pte_alloc(struct mm_struct *mm,

			unsigned long addr, unsigned long sz)

{

	pgd_t *pgdp;

	pud_t *pudp;

arch/sh/mm/hugetlbpage.c

+2 −1
Original line number Diff line number Diff line
@@ -22,7 +22,8 @@ 
#include <asm/tlbflush.h>

#include <asm/cacheflush.h>



pte_t *huge_pte_alloc(struct mm_struct *mm, unsigned long addr)

pte_t *huge_pte_alloc(struct mm_struct *mm,

			unsigned long addr, unsigned long sz)

{

	pgd_t *pgd;

	pud_t *pud;

arch/sparc64/mm/hugetlbpage.c

+3 −2
Original line number Diff line number Diff line
@@ -175,7 +175,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr, 
		return -ENOMEM;



	if (flags & MAP_FIXED) {

		if (prepare_hugepage_range(addr, len))

		if (prepare_hugepage_range(file, addr, len))

			return -EINVAL;

		return addr;

	}
@@ -195,7 +195,8 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr, 
				pgoff, flags);

}



pte_t *huge_pte_alloc(struct mm_struct *mm, unsigned long addr)

pte_t *huge_pte_alloc(struct mm_struct *mm,

			unsigned long addr, unsigned long sz)

{

	pgd_t *pgd;

	pud_t *pud;

CRA Git | Maintained and supported by SUSTech CRA and CCSE