Received-SPF: pass (google.com: domain of linux-kernel+bounces-177128-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
From: xu xin <xu.xin.sc@gmail.com>
To: chengming.zhou@linux.dev
Cc: aarcange@redhat.com,
	akpm@linux-foundation.org,
	david@redhat.com,
	hughd@google.com,
	linux-kernel@vger.kernel.org,
	linux-mm@kvack.org,
	shr@devkernel.io,
	xu.xin16@zte.com.cn,
	yang.yang29@zte.com.cn,
	si.hao@zte.com.cn,
	zhouchengming@bytedance.com
Subject: [PATCH v2 1/2] mm/ksm: fix ksm_pages_scanned accounting
Date: Mon, 13 May 2024 03:26:09 +0000
Message-Id: <20240513032609.650507-1-xu.xin16@zte.com.cn>
In-Reply-To: <20240513-b4-ksm-counters-v2-1-f2520183a8ca@linux.dev>
References: <20240513-b4-ksm-counters-v2-1-f2520183a8ca@linux.dev>
Precedence: bulk
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit

>Fixes: b348b5fe2b5f ("mm/ksm: add pages scanned metric")
>Acked-by: David Hildenbrand <david@redhat.com>
>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)

Looks good to me.

Reviewed-by: xu xin <xu.xin16@zte.com.cn>