Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Subject: Re: [linux-next PATCH 2/2] mm: khugepaged: don't have to put being
 freed page back to lru
To:     kirill.shutemov@linux.intel.com, hughd@google.com,
        aarcange@redhat.com, akpm@linux-foundation.org
Cc:     linux-mm@kvack.org, linux-kernel@vger.kernel.org
References: <1588200982-69492-1-git-send-email-yang.shi@linux.alibaba.com>
 <1588200982-69492-2-git-send-email-yang.shi@linux.alibaba.com>
From:   Yang Shi <yang.shi@linux.alibaba.com>
Message-ID: <c0691ef4-31c9-f0dd-ec23-94e86bc12794@linux.alibaba.com>
Date:   Wed, 29 Apr 2020 17:41:40 -0700
User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.12; rv:52.0)
 Gecko/20100101 Thunderbird/52.7.0
MIME-Version: 1.0
In-Reply-To: <1588200982-69492-2-git-send-email-yang.shi@linux.alibaba.com>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Transfer-Encoding: 7bit
Content-Language: en-US
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk


On 4/29/20 3:56 PM, Yang Shi wrote:
> When khugepaged successfully isolated and copied data from base page to
> collapsed THP, the base page is about to be freed.  So putting the page
> back to lru sounds not that productive since the page might be isolated
> by vmscan but it can't be reclaimed by vmscan since it can't be unmapped
> by try_to_unmap() at all.
>
> Actually khugepaged is the last user of this page so it can be freed
> directly.  So, clearing active and unevictable flags, unlocking and
> dropping refcount from isolate instead of calling putback_lru_page().

Please disregard the patch. I just remembered Kirill added collapse 
shared pages support. If the pages are shared then they have to be put 
back to lru since they may be still mapped by other processes. So we 
need check the mapcount if we would like to skip lru.

And I spotted the other issue. The release_pte_page() calls 
mod_node_page_state() unconditionally, it was fine before. But, due to 
the support for collapsing shared pages we need check if the last 
mapcount is gone or not.

Andrew, would you please remove this patch from -mm tree? I will send 
one or two rectified patches. Sorry for the inconvenience.

>
> Cc: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
> Cc: Hugh Dickins <hughd@google.com>
> Cc: Andrea Arcangeli <aarcange@redhat.com>
> Signed-off-by: Yang Shi <yang.shi@linux.alibaba.com>
> ---
>   mm/khugepaged.c | 15 +++++++++++++--
>   1 file changed, 13 insertions(+), 2 deletions(-)
>
> diff --git a/mm/khugepaged.c b/mm/khugepaged.c
> index 0c8d30b..c131a90 100644
> --- a/mm/khugepaged.c
> +++ b/mm/khugepaged.c
> @@ -559,6 +559,17 @@ void __khugepaged_exit(struct mm_struct *mm)
>   static void release_pte_page(struct page *page)
>   {
>   	mod_node_page_state(page_pgdat(page),
> +		NR_ISOLATED_ANON + page_is_file_lru(page), -compound_nr(page));
> +	ClearPageActive(page);
> +	ClearPageUnevictable(page);
> +	unlock_page(page);
> +	/* Drop refcount from isolate */
> +	put_page(page);
> +}
> +
> +static void release_pte_page_to_lru(struct page *page)
> +{
> +	mod_node_page_state(page_pgdat(page),
>   			NR_ISOLATED_ANON + page_is_file_lru(page),
>   			-compound_nr(page));
>   	unlock_page(page);
> @@ -576,12 +587,12 @@ static void release_pte_pages(pte_t *pte, pte_t *_pte,
>   		page = pte_page(pteval);
>   		if (!pte_none(pteval) && !is_zero_pfn(pte_pfn(pteval)) &&
>   				!PageCompound(page))
> -			release_pte_page(page);
> +			release_pte_page_to_lru(page);
>   	}
>   
>   	list_for_each_entry_safe(page, tmp, compound_pagelist, lru) {
>   		list_del(&page->lru);
> -		release_pte_page(page);
> +		release_pte_page_to_lru(page);
>   	}
>   }
>