From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 27CA7C04FFE for ; Wed, 8 May 2024 10:35:40 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A00466B0126; Wed, 8 May 2024 06:35:39 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9B1C56B0127; Wed, 8 May 2024 06:35:39 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8C6CC6B0128; Wed, 8 May 2024 06:35:39 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 6E8196B0126 for ; Wed, 8 May 2024 06:35:39 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 147AEC1049 for ; Wed, 8 May 2024 10:35:39 +0000 (UTC) X-FDA: 82094872398.08.8E9D885 Received: from out-177.mta0.migadu.com (out-177.mta0.migadu.com [91.218.175.177]) by imf03.hostedemail.com (Postfix) with ESMTP id 5650B20008 for ; Wed, 8 May 2024 10:35:36 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b="mKlT/PE1"; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf03.hostedemail.com: domain of chengming.zhou@linux.dev designates 91.218.175.177 as permitted sender) smtp.mailfrom=chengming.zhou@linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1715164536; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=RK5/NX8sHGGXG6wjj5Bs0mAPLkvXvHvETx9taLYIC70=; b=1JWSE9lM03NHJURXP9PDcO5gcfnEbaIAs0i8gZ3e2fKdsNwPbEo6V7w8/scVzsNb8ZKSEz minhzYgi8anBgEj1JwxIL2yJWxQfksaagl5WliCIho94AuvG8EKPl2jbXTnjFv8+/DIsNY 4YEvp019RCElArfSQfS2XoPtWgrS47Q= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1715164536; a=rsa-sha256; cv=none; b=6oa+qFTyLtm+NFVWK3GEJQnET24r/inJYEweCWSMROTaKvO608zCRNxj0vukO9CtNY3biq 1A5rJtVAXvQeAy5JmJtLzXJEjMMdWcONfaSBbntx0LZzcEAwFR5qWEZA1FJ/vaog+IOa5q 66YovgRU5KgLaNJAC/XvUa1Y607OrUw= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b="mKlT/PE1"; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf03.hostedemail.com: domain of chengming.zhou@linux.dev designates 91.218.175.177 as permitted sender) smtp.mailfrom=chengming.zhou@linux.dev Message-ID: <36168dfd-bdfa-42cd-965a-f7a0e108108e@linux.dev> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1715164534; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=RK5/NX8sHGGXG6wjj5Bs0mAPLkvXvHvETx9taLYIC70=; b=mKlT/PE19fkGF6lF6eMgEHYE2HIx9ALSLH0p+Ofh6u5w4NhlCKa7XMgT7lhjiGpGTOXUPm 9toyXZZBCIz2c5psawYuWP3+8f9kWQZGpQAjsPaaXpqH0HMI09JSKTwEMHv+StDkLQjBe/ LQsv6a2XOAtLk20SHawA0zEkmFbWEbc= Date: Wed, 8 May 2024 18:35:06 +0800 MIME-Version: 1.0 Subject: Re: [PATCH 1/4] mm/ksm: fix ksm_pages_scanned accounting Content-Language: en-US To: Andrew Morton , David Hildenbrand , Stefan Roesch , xu xin 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> X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Chengming Zhou In-Reply-To: <20240508-b4-ksm-counters-v1-1-e2a9b13f70c5@linux.dev> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Migadu-Flow: FLOW_OUT X-Rspamd-Queue-Id: 5650B20008 X-Rspam-User: X-Rspamd-Server: rspam03 X-Stat-Signature: dkikc9srhhkfnu4f1agm3axrn1tacwgu X-HE-Tag: 1715164536-167777 X-HE-Meta: U2FsdGVkX1/pH2GmgV2OKEr21rZ1O1X2D2YL1UX0d9d4ReRkP97U5fLi8SRSfz9+q/JHuyes3E9w2JOSWa/B+ucGIoKzXGaQjRFiBc/kqW+j84JEFvBkhEKOMS33n8nK000z93uDR87PmM8AYsCJ5k/sWU9uekpDeVvbmJwKcLMIkbVQihNp8/m6s7Qj0LTUrEROqCr/VYJRVkkfmVSskKc/QRuxlKT5WAwcuEZelP7vKYomrlPyA6LDf3jJiGeODNn5le6vML8Gtv9WDC5eyyCB8feZrK169vaIgGepwlrzBYijW31ng+26XKWJnfVEjr0DzL6P4Qf8RAN/0Go3t/FE4hrcvrT6yw20OfbHBE7NjpTkVL5RbpqQKmpcIcN5D4I98Ea3jXZ89Bf2qixA+bn45dtBxdtKSx1R/MkdwCCoOpjuMAHqI1J2rzoAyK+h5iQlLW9IsiWrvgBtIg0+drUJSdfyfbsFTlHhIP7OnqdA8KEI4TBe/CJL7dhMhSWGYUBYROW5a6oXeGH6PS38ytY09xT8SAj/vJpeX2Prm0osxoBKD81ewwgOGVs58w0QGyFUdwvNDPeKF6gXOVZz0t7yC8K4g+j0GenmN38r0r7P+2t7114/UcaK9ftvu6EjZVT7bDoLoABOZS1YSZdV+Y/mHP8Vx8ZR/cnPIvrihl7SprKT0NH+jLL9eKqb/TLGAdAkn1PSQZQ+a3qhqnUT6/0gtNB3ofBgDDoPWLgu4VYuUHG6e1j0XcRzw9oj7IWbmCnCw42Is5VsYJWHup0rUpRW5aD7UU4GCMbT6E3yquXN+1r6EPzFYvV7dt1DYAADRwcuP6V6Su8svRPVtwxNmvn2gDTdbc0p5ERmB401zpyHVAHrjkiQ9Kq5/a/c3HqqcrBbFgSL7f9z6R34bc3NNEi7Y+2fDfFF/OvI663xM9Qxo/YGIixTDcHpghS25DxpyruzGovYXy2k18ssTQE PF7z6ZK1 2MegmnWSBR8B82RHU0fk1WYUA3bfIkKzsnl5U116HjUMd8LsU5heKA5df9zbWCHQmqO0myuv3+si/E1LbdQ69+g+HkdbwqILIR8KkVNAoByF2Ip9kZ9/xZeMxDKk3Q6UbwBcY X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: 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 > --- > 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) >