Messages in this thread | | | Date | Mon, 22 Jul 2013 16:45:48 +0200 | From | Michal Hocko <> | Subject | Re: [PATCH 1/9] mm, hugetlb: move up the code which check availability of free huge page |
| |
On Mon 15-07-13 18:52:39, Joonsoo Kim wrote: > We don't need to proceede the processing if we don't have any usable > free huge page. So move this code up. > > Signed-off-by: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Acked-by: Michal Hocko <mhocko@suse.cz>
after you add a note about hugetlb_lock which stabilizes hstate so the retry doesn't have to re-check reserves and other stuff as suggested by Aneesh.
> diff --git a/mm/hugetlb.c b/mm/hugetlb.c > index e2bfbf7..d87f70b 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 > @@ -550,11 +546,16 @@ retry_cpuset: > */ > if (!vma_has_reserves(vma) && > h->free_huge_pages - h->resv_huge_pages == 0) > - goto err; > + return NULL; > > /* If reserves cannot be used, ensure enough pages are in the pool */ > if (avoid_reserve && h->free_huge_pages - h->resv_huge_pages == 0) > - goto err; > + return NULL; > + > +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) { > @@ -572,10 +573,6 @@ retry_cpuset: > if (unlikely(!put_mems_allowed(cpuset_mems_cookie) && !page)) > goto retry_cpuset; > return page; > - > -err: > - mpol_cond_put(mpol); > - return NULL; > } > > static void update_and_free_page(struct hstate *h, struct page *page) > -- > 1.7.9.5 >
-- Michal Hocko SUSE Labs
| |