linux-kernel - Re: [PATCH 11/18] mm, hugetlb: move down outside

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <1375123170-v27s5zvu-mutt-n-horiguchi@ah.jp.nec.com>
Date:	Mon, 29 Jul 2013 14:39:30 -0400
From:	Naoya Horiguchi <n-horiguchi@...jp.nec.com>
To:	Joonsoo Kim <iamjoonsoo.kim@....com>
Cc:	Andrew Morton <akpm@...ux-foundation.org>,
	Rik van Riel <riel@...hat.com>, Mel Gorman <mgorman@...e.de>,
	Michal Hocko <mhocko@...e.cz>,
	"Aneesh Kumar K.V" <aneesh.kumar@...ux.vnet.ibm.com>,
	KAMEZAWA Hiroyuki <kamezawa.hiroyu@...fujitsu.com>,
	Hugh Dickins <hughd@...gle.com>,
	Davidlohr Bueso <davidlohr.bueso@...com>,
	David Gibson <david@...son.dropbear.id.au>, linux-mm@...ck.org,
	linux-kernel@...r.kernel.org, Joonsoo Kim <js1304@...il.com>,
	Wanpeng Li <liwanp@...ux.vnet.ibm.com>,
	Hillf Danton <dhillf@...il.com>
Subject: Re: [PATCH 11/18] mm, hugetlb: move down outside_reserve check

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 <iamjoonsoo.kim@....com>
> 
> 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@...ck.org.  For more info on Linux MM,
> see: http://www.linux-mm.org/ .
> Don't email: <a href=mailto:"dont@...ck.org"> email@...ck.org </a>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/