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

Commit 42b88bef authored by David Gibson's avatar David Gibson Committed by Linus Torvalds
Browse files

[PATCH] hugepage: is_aligned_hugepage_range() cleanup 



Quite a long time back, prepare_hugepage_range() replaced
is_aligned_hugepage_range() as the callback from mm/mmap.c to arch code to
verify if an address range is suitable for a hugepage mapping.
is_aligned_hugepage_range() stuck around, but only to implement
prepare_hugepage_range() on archs which didn't implement their own.

Most archs (everything except ia64 and powerpc) used the same
implementation of is_aligned_hugepage_range().  On powerpc, which
implements its own prepare_hugepage_range(), the custom version was never
used.

In addition, "is_aligned_hugepage_range()" was a bad name, because it
suggests it returns true iff the given range is a good hugepage range,
whereas in fact it returns 0-or-error (so the sense is reversed).

This patch cleans up by abolishing is_aligned_hugepage_range().  Instead
prepare_hugepage_range() is defined directly.  Most archs use the default
version, which simply checks the given region is aligned to the size of a
hugepage.  ia64 and powerpc define custom versions.  The ia64 one simply
checks that the range is in the correct address space region in addition to
being suitably aligned.  The powerpc version (just as previously) checks
for suitable addresses, and if necessary performs low-level MMU frobbing to
set up new areas for use by hugepages.

No libhugetlbfs testsuite regressions on ppc64 (POWER5 LPAR).

Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
Signed-off-by: default avatarZhang Yanmin <yanmin.zhang@intel.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: William Lee Irwin III <wli@holomorphy.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 3915bcf3

arch/i386/mm/hugetlbpage.c

+0 −12
Original line number Diff line number Diff line
@@ -48,18 +48,6 @@ pte_t *huge_pte_offset(struct mm_struct *mm, unsigned long addr) 
	return (pte_t *) pmd;

}



/*

 * This function checks for proper alignment of input addr and len parameters.

 */

int is_aligned_hugepage_range(unsigned long addr, unsigned long len)

{

	if (len & ~HPAGE_MASK)

		return -EINVAL;

	if (addr & ~HPAGE_MASK)

		return -EINVAL;

	return 0;

}



#if 0	/* This is just for testing */

struct page *

follow_huge_addr(struct mm_struct *mm, unsigned long address, int write)

arch/ia64/mm/hugetlbpage.c

+3 −2
Original line number Diff line number Diff line
@@ -68,9 +68,10 @@ huge_pte_offset (struct mm_struct *mm, unsigned long addr) 
#define mk_pte_huge(entry) { pte_val(entry) |= _PAGE_P; }



/*

 * This function checks for proper alignment of input addr and len parameters.

 * Don't actually need to do any preparation, but need to make sure

 * the address is in the right region.

 */

int is_aligned_hugepage_range(unsigned long addr, unsigned long len)

int prepare_hugepage_range(unsigned long addr, unsigned long len)

{

	if (len & ~HPAGE_MASK)

		return -EINVAL;

arch/powerpc/mm/hugetlbpage.c

+0 −15
Original line number Diff line number Diff line
@@ -133,21 +133,6 @@ pte_t huge_ptep_get_and_clear(struct mm_struct *mm, unsigned long addr, 
	return __pte(old);

}



/*

 * This function checks for proper alignment of input addr and len parameters.

 */

int is_aligned_hugepage_range(unsigned long addr, unsigned long len)

{

	if (len & ~HPAGE_MASK)

		return -EINVAL;

	if (addr & ~HPAGE_MASK)

		return -EINVAL;

	if (! (within_hugepage_low_range(addr, len)

	       || within_hugepage_high_range(addr, len)) )

		return -EINVAL;

	return 0;

}



struct slb_flush_info {

	struct mm_struct *mm;

	u16 newareas;

arch/sh/mm/hugetlbpage.c

+0 −12
Original line number Diff line number Diff line
@@ -84,18 +84,6 @@ pte_t huge_ptep_get_and_clear(struct mm_struct *mm, unsigned long addr, 
	return entry;

}



/*

 * This function checks for proper alignment of input addr and len parameters.

 */

int is_aligned_hugepage_range(unsigned long addr, unsigned long len)

{

	if (len & ~HPAGE_MASK)

		return -EINVAL;

	if (addr & ~HPAGE_MASK)

		return -EINVAL;

	return 0;

}



struct page *follow_huge_addr(struct mm_struct *mm,

			      unsigned long address, int write)

{

arch/sh64/mm/hugetlbpage.c

+0 −12
Original line number Diff line number Diff line
@@ -84,18 +84,6 @@ pte_t huge_ptep_get_and_clear(struct mm_struct *mm, unsigned long addr, 
	return entry;

}



/*

 * This function checks for proper alignment of input addr and len parameters.

 */

int is_aligned_hugepage_range(unsigned long addr, unsigned long len)

{

	if (len & ~HPAGE_MASK)

		return -EINVAL;

	if (addr & ~HPAGE_MASK)

		return -EINVAL;

	return 0;

}



struct page *follow_huge_addr(struct mm_struct *mm,

			      unsigned long address, int write)

{