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 F36A1C25B78 for ; Tue, 28 May 2024 05:16:20 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 34FE26B0098; Tue, 28 May 2024 01:16:20 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2FF886B0099; Tue, 28 May 2024 01:16:20 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 151F66B009A; Tue, 28 May 2024 01:16:20 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id EA7AF6B0098 for ; Tue, 28 May 2024 01:16:19 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 3ECBD141620 for ; Tue, 28 May 2024 05:16:19 +0000 (UTC) X-FDA: 82166643678.08.9BC05D9 Received: from out-170.mta1.migadu.com (out-170.mta1.migadu.com [95.215.58.170]) by imf26.hostedemail.com (Postfix) with ESMTP id CA555140008 for ; Tue, 28 May 2024 05:16:16 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b="Q1ZEBPE/"; spf=pass (imf26.hostedemail.com: domain of chengming.zhou@linux.dev designates 95.215.58.170 as permitted sender) smtp.mailfrom=chengming.zhou@linux.dev; dmarc=pass (policy=none) header.from=linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1716873377; 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=H2q4GPXNTNFmR1Ksr4G1yjztrayX+tl7+eFPihVoBD8=; b=uXkOjZz8K0gIlgSNl8MKawRaP8e/+14VMN4IKAnhfQwvmq/RduCDwvGbjphFM1vGQhUXCI lWnQHSW3b3khPuUC4RTykAVKo8KtARzBT+07p3lq2uBhTRon5gJoWBfpfTIK9Iut7pxuA+ fQKME0VxEUh3v7iAAsk7WL+5lXckKDs= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b="Q1ZEBPE/"; spf=pass (imf26.hostedemail.com: domain of chengming.zhou@linux.dev designates 95.215.58.170 as permitted sender) smtp.mailfrom=chengming.zhou@linux.dev; dmarc=pass (policy=none) header.from=linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1716873377; a=rsa-sha256; cv=none; b=z6TrBVCSO/qYRK964gv+qZu5eCjPjq+YDGqhDfp4TyPCumOO8KQhtWAzRHL2SlVp6FMWEb UX5c2AuV8+8vKGcA05y/fdx/ooAIjrEBZLiIT9l5fP+CPMZE/+6xYHaA8ZpE4aeqAY6jG/ ubF0/yd1T9MKVyXNH3RJipnn7HkW3Pg= X-Envelope-To: david@redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1716873373; 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=H2q4GPXNTNFmR1Ksr4G1yjztrayX+tl7+eFPihVoBD8=; b=Q1ZEBPE/q4fHg8Je8XFCu/biA2QJcfaEmLTsAUHRlXk6TvadUoKdas57oD91Z9Oz1Lca8w QXe9YiV3KFqeaz9DQomLLWxSV6tjLmrdDYJoo8F9+l/fmJcD+3j2UEWuxuREznqa1dMbkV tr+LlH5Va6j3zrVWD7OtGcGCm3Mb+JE= X-Envelope-To: linux-mm@kvack.org X-Envelope-To: hughd@google.com X-Envelope-To: linux-kernel@vger.kernel.org X-Envelope-To: akpm@linux-foundation.org X-Envelope-To: linux-fsdevel@vger.kernel.org X-Envelope-To: chengming.zhou@linux.dev X-Envelope-To: yang.yang29@zte.com.cn X-Envelope-To: ran.xiaokai@zte.com.cn X-Envelope-To: xu.xin16@zte.com.cn X-Envelope-To: aarcange@redhat.com X-Envelope-To: shr@devkernel.io X-Envelope-To: zhouchengming@bytedance.com X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Chengming Zhou Date: Tue, 28 May 2024 13:15:21 +0800 Subject: [PATCH v3 1/2] mm/ksm: fix ksm_pages_scanned accounting MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20240528-b4-ksm-counters-v3-1-34bb358fdc13@linux.dev> References: <20240528-b4-ksm-counters-v3-0-34bb358fdc13@linux.dev> In-Reply-To: <20240528-b4-ksm-counters-v3-0-34bb358fdc13@linux.dev> To: Andrew Morton , David Hildenbrand , hughd@google.com, aarcange@redhat.com, Stefan Roesch , Xiaokai Ran , xu xin , Yang Yang Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, zhouchengming@bytedance.com, Chengming Zhou X-Developer-Signature: v=1; a=ed25519-sha256; t=1716873365; l=1429; i=chengming.zhou@linux.dev; s=20240508; h=from:subject:message-id; bh=I3AyPihtBw6v/kXRFwy8BYIjkHVHQUMXiLhcJd/AZFQ=; b=5BOhUtspN8CEJo3Rjn/zn0koSkZ5Z5fXC8av4Kw9U2D6t3iY1FXptgYg5qbP1UMG7SyDVZ+91 tpQAl61j6VtB6kqIleL8anS0uliyBTikBoS4NYOlZFlUwQCfvnb2hyz X-Developer-Key: i=chengming.zhou@linux.dev; a=ed25519; pk=kx40VUetZeR6MuiqrM7kPCcGakk1md0Az5qHwb6gBdU= X-Migadu-Flow: FLOW_OUT X-Rspam-User: X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: CA555140008 X-Stat-Signature: bkt9f6hpymhkkqt4unmo9ozcx9dkcjpp X-HE-Tag: 1716873376-500158 X-HE-Meta: U2FsdGVkX1+IUth5PIZNywibQ9eLoGqMwMEv2kZJ1HMsNKt4J4uOteQPBDHUWST3KutECu/upLAOpQEZMs16epCP32M5g2cLyRMfp1V2V8G8jg1FpMwt9Iwfg8XFDsKKzbgrXloFaJlbhqpr/qztylL5ZpdNAOH1bWkEqkOO3Y0mYr7Sg2KTSeQhgJCxEAg7JQ42+CXq4iaVm+syK6x12N5tcOvNnDl1kBA9VblJuFIlWUw1fO+HYazOokK77clOf9SZU7935xz1SpEYXsyTEFTUYD9KYi9zWvLfskuw/a4/b2bvPjUED2cY4aujVBFN9qvOgdVllC3pxjVqu85ZRKpHasQ/J35D6aEZpb5iBFvh/fiSshRg49KWCFOsFODN9rwwjOibjVO0QqpZVArEqRf+S8ROQ9qPVhT0Pg/g4FDbaclbSRu8iyDwzYEl5nElmVzrQd3JK2cQis+CtZgUrYvhwU5akM0GjQG+1avemJPnqt2PJPW/ioKkoFV/QER41CVinARlWYM/yfRmmXRkS+U63tq+9Ey9ngVMQowWgTou0VYNzxEnzTv3WyxwYUnoO0v5TNbdRsuwa97/fVkoZctUJeBrl1wjsGluUWqM7+APS7e6zJ1byxT9v++wGMs/tutBBHtU/0ACkS2T4Q+b2ekaZ8cjuqw9ohg+JykqBfNmRTHkrBhdcAIb3b09ntTlrTyaIah0zszNDmjachyvKxlIHVyC+Q5ud6x0gvCGqpbOwJQefClHP/rOBob9BvtrMC2PynQMxx1nZC90CR6RVTzf8l6Fwp1gmvXUMV1iT5GyneO+0uTl5ZYK4UboDaeHsa1FXLlEl+klNOhypfY5+3PkVKXQRCLYmGIGuOK/AYvtJpuFoT2EibuKAuo9GXFzJzhYwEV0P1eTpZTbF10zTLISpBuLJTJp8bChZpFnfNgDwo6j49ktzVZ9ZAQ/BTq89UzkH2rOJr8z8RbP1AC V85wmEyn tSbNl3ZniJWM4ry4x32nz7V4oPI9oGQ/7FRBnEbLrHK99P0/DRzR7WN8ltG1qwZ5mcflQlchJS48SYJry3CJtBy0kPCRNjLMNAGpTsL6F9VwrUTgl8/yjG8DuNR6iWzVOYuy73Z+Uinu2xQvHFLRlfg76C1mczhxxzv1m9cw9qDcAXGV2o7cjEjRwilYhsedTdJZFDPf3G1FdOzPUnkk2kdDOzBSQqRXD5kMw 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: 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") Acked-by: David Hildenbrand Reviewed-by: xu xin 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 452ac8346e6e..9e99cb12d330 100644 --- a/mm/ksm.c +++ b/mm/ksm.c @@ -2754,18 +2754,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) -- 2.45.1