Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757335Ab3G2Sjy (ORCPT ); Mon, 29 Jul 2013 14:39:54 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35061 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751435Ab3G2Sjw (ORCPT ); Mon, 29 Jul 2013 14:39:52 -0400 Date: Mon, 29 Jul 2013 14:39:30 -0400 From: Naoya Horiguchi 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 , Hillf Danton Message-ID: <1375123170-v27s5zvu-mutt-n-horiguchi@ah.jp.nec.com> In-Reply-To: <1375075929-6119-12-git-send-email-iamjoonsoo.kim@lge.com> References: <1375075929-6119-1-git-send-email-iamjoonsoo.kim@lge.com> <1375075929-6119-12-git-send-email-iamjoonsoo.kim@lge.com> Subject: Re: [PATCH 11/18] mm, hugetlb: move down outside_reserve check Mime-Version: 1.0 Content-Type: text/plain; charset=iso-2022-jp Content-Transfer-Encoding: 7bit Content-Disposition: inline X-Mutt-References: <1375075929-6119-12-git-send-email-iamjoonsoo.kim@lge.com> X-Mutt-Fcc: ~/Maildir/sent/ User-Agent: Mutt 1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2546 Lines: 73 On Mon, Jul 29, 2013 at 02:32:02PM +0900, Joonsoo Kim wrote: > Just move down outsider_reserve check. > This makes code more readable. > > There is no functional change. Why don't you do this in 10/18? Thanks, Naoya Horiguchi > Signed-off-by: Joonsoo Kim > > diff --git a/mm/hugetlb.c b/mm/hugetlb.c > index 5f31ca5..94173e0 100644 > --- a/mm/hugetlb.c > +++ b/mm/hugetlb.c > @@ -2530,20 +2530,6 @@ retry_avoidcopy: > return 0; > } > > - /* > - * If the process that created a MAP_PRIVATE mapping is about to > - * perform a COW due to a shared page count, attempt to satisfy > - * the allocation without using the existing reserves. The pagecache > - * page is used to determine if the reserve at this address was > - * consumed or not. If reserves were used, a partial faulted mapping > - * at the time of fork() could consume its reserves on COW instead > - * of the full address range. > - */ > - if (!(vma->vm_flags & VM_MAYSHARE) && > - is_vma_resv_set(vma, HPAGE_RESV_OWNER) && > - old_page != pagecache_page) > - outside_reserve = 1; > - > page_cache_get(old_page); > > /* Drop page_table_lock as buddy allocator may be called */ > @@ -2557,6 +2543,20 @@ retry_avoidcopy: > spin_lock(&mm->page_table_lock); > return VM_FAULT_OOM; > } > + > + /* > + * If the process that created a MAP_PRIVATE mapping is about to > + * perform a COW due to a shared page count, attempt to satisfy > + * the allocation without using the existing reserves. The pagecache > + * page is used to determine if the reserve at this address was > + * consumed or not. If reserves were used, a partial faulted mapping > + * at the time of fork() could consume its reserves on COW instead > + * of the full address range. > + */ > + if (!(vma->vm_flags & VM_MAYSHARE) && > + is_vma_resv_set(vma, HPAGE_RESV_OWNER) && > + old_page != pagecache_page) > + outside_reserve = 1; > use_reserve = use_reserve && !outside_reserve; > > new_page = alloc_huge_page(vma, address, use_reserve); > -- > 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: email@kvack.org > -- 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/