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

Commit 4bfc130d authored by Xiao Guangrong's avatar Xiao Guangrong Committed by Linus Torvalds
Browse files

hugetlbfs: fix hugetlb_get_unmapped_area() 



Use/update cached_hole_size and free_area_cache properly to speedup
finding of a free region.

Signed-off-by: default avatarXiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Michal Hocko <mhocko@suse.cz>
Cc: Hillf Danton <dhillf@gmail.com>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent aad6ec37

fs/hugetlbfs/inode.c

+11 −4
Original line number Original line Diff line number Diff line
@@ -154,10 +154,12 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr, 
			return addr;

			return addr;

	}

	}





	if (len > mm->cached_hole_size)

		start_addr = mm->free_area_cache;

		start_addr = mm->free_area_cache;



	else {

	if (len <= mm->cached_hole_size)

		start_addr = TASK_UNMAPPED_BASE;

		start_addr = TASK_UNMAPPED_BASE;

		mm->cached_hole_size = 0;

	}





full_search:

full_search:

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

	addr = ALIGN(start_addr, huge_page_size(h));
@@ -171,13 +173,18 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr, 
			 */

			 */

			if (start_addr != TASK_UNMAPPED_BASE) {

			if (start_addr != TASK_UNMAPPED_BASE) {

				start_addr = TASK_UNMAPPED_BASE;

				start_addr = TASK_UNMAPPED_BASE;

				mm->cached_hole_size = 0;

				goto full_search;

				goto full_search;

			}

			}

			return -ENOMEM;

			return -ENOMEM;

		}

		}





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

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

			mm->free_area_cache = addr + len;

			return addr;

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

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

	}

	}

}

}