Received-SPF: pass (google.com: domain of linux-kernel+bounces-173067-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
Message-ID: <36168dfd-bdfa-42cd-965a-f7a0e108108e@linux.dev>
Date: Wed, 8 May 2024 18:35:06 +0800
Precedence: bulk
MIME-Version: 1.0
Subject: Re: [PATCH 1/4] mm/ksm: fix ksm_pages_scanned accounting
Content-Language: en-US
To: Andrew Morton <akpm@linux-foundation.org>,
 David Hildenbrand <david@redhat.com>, Stefan Roesch <shr@devkernel.io>,
 xu xin <xu.xin16@zte.com.cn>
Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org,
 zhouchengming@bytedance.com
References: <20240508-b4-ksm-counters-v1-0-e2a9b13f70c5@linux.dev>
 <20240508-b4-ksm-counters-v1-1-e2a9b13f70c5@linux.dev>
From: Chengming Zhou <chengming.zhou@linux.dev>
In-Reply-To: <20240508-b4-ksm-counters-v1-1-e2a9b13f70c5@linux.dev>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit

On 2024/5/8 17:55, Chengming Zhou wrote:
> During testing, I found ksm_pages_scanned is unchanged although the
> scan_get_next_rmap_item() did return valid rmap_item that is not NULL.
> 
> The reason is the scan_get_next_rmap_item() will return NULL after
> a full scan, so ksm_do_scan() just return without accounting of the
> ksm_pages_scanned.
> 
> Fix it by just putting ksm_pages_scanned accounting in that loop,
> and it will be accounted more timely if that loop would last for
> a long time.
> 

Fixes: b348b5fe2b5f ("mm/ksm: add pages scanned metric")

> Signed-off-by: Chengming Zhou <chengming.zhou@linux.dev>
> ---
>  mm/ksm.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/mm/ksm.c b/mm/ksm.c
> index e1034bf1c937..0f9c491552ff 100644
> --- a/mm/ksm.c
> +++ b/mm/ksm.c
> @@ -2753,18 +2753,16 @@ static void ksm_do_scan(unsigned int scan_npages)
>  {
>  	struct ksm_rmap_item *rmap_item;
>  	struct page *page;
> -	unsigned int npages = scan_npages;
>  
> -	while (npages-- && likely(!freezing(current))) {
> +	while (scan_npages-- && likely(!freezing(current))) {
>  		cond_resched();
>  		rmap_item = scan_get_next_rmap_item(&page);
>  		if (!rmap_item)
>  			return;
>  		cmp_and_merge_page(page, rmap_item);
>  		put_page(page);
> +		ksm_pages_scanned++;
>  	}
> -
> -	ksm_pages_scanned += scan_npages - npages;
>  }
>  
>  static int ksmd_should_run(void)
>