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

Commit 08659355 authored by Michel Lespinasse's avatar Michel Lespinasse Committed by Linus Torvalds
Browse files

mm: use vm_unmapped_area() in hugetlbfs 



Update the hugetlb_get_unmapped_area function to make use of
vm_unmapped_area() instead of implementing a brute force search.

Signed-off-by: default avatarMichel Lespinasse <walken@google.com>
Reviewed-by: default avatarRik van Riel <riel@redhat.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Chris Metcalf <cmetcalf@tilera.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 7d025059

fs/hugetlbfs/inode.c

+8 −34
Original line number Diff line number Diff line
@@ -151,8 +151,8 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr, 
{

	struct mm_struct *mm = current->mm;

	struct vm_area_struct *vma;

	unsigned long start_addr;

	struct hstate *h = hstate_file(file);

	struct vm_unmapped_area_info info;



	if (len & ~huge_page_mask(h))

		return -EINVAL;
@@ -173,39 +173,13 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr, 
			return addr;

	}



	if (len > mm->cached_hole_size)

		start_addr = mm->free_area_cache;

	else {

		start_addr = TASK_UNMAPPED_BASE;

		mm->cached_hole_size = 0;

	}



full_search:

	addr = ALIGN(start_addr, huge_page_size(h));



	for (vma = find_vma(mm, addr); ; vma = vma->vm_next) {

		/* At this point:  (!vma || addr < vma->vm_end). */

		if (TASK_SIZE - len < addr) {

			/*

			 * Start a new search - just in case we missed

			 * some holes.

			 */

			if (start_addr != TASK_UNMAPPED_BASE) {

				start_addr = TASK_UNMAPPED_BASE;

				mm->cached_hole_size = 0;

				goto full_search;

			}

			return -ENOMEM;

		}



		if (!vma || addr + len <= vma->vm_start) {

			mm->free_area_cache = addr + len;

			return addr;

		}

		if (addr + mm->cached_hole_size < vma->vm_start)

			mm->cached_hole_size = vma->vm_start - addr;

		addr = ALIGN(vma->vm_end, huge_page_size(h));

	}

	info.flags = 0;

	info.length = len;

	info.low_limit = TASK_UNMAPPED_BASE;

	info.high_limit = TASK_SIZE;

	info.align_mask = PAGE_MASK & ~huge_page_mask(h);

	info.align_offset = 0;

	return vm_unmapped_area(&info);

}

#endif