From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from psmtp.com (na3sys010amx148.postini.com [74.125.245.148]) by kanga.kvack.org (Postfix) with SMTP id C14706B0037 for ; Tue, 30 Jul 2013 10:21:16 -0400 (EDT) Date: Tue, 30 Jul 2013 16:21:13 +0200 From: Michal Hocko Subject: Re: + mm-hugetlb-remove-decrement_hugepage_resv_vma.patch added to -mm tree Message-ID: <20130730142113.GE15847@dhcp22.suse.cz> References: <51f6e7bd.8VET6Psjyo6p2IfH%akpm@linux-foundation.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <51f6e7bd.8VET6Psjyo6p2IfH%akpm@linux-foundation.org> Sender: owner-linux-mm@kvack.org List-ID: To: akpm@linux-foundation.org Cc: mm-commits@vger.kernel.org, riel@redhat.com, n-horiguchi@ah.jp.nec.com, mgorman@suse.de, liwanp@linux.vnet.ibm.com, kamezawa.hiroyu@jp.fujitsu.com, hughd@google.com, dhillf@gmail.com, davidlohr.bueso@hp.com, david@gibson.dropbear.id.au, aneesh.kumar@linux.vnet.ibm.com, iamjoonsoo.kim@lge.com, linux-mm@kvack.org > From: Joonsoo Kim > Subject: mm, hugetlb: remove decrement_hugepage_resv_vma() > > Now, Checking condition of decrement_hugepage_resv_vma() and > vma_has_reserves() is same, so we can clean-up this function with > vma_has_reserves(). Additionally, decrement_hugepage_resv_vma() has only > one call site, so we can remove function and embed it into > dequeue_huge_page_vma() directly. This patch implement it. > > Signed-off-by: Joonsoo Kim > Reviewed-by: Wanpeng Li > Reviewed-by: Aneesh Kumar K.V > Acked-by: Hillf Danton > Cc: Michal Hocko Acked-by: Michal Hocko > Cc: Naoya Horiguchi > Cc: Rik van Riel > Cc: Mel Gorman > Cc: "Aneesh Kumar K.V" > Cc: KAMEZAWA Hiroyuki > Cc: Hugh Dickins > Cc: Davidlohr Bueso > Cc: David Gibson > Signed-off-by: Andrew Morton > --- > > mm/hugetlb.c | 31 ++++++++++--------------------- > 1 file changed, 10 insertions(+), 21 deletions(-) > > diff -puN mm/hugetlb.c~mm-hugetlb-remove-decrement_hugepage_resv_vma mm/hugetlb.c > --- a/mm/hugetlb.c~mm-hugetlb-remove-decrement_hugepage_resv_vma > +++ a/mm/hugetlb.c > @@ -434,25 +434,6 @@ static int is_vma_resv_set(struct vm_are > return (get_vma_private_data(vma) & flag) != 0; > } > > -/* Decrement the reserved pages in the hugepage pool by one */ > -static void decrement_hugepage_resv_vma(struct hstate *h, > - struct vm_area_struct *vma) > -{ > - if (vma->vm_flags & VM_NORESERVE) > - return; > - > - if (vma->vm_flags & VM_MAYSHARE) { > - /* Shared mappings always use reserves */ > - h->resv_huge_pages--; > - } else if (is_vma_resv_set(vma, HPAGE_RESV_OWNER)) { > - /* > - * Only the process that called mmap() has reserves for > - * private mappings. > - */ > - h->resv_huge_pages--; > - } > -} > - > /* Reset counters to 0 and clear all HPAGE_RESV_* flags */ > void reset_vma_resv_huge_pages(struct vm_area_struct *vma) > { > @@ -466,10 +447,18 @@ static int vma_has_reserves(struct vm_ar > { > if (vma->vm_flags & VM_NORESERVE) > return 0; > + > + /* Shared mappings always use reserves */ > if (vma->vm_flags & VM_MAYSHARE) > return 1; > + > + /* > + * Only the process that called mmap() has reserves for > + * private mappings. > + */ > if (is_vma_resv_set(vma, HPAGE_RESV_OWNER)) > return 1; > + > return 0; > } > > @@ -564,8 +553,8 @@ retry_cpuset: > if (cpuset_zone_allowed_softwall(zone, htlb_alloc_mask)) { > page = dequeue_huge_page_node(h, zone_to_nid(zone)); > if (page) { > - if (!avoid_reserve) > - decrement_hugepage_resv_vma(h, vma); > + if (!avoid_reserve && vma_has_reserves(vma)) > + h->resv_huge_pages--; > break; > } > } > _ > > Patches currently in -mm which might be from iamjoonsoo.kim@lge.com are > > mm-hugetlb-move-up-the-code-which-check-availability-of-free-huge-page.patch > mm-hugetlb-trivial-commenting-fix.patch > mm-hugetlb-clean-up-alloc_huge_page.patch > mm-hugetlb-fix-and-clean-up-node-iteration-code-to-alloc-or-free.patch > mm-hugetlb-remove-redundant-list_empty-check-in-gather_surplus_pages.patch > mm-hugetlb-do-not-use-a-page-in-page-cache-for-cow-optimization.patch > mm-hugetlb-add-vm_noreserve-check-in-vma_has_reserves.patch > mm-hugetlb-remove-decrement_hugepage_resv_vma.patch > mm-hugetlb-decrement-reserve-count-if-vm_noreserve-alloc-page-cache.patch > mm-hugetlb-decrement-reserve-count-if-vm_noreserve-alloc-page-cache-fix.patch > -- Michal Hocko SUSE Labs -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org