From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S937805AbdDSPxG (ORCPT <rfc822;w@1wt.eu>);
        Wed, 19 Apr 2017 11:53:06 -0400
Received: from gum.cmpxchg.org ([85.214.110.215]:46180 "EHLO gum.cmpxchg.org"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S937715AbdDSPxE (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
        Wed, 19 Apr 2017 11:53:04 -0400
Date: Wed, 19 Apr 2017 11:52:52 -0400
From: Johannes Weiner <hannes@cmpxchg.org>
To: "Huang, Ying" <ying.huang@intel.com>
Cc: Andrew Morton <akpm@linux-foundation.org>, linux-mm@kvack.org,
        linux-kernel@vger.kernel.org, Andrea Arcangeli <aarcange@redhat.com>,
        Ebru Akagunduz <ebru.akagunduz@gmail.com>,
        Michal Hocko <mhocko@kernel.org>, Tejun Heo <tj@kernel.org>,
        Hugh Dickins <hughd@google.com>, Shaohua Li <shli@kernel.org>,
        Minchan Kim <minchan@kernel.org>, Rik van Riel <riel@redhat.com>,
        cgroups@vger.kernel.org
Subject: Re: [PATCH -mm -v9 1/3] mm, THP, swap: Delay splitting THP during
 swap out
Message-ID: <20170419155252.GA3376@cmpxchg.org>
References: <20170419070625.19776-1-ying.huang@intel.com>
 <20170419070625.19776-2-ying.huang@intel.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20170419070625.19776-2-ying.huang@intel.com>
User-Agent: Mutt/1.8.0 (2017-02-23)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Wed, Apr 19, 2017 at 03:06:23PM +0800, Huang, Ying wrote:
> @@ -206,17 +212,34 @@ int add_to_swap(struct page *page, struct list_head *list)
>  	 */
>  	err = add_to_swap_cache(page, entry,
>  			__GFP_HIGH|__GFP_NOMEMALLOC|__GFP_NOWARN);
> -
> -	if (!err) {
> -		return 1;
> -	} else {	/* -ENOMEM radix-tree allocation failure */
> +	/* -ENOMEM radix-tree allocation failure */
> +	if (err)
>  		/*
>  		 * add_to_swap_cache() doesn't return -EEXIST, so we can safely
>  		 * clear SWAP_HAS_CACHE flag.
>  		 */
> -		swapcache_free(entry);
> -		return 0;
> +		goto fail_free;
> +
> +	if (unlikely(PageTransHuge(page))) {
> +		err = split_huge_page_to_list(page, list);
> +		if (err) {
> +			delete_from_swap_cache(page);
> +			return 0;
> +		}
>  	}
> +
> +	return 1;
> +
> +fail_free:
> +	if (unlikely(PageTransHuge(page)))
> +		swapcache_free_cluster(entry);
> +	else
> +		swapcache_free(entry);
> +fail:
> +	if (unlikely(PageTransHuge(page)) &&
> +	    !split_huge_page_to_list(page, list))
> +		goto retry;

May I ask why you added the unlikelies there? Can you generally say
THPs are unlikely in this path? Is the swap-out path so hot that
branch layout is critical? I doubt either is true.

Also please mention changes like these in the changelog next time.