On Mon, Jul 22, 2013 at 05:36:22PM +0900, Joonsoo Kim wrote:
>In this time we are holding a hugetlb_lock, so hstate values can't
>be changed. If we don't have any usable free huge page in this time,
>we don't need to proceede the processing. So move this code up.
>
>Signed-off-by: Joonsoo Kim <iamjoonsoo.kim@xxxxxxx>
>
Reviewed-by: Wanpeng Li <liwanp@xxxxxxxxxxxxxxxxxx>
>diff --git a/mm/hugetlb.c b/mm/hugetlb.c
>index e2bfbf7..fc4988c 100644
>--- a/mm/hugetlb.c
>+++ b/mm/hugetlb.c
>@@ -539,10 +539,6 @@ static struct page *dequeue_huge_page_vma(struct hstate *h,
> struct zoneref *z;
> unsigned int cpuset_mems_cookie;
>
>-retry_cpuset:
>- cpuset_mems_cookie = get_mems_allowed();
>- zonelist = huge_zonelist(vma, address,
>- htlb_alloc_mask, &mpol, &nodemask);
> /*
> * A child process with MAP_PRIVATE mappings created by their parent
> * have no page reserves. This check ensures that reservations are
>@@ -556,6 +552,11 @@ retry_cpuset:
> if (avoid_reserve && h->free_huge_pages - h->resv_huge_pages == 0)
> goto err;
>
>+retry_cpuset:
>+ cpuset_mems_cookie = get_mems_allowed();
>+ zonelist = huge_zonelist(vma, address,
>+ htlb_alloc_mask, &mpol, &nodemask);
>+
> for_each_zone_zonelist_nodemask(zone, z, zonelist,
> MAX_NR_ZONES - 1, nodemask) {
> if (cpuset_zone_allowed_softwall(zone, htlb_alloc_mask)) {
>@@ -574,7 +575,6 @@ retry_cpuset:
> return page;
>
> err:
>- mpol_cond_put(mpol);
> return NULL;
> }
>
>--
>1.7.9.5
>
>--
>To unsubscribe, send a message with 'unsubscribe linux-mm' in
>the body to majordomo@xxxxxxxxx. For more info on Linux MM,
>see: http://www.linux-mm.org/ .
>Don't email: <a href=mailto:"dont@xxxxxxxxx";> email@xxxxxxxxx </a>
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@xxxxxxxxx. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@xxxxxxxxx";> email@xxxxxxxxx </a>