Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754655Ab3G2JjI (ORCPT ); Mon, 29 Jul 2013 05:39:08 -0400 Received: from mail-oa0-f54.google.com ([209.85.219.54]:33277 "EHLO mail-oa0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751112Ab3G2JjG (ORCPT ); Mon, 29 Jul 2013 05:39:06 -0400 MIME-Version: 1.0 In-Reply-To: <1375075701-5998-9-git-send-email-iamjoonsoo.kim@lge.com> References: <1375075701-5998-1-git-send-email-iamjoonsoo.kim@lge.com> <1375075701-5998-9-git-send-email-iamjoonsoo.kim@lge.com> Date: Mon, 29 Jul 2013 17:39:05 +0800 Message-ID: Subject: Re: [PATCH v3 8/9] mm, hugetlb: remove decrement_hugepage_resv_vma() From: Hillf Danton To: Joonsoo Kim Cc: Andrew Morton , Rik van Riel , Mel Gorman , Michal Hocko , "Aneesh Kumar K.V" , KAMEZAWA Hiroyuki , Hugh Dickins , Davidlohr Bueso , David Gibson , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Joonsoo Kim , Wanpeng Li , Naoya Horiguchi Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3102 Lines: 81 On Mon, Jul 29, 2013 at 1:28 PM, Joonsoo Kim wrote: > 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. > > Reviewed-by: Wanpeng Li > Reviewed-by: Aneesh Kumar K.V > Signed-off-by: Joonsoo Kim > Acked-by: Hillf Danton > diff --git a/mm/hugetlb.c b/mm/hugetlb.c > index ca15854..4b1b043 100644 > --- a/mm/hugetlb.c > +++ b/mm/hugetlb.c > @@ -434,25 +434,6 @@ static int is_vma_resv_set(struct vm_area_struct *vma, unsigned long flag) > 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_area_struct *vma) > { > 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; > } > } > -- > 1.7.9.5 > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/