Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

[sfrench/cifs-2.6.git] / arch / powerpc / mm / hugetlbpage.c

diff --git a/arch/powerpc/mm/hugetlbpage.c b/arch/powerpc/mm/hugetlbpage.c
index 54131b877da36cb3a827000d802ca76ce82507ad..7370f9f33e2943d038025a6d05ba6b4e02755beb 100644 (file)
--- a/arch/powerpc/mm/hugetlbpage.c
+++ b/arch/powerpc/mm/hugetlbpage.c
@@ -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;
@@ -549,6 +534,17 @@ fail:
        return addr;
 }
 
+static int htlb_check_hinted_area(unsigned long addr, unsigned long len)
+{
+       struct vm_area_struct *vma;
+
+       vma = find_vma(current->mm, addr);
+       if (!vma || ((addr + len) <= vma->vm_start))
+               return 0;
+
+       return -ENOMEM;
+}
+
 static unsigned long htlb_get_low_area(unsigned long len, u16 segmask)
 {
        unsigned long addr = 0;
@@ -618,15 +614,28 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
        if (!cpu_has_feature(CPU_FTR_16M_PAGE))
                return -EINVAL;
 
+       /* Paranoia, caller should have dealt with this */
+       BUG_ON((addr + len)  < addr);
+
        if (test_thread_flag(TIF_32BIT)) {
+               /* Paranoia, caller should have dealt with this */
+               BUG_ON((addr + len) > 0x100000000UL);
+
                curareas = current->mm->context.low_htlb_areas;
 
-               /* First see if we can do the mapping in the existing
-                * low areas */
+               /* First see if we can use the hint address */
+               if (addr && (htlb_check_hinted_area(addr, len) == 0)) {
+                       areamask = LOW_ESID_MASK(addr, len);
+                       if (open_low_hpage_areas(current->mm, areamask) == 0)
+                               return addr;
+               }
+
+               /* Next see if we can map in the existing low areas */
                addr = htlb_get_low_area(len, curareas);
                if (addr != -ENOMEM)
                        return addr;
 
+               /* Finally go looking for areas to open */
                lastshift = 0;
                for (areamask = LOW_ESID_MASK(0x100000000UL-len, len);
                     ! lastshift; areamask >>=1) {
@@ -641,12 +650,22 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
        } else {
                curareas = current->mm->context.high_htlb_areas;
 
-               /* First see if we can do the mapping in the existing
-                * high areas */
+               /* First see if we can use the hint address */
+               /* We discourage 64-bit processes from doing hugepage
+                * mappings below 4GB (must use MAP_FIXED) */
+               if ((addr >= 0x100000000UL)
+                   && (htlb_check_hinted_area(addr, len) == 0)) {
+                       areamask = HTLB_AREA_MASK(addr, len);
+                       if (open_high_hpage_areas(current->mm, areamask) == 0)
+                               return addr;
+               }
+
+               /* Next see if we can map in the existing high areas */
                addr = htlb_get_high_area(len, curareas);
                if (addr != -ENOMEM)
                        return addr;
 
+               /* Finally go looking for areas to open */
                lastshift = 0;
                for (areamask = HTLB_AREA_MASK(TASK_SIZE_USER64-len, len);
                     ! lastshift; areamask >>=1) {