From: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com> To: Joonsoo Kim <iamjoonsoo.kim@lge.com>, Andrew Morton <akpm@linux-foundation.org> Cc: Rik van Riel <riel@redhat.com>, Mel Gorman <mgorman@suse.de>, Michal Hocko <mhocko@suse.cz>, KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>, Hugh Dickins <hughd@google.com>, Davidlohr Bueso <davidlohr.bueso@hp.com>, David Gibson <david@gibson.dropbear.id.au>, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Joonsoo Kim <js1304@gmail.com>, Joonsoo Kim <iamjoonsoo.kim@lge.com> Subject: Re: [PATCH 8/9] mm, hugetlb: remove decrement_hugepage_resv_vma() Date: Mon, 15 Jul 2013 20:20:47 +0530 [thread overview] Message-ID: <87ppujj2rc.fsf@linux.vnet.ibm.com> (raw) In-Reply-To: <1373881967-16153-9-git-send-email-iamjoonsoo.kim@lge.com> Joonsoo Kim <iamjoonsoo.kim@lge.com> writes: > 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 <iamjoonsoo.kim@lge.com> Reviewed-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> > > diff --git a/mm/hugetlb.c b/mm/hugetlb.c > index f6a7a4e..ed2d0af 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
WARNING: multiple messages have this Message-ID (diff)
From: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com> To: Joonsoo Kim <iamjoonsoo.kim@lge.com>, Andrew Morton <akpm@linux-foundation.org> Cc: Rik van Riel <riel@redhat.com>, Mel Gorman <mgorman@suse.de>, Michal Hocko <mhocko@suse.cz>, KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>, Hugh Dickins <hughd@google.com>, Davidlohr Bueso <davidlohr.bueso@hp.com>, David Gibson <david@gibson.dropbear.id.au>, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Joonsoo Kim <js1304@gmail.com> Subject: Re: [PATCH 8/9] mm, hugetlb: remove decrement_hugepage_resv_vma() Date: Mon, 15 Jul 2013 20:20:47 +0530 [thread overview] Message-ID: <87ppujj2rc.fsf@linux.vnet.ibm.com> (raw) In-Reply-To: <1373881967-16153-9-git-send-email-iamjoonsoo.kim@lge.com> Joonsoo Kim <iamjoonsoo.kim@lge.com> writes: > 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 <iamjoonsoo.kim@lge.com> Reviewed-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> > > diff --git a/mm/hugetlb.c b/mm/hugetlb.c > index f6a7a4e..ed2d0af 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, 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: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2013-07-15 14:51 UTC|newest] Thread overview: 92+ messages / expand[flat|nested] mbox.gz Atom feed top 2013-07-15 9:52 [PATCH 0/9] mm, hugetlb: clean-up and possible bug fix Joonsoo Kim 2013-07-15 9:52 ` Joonsoo Kim 2013-07-15 9:52 ` [PATCH 1/9] mm, hugetlb: move up the code which check availability of free huge page Joonsoo Kim 2013-07-15 9:52 ` Joonsoo Kim 2013-07-15 14:01 ` Aneesh Kumar K.V 2013-07-15 14:01 ` Aneesh Kumar K.V 2013-07-16 1:16 ` Joonsoo Kim 2013-07-16 1:16 ` Joonsoo Kim 2013-07-16 3:36 ` Aneesh Kumar K.V 2013-07-16 3:36 ` Aneesh Kumar K.V 2013-07-16 5:10 ` Joonsoo Kim 2013-07-16 5:10 ` Joonsoo Kim 2013-07-22 14:45 ` Michal Hocko 2013-07-22 14:45 ` Michal Hocko 2013-07-15 9:52 ` [PATCH 2/9] mm, hugetlb: trivial commenting fix Joonsoo Kim 2013-07-15 9:52 ` Joonsoo Kim 2013-07-15 13:12 ` Hillf Danton 2013-07-15 13:12 ` Hillf Danton 2013-07-15 14:02 ` Aneesh Kumar K.V 2013-07-15 14:02 ` Aneesh Kumar K.V 2013-07-22 14:46 ` Michal Hocko 2013-07-22 14:46 ` Michal Hocko 2013-07-15 9:52 ` [PATCH 3/9] mm, hugetlb: clean-up alloc_huge_page() Joonsoo Kim 2013-07-15 9:52 ` Joonsoo Kim 2013-07-22 14:51 ` Michal Hocko 2013-07-22 14:51 ` Michal Hocko 2013-07-23 7:29 ` Joonsoo Kim 2013-07-23 7:29 ` Joonsoo Kim 2013-07-15 9:52 ` [PATCH 4/9] mm, hugetlb: fix and clean-up node iteration code to alloc or free Joonsoo Kim 2013-07-15 9:52 ` Joonsoo Kim 2013-07-15 14:27 ` Aneesh Kumar K.V 2013-07-15 14:27 ` Aneesh Kumar K.V 2013-07-16 1:41 ` Joonsoo Kim 2013-07-16 1:41 ` Joonsoo Kim 2013-07-17 2:00 ` Jianguo Wu 2013-07-17 2:00 ` Jianguo Wu 2013-07-18 6:46 ` Joonsoo Kim 2013-07-18 6:46 ` Joonsoo Kim 2013-07-15 9:52 ` [PATCH 5/9] mm, hugetlb: remove redundant list_empty check in gather_surplus_pages() Joonsoo Kim 2013-07-15 9:52 ` Joonsoo Kim 2013-07-15 14:31 ` Aneesh Kumar K.V 2013-07-15 14:31 ` Aneesh Kumar K.V 2013-07-16 1:42 ` Joonsoo Kim 2013-07-16 1:42 ` Joonsoo Kim 2013-07-22 14:55 ` Michal Hocko 2013-07-22 14:55 ` Michal Hocko 2013-07-15 9:52 ` [PATCH 6/9] mm, hugetlb: do not use a page in page cache for cow optimization Joonsoo Kim 2013-07-15 9:52 ` Joonsoo Kim 2013-07-15 13:55 ` Aneesh Kumar K.V 2013-07-15 13:55 ` Aneesh Kumar K.V 2013-07-16 1:56 ` Joonsoo Kim 2013-07-16 1:56 ` Joonsoo Kim 2013-07-17 8:55 ` Wanpeng Li 2013-07-17 8:55 ` Wanpeng Li 2013-07-15 9:52 ` [PATCH 7/9] mm, hugetlb: add VM_NORESERVE check in vma_has_reserves() Joonsoo Kim 2013-07-15 9:52 ` Joonsoo Kim 2013-07-15 14:48 ` Aneesh Kumar K.V 2013-07-15 14:48 ` Aneesh Kumar K.V 2013-07-15 15:11 ` Aneesh Kumar K.V 2013-07-15 15:11 ` Aneesh Kumar K.V 2013-07-16 2:12 ` Joonsoo Kim 2013-07-16 2:12 ` Joonsoo Kim 2013-07-16 5:47 ` Aneesh Kumar K.V 2013-07-16 5:47 ` Aneesh Kumar K.V 2013-07-16 7:12 ` Joonsoo Kim 2013-07-16 7:12 ` Joonsoo Kim 2013-07-18 2:03 ` Wanpeng Li 2013-07-18 2:03 ` Wanpeng Li 2013-07-15 9:52 ` [PATCH 8/9] mm, hugetlb: remove decrement_hugepage_resv_vma() Joonsoo Kim 2013-07-15 9:52 ` Joonsoo Kim 2013-07-15 14:50 ` Aneesh Kumar K.V [this message] 2013-07-15 14:50 ` Aneesh Kumar K.V 2013-07-17 9:31 ` Wanpeng Li 2013-07-17 9:31 ` Wanpeng Li 2013-07-15 9:52 ` [PATCH 9/9] mm, hugetlb: decrement reserve count if VM_NORESERVE alloc page cache Joonsoo Kim 2013-07-15 9:52 ` Joonsoo Kim 2013-07-15 15:11 ` Aneesh Kumar K.V 2013-07-15 15:11 ` Aneesh Kumar K.V 2013-07-18 2:02 ` Wanpeng Li 2013-07-18 2:02 ` Wanpeng Li 2013-07-15 14:10 ` [PATCH 0/9] mm, hugetlb: clean-up and possible bug fix Aneesh Kumar K.V 2013-07-15 14:10 ` Aneesh Kumar K.V 2013-07-16 1:10 ` Joonsoo Kim 2013-07-16 1:10 ` Joonsoo Kim 2013-07-16 1:27 ` Sam Ben 2013-07-16 1:27 ` Sam Ben 2013-07-16 1:45 ` Joonsoo Kim 2013-07-16 1:45 ` Joonsoo Kim 2013-07-16 1:55 ` Sam Ben 2013-07-16 1:55 ` Sam Ben 2013-07-16 2:14 ` Joonsoo Kim 2013-07-16 2:14 ` Joonsoo Kim
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=87ppujj2rc.fsf@linux.vnet.ibm.com \ --to=aneesh.kumar@linux.vnet.ibm.com \ --cc=akpm@linux-foundation.org \ --cc=david@gibson.dropbear.id.au \ --cc=davidlohr.bueso@hp.com \ --cc=hughd@google.com \ --cc=iamjoonsoo.kim@lge.com \ --cc=js1304@gmail.com \ --cc=kamezawa.hiroyu@jp.fujitsu.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=mgorman@suse.de \ --cc=mhocko@suse.cz \ --cc=riel@redhat.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.