From patchwork Tue Dec 10 22:02:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Easwar Hariharan X-Patchwork-Id: 13902172 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 A7EECE77198 for ; Tue, 10 Dec 2024 22:02:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 02FE56B0098; Tue, 10 Dec 2024 17:02:44 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id E82836B00A0; Tue, 10 Dec 2024 17:02:43 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C5F836B00A1; Tue, 10 Dec 2024 17:02:43 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id A23056B0098 for ; Tue, 10 Dec 2024 17:02:43 -0500 (EST) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 575A6140BC3 for ; Tue, 10 Dec 2024 22:02:43 +0000 (UTC) X-FDA: 82880423724.07.E9420B2 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by imf08.hostedemail.com (Postfix) with ESMTP id AFAA1160011 for ; Tue, 10 Dec 2024 22:02:26 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=linux.microsoft.com header.s=default header.b=YCfQzuzz; spf=pass (imf08.hostedemail.com: domain of eahariha@linux.microsoft.com designates 13.77.154.182 as permitted sender) smtp.mailfrom=eahariha@linux.microsoft.com; dmarc=pass (policy=none) header.from=linux.microsoft.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1733868140; a=rsa-sha256; cv=none; b=pfI8Pj3K+d3uZr+3tZ3hj9qjvm4J5hISaKfZcgRP1Sqr2S1fsI4iUCMwfVUxNSvh6vXaBY 1A40/tKPgAPtgJ1roelAzBzfPEAcpuaWn/rJQQkBvA3XcMAWl7ZzfxGv0M65XV88QJ9rdQ EPN1z+iuvQHD266gWDe3l6x7ADqf9RU= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=linux.microsoft.com header.s=default header.b=YCfQzuzz; spf=pass (imf08.hostedemail.com: domain of eahariha@linux.microsoft.com designates 13.77.154.182 as permitted sender) smtp.mailfrom=eahariha@linux.microsoft.com; dmarc=pass (policy=none) header.from=linux.microsoft.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1733868140; 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=0JE1mCMNDTStNy3f4QrS8yzg/qXwB8sbyOMa5sLnc+M=; b=XQTKFOS+tG2a/Ew8xmbcYLOCrjsaJI62Kzg/3KP/2iPZ2Kj3dvlqlj9uFcKAF7YPhK42J4 ONflVakgqhYC2i5q7xsY7BAZ0/wZKzPDewhfS+00kiA8rKyNVnoUy5ZQYZuImAU52tmPF8 1X1eq1ePmJ8oR5YrLX2wTyDx7Bf65G4= Received: from eahariha-devbox.internal.cloudapp.net (unknown [40.91.112.99]) by linux.microsoft.com (Postfix) with ESMTPSA id 7A91220BCAD0; Tue, 10 Dec 2024 14:02:37 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 7A91220BCAD0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1733868157; bh=0JE1mCMNDTStNy3f4QrS8yzg/qXwB8sbyOMa5sLnc+M=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=YCfQzuzz84XSOxCFulDwBJMyeJsDcssJlAQbcNcDqVlVY42CJOIL+UK9ammaKlGe+ y0+S9QnHRdg/p6H9mSyPRo+qXk+3dcsFcITb9kFGHGdUIwdzitxdUdxS6Zxb9FQSzr 04JqDqdWTuFBsk1ZmtqL88EM/bwJOE39+Tw6Eck4= From: Easwar Hariharan Date: Tue, 10 Dec 2024 22:02:37 +0000 Subject: [PATCH v3 06/19] mm: kmemleak: Convert timeouts to secs_to_jiffies() MIME-Version: 1.0 Message-Id: <20241210-converge-secs-to-jiffies-v3-6-ddfefd7e9f2a@linux.microsoft.com> References: <20241210-converge-secs-to-jiffies-v3-0-ddfefd7e9f2a@linux.microsoft.com> In-Reply-To: <20241210-converge-secs-to-jiffies-v3-0-ddfefd7e9f2a@linux.microsoft.com> To: Pablo Neira Ayuso , Jozsef Kadlecsik , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Julia Lawall , Nicolas Palix , Daniel Mack , Haojian Zhuang , Robert Jarzmik , Russell King , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Christian Borntraeger , Sven Schnelle , Ofir Bitton , Oded Gabbay , Lucas De Marchi , =?utf-8?q?Thomas_Hellstr=C3=B6?= =?utf-8?q?m?= , Rodrigo Vivi , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Jeroen de Borst , Praveen Kaligineedi , Shailend Chand , Andrew Lunn , James Smart , Dick Kennedy , "James E.J. Bottomley" , "Martin K. Petersen" , =?utf-8?q?Roger_Pau_Mon?= =?utf-8?q?n=C3=A9?= , Jens Axboe , Kalle Valo , Jeff Johnson , Catalin Marinas , Andrew Morton , Jack Wang , Marcel Holtmann , Johan Hedberg , Luiz Augusto von Dentz , Greg Kroah-Hartman , Florian Fainelli , Ray Jui , Scott Branden , Broadcom internal kernel review list , Xiubo Li , Ilya Dryomov , Josh Poimboeuf , Jiri Kosina , Miroslav Benes , Petr Mladek , Joe Lawrence , Jaroslav Kysela , Takashi Iwai , Louis Peens , Michael Ellerman , Nicholas Piggin , Christophe Leroy , Naveen N Rao , Madhavan Srinivasan Cc: netfilter-devel@vger.kernel.org, coreteam@netfilter.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, cocci@inria.fr, linux-arm-kernel@lists.infradead.org, linux-s390@vger.kernel.org, dri-devel@lists.freedesktop.org, intel-xe@lists.freedesktop.org, linux-scsi@vger.kernel.org, xen-devel@lists.xenproject.org, linux-block@vger.kernel.org, linux-wireless@vger.kernel.org, ath11k@lists.infradead.org, linux-mm@kvack.org, linux-bluetooth@vger.kernel.org, linux-staging@lists.linux.dev, linux-rpi-kernel@lists.infradead.org, ceph-devel@vger.kernel.org, live-patching@vger.kernel.org, linux-sound@vger.kernel.org, oss-drivers@corigine.com, linuxppc-dev@lists.ozlabs.org, Anna-Maria Behnsen , Easwar Hariharan X-Mailer: b4 0.14.2 X-Rspamd-Queue-Id: AFAA1160011 X-Stat-Signature: e7pzcg1by48d4arb8wiqresn4n84mmcg X-Rspam-User: X-Rspamd-Server: rspam09 X-HE-Tag: 1733868146-393504 X-HE-Meta: U2FsdGVkX18oF6mU/PPLBpEX0752qezQfXFOEvIQZ0slK8Lu6QIp5Kp8qwmDcXhCeGxLds200QCwbjGuKxMhu2dFC/k4JXiQ8ETYD9hSM9E62Sk2zcqicM/XQv9xOu0Nmqjm3OlhlKA+jYXOsVjiNTs2e6etn43gf93g/7f75HS+/DJ+pS7LTgN2mU3jKfsQiV+e1wfS2Eu7pN6U8yhbUnXQyGp3V8IVoAKvymqOkhrT1yIHzAUz1NAmHsGk2ta+gA4pllHSpnyx/1DYcZrjUrzzyH3vSrR1H4YorTG7WheHF4WsNemufDKjtGQFVcVkzzFLU1DPep85BsFKGbvH7kdxLgLHBtPY87IVg8HknZRVF4WZ0lzxO/Y44P02m/WSmhDQ+TUUvT80Ji1sMqhvIGAN4pQxdZ/L7w/paAbPFGaC/jFPfSjGL+YP6WKxzKbzTlsFu0wP7b5TCkAjGfESIgAoKditQlvm06OBXpFPChzMVRNBZdDNrhbW207Q8AHOlGndnYdYQTsO6rIz7Rjun1hlFeIfaCY7Cgem9dYoUydyqp8Sv/eLS/3+m/58yADPzZk1ThHmSYfM9Z6s80qYzhPB/g/4sDPF1n8xX8Pn0DG6MTcgnRCZNOtlC9k9Dr4D61YfC6tnyg/CFqTgrsJe0/ob1TH+Ddlw1hpTDClMj1SDVrtYlUaTu2pCQ+rV+3h0rhtEooud6oTsd2eB0TbsjxdjwfSz1XtW4eFAtQzl8kcTIdZ4iMtsBAxtCrvaYMacnZs1E+z72WC3ym46VG5YhP+4QVqhujftkh+uts4sMFtFrPfaCrCvquBaS4Qzmg3r40M6ryloKRXH99cUc2S/EHLqycKnX0dLVsSYNW3VyEqie/v4NL6LxU/h6ONThVKapVolvgK1Y4CANmA7s7QeuZpfdazrcznLgeiMRAFcGP/JbgHZQWcS4ux2SJGLR3dWKtUu700VLN+I2JjEEjZ KDczxloY fZDxPOuqGfPO57Us47vjRePh+M3awghGaiaZK5yY4oBqJoqzaEV2RLMHodA6jA83x8MiXaaBYm4YdD2bvL3e8vbJL6+y/xD7Dmo9IpgKpThuORUSyzeEQ1Woi2sFksgQYKwBA2YwnidHHaxIdh5xXuTTOiwVzIPHZAzqQ5Puc9Kg5vI0bUSCPFaHOE2wbeRsXcueRS+8wVL338ldxMA3cRET0cBOCnyOw8p7K8YmKV0i7y2mlXP5wpFlVvmigitv1wLfMAjVaSHj6RlEM0eWYxydg+/5hnXcjMq7t/4zQ7gnBn11Ay3xhIpOBgaJ5kSQj1mQ2ZK65LlW4zOtermtnzL5KFE4RSDJK81G9jn0zvV3cB5JNbnwchs6A4PqJpb/U0VjsBa9DgpJjgW3TSAX9O1v0RuDdZdQS27JuDU4f9UhLLbc= 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: Commit b35108a51cf7 ("jiffies: Define secs_to_jiffies()") introduced secs_to_jiffies(). As the value here is a multiple of 1000, use secs_to_jiffies() instead of msecs_to_jiffies to avoid the multiplication. This is converted using scripts/coccinelle/misc/secs_to_jiffies.cocci with the following Coccinelle rules: @@ constant C; @@ - msecs_to_jiffies(C * 1000) + secs_to_jiffies(C) @@ constant C; @@ - msecs_to_jiffies(C * MSEC_PER_SEC) + secs_to_jiffies(C) Signed-off-by: Easwar Hariharan --- mm/kmemleak.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mm/kmemleak.c b/mm/kmemleak.c index 2a945c07ae99525815c8fb733e8eb1b4da60668e..a2ded75cc0c03838bc048c82990c8524f25549b6 100644 --- a/mm/kmemleak.c +++ b/mm/kmemleak.c @@ -1855,7 +1855,7 @@ static int kmemleak_scan_thread(void *arg) * Wait before the first scan to allow the system to fully initialize. */ if (first_run) { - signed long timeout = msecs_to_jiffies(SECS_FIRST_SCAN * 1000); + signed long timeout = secs_to_jiffies(SECS_FIRST_SCAN); first_run = 0; while (timeout && !kthread_should_stop()) timeout = schedule_timeout_interruptible(timeout); @@ -2241,7 +2241,7 @@ void __init kmemleak_init(void) return; jiffies_min_age = msecs_to_jiffies(MSECS_MIN_AGE); - jiffies_scan_wait = msecs_to_jiffies(SECS_SCAN_WAIT * 1000); + jiffies_scan_wait = secs_to_jiffies(SECS_SCAN_WAIT); object_cache = KMEM_CACHE(kmemleak_object, SLAB_NOLEAKTRACE); scan_area_cache = KMEM_CACHE(kmemleak_scan_area, SLAB_NOLEAKTRACE);