From patchwork Fri Nov 15 21:26:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Easwar Hariharan X-Patchwork-Id: 13877128 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 5C7A1D68BE9 for ; Fri, 15 Nov 2024 21:26:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3D3608D0007; Fri, 15 Nov 2024 16:26:47 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 35A2F8D0001; Fri, 15 Nov 2024 16:26:47 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 001138D0007; Fri, 15 Nov 2024 16:26:46 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id CCE908D0001 for ; Fri, 15 Nov 2024 16:26:46 -0500 (EST) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 8F02040323 for ; Fri, 15 Nov 2024 21:26:46 +0000 (UTC) X-FDA: 82789612542.21.16568CA Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by imf12.hostedemail.com (Postfix) with ESMTP id 34E4F40017 for ; Fri, 15 Nov 2024 21:26:24 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=linux.microsoft.com header.s=default header.b=NO84Sskj; dmarc=pass (policy=none) header.from=linux.microsoft.com; spf=pass (imf12.hostedemail.com: domain of eahariha@linux.microsoft.com designates 13.77.154.182 as permitted sender) smtp.mailfrom=eahariha@linux.microsoft.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1731705825; 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=cDb5q9ey4rgvzuTMFsMkjW3R4ZHiX3a+lRd3JDjV6+Q=; b=7Fga9TFha2jhrVS7w7Itf+j+c2zvx6tHjlAfYrwvX5kYbxvh8iIAjHvJgSMrXgs3LmSjqB 3HIHS3xN0ZbvtsytN96l8b3WQz+44lgRKvNqK7VmXhhxzSqArc5QuFAR2EmqYQlqWC8rFj bsR6oohlMe9xahc99YD00535foVBI7g= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=linux.microsoft.com header.s=default header.b=NO84Sskj; dmarc=pass (policy=none) header.from=linux.microsoft.com; spf=pass (imf12.hostedemail.com: domain of eahariha@linux.microsoft.com designates 13.77.154.182 as permitted sender) smtp.mailfrom=eahariha@linux.microsoft.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1731705825; a=rsa-sha256; cv=none; b=V8ckEAKkFV68VSNhVixehIkeIOxs8muIJhqz0SqWlEVU2ntorFYXBvT+z+nLKA9cjmuW1B CrmBF80eYr1Ec4tKkfPYE1P8uDf5spK4BqmBlDWGS+OYbMTFlSX3gBPdwt8xKpGuGaFCjH PcyuiciQ7qocqvth3DIgPPbe38A9Rc8= Received: from eahariha-devbox.internal.cloudapp.net (unknown [40.91.112.99]) by linux.microsoft.com (Postfix) with ESMTPSA id 5DA5E206BCFB; Fri, 15 Nov 2024 13:26:42 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 5DA5E206BCFB DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1731706002; bh=cDb5q9ey4rgvzuTMFsMkjW3R4ZHiX3a+lRd3JDjV6+Q=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=NO84SskjrWC/WFvKvGdiMiujlTtBQUCv9VY6UYFsNxghNS3m5K63jnaoGusNsUnee 5tLTM7woyBZaUNuUFMB3oWVBMOozS3J1y7PPugpo3cvaz/QXUdeGix3ePT8vCN2oIN gQ1ZKgfEKCkg+XmnS+/V2pj/LNnJYminStxSf4BY= From: Easwar Hariharan Date: Fri, 15 Nov 2024 21:26:23 +0000 Subject: [PATCH v2 06/21] mm: kmemleak: Convert timeouts to secs_to_jiffies() MIME-Version: 1.0 Message-Id: <20241115-converge-secs-to-jiffies-v2-6-911fb7595e79@linux.microsoft.com> References: <20241115-converge-secs-to-jiffies-v2-0-911fb7595e79@linux.microsoft.com> In-Reply-To: <20241115-converge-secs-to-jiffies-v2-0-911fb7595e79@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 , Lucas Stach , Russell King , Christian Gmeiner , 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, etnaviv@lists.freedesktop.org, oss-drivers@corigine.com, linuxppc-dev@lists.ozlabs.org, Anna-Maria Behnsen , Easwar Hariharan X-Mailer: b4 0.14.2 X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 34E4F40017 X-Stat-Signature: dudkrtaez4jw7xesptyh5puffncpxjtf X-Rspam-User: X-HE-Tag: 1731705984-438368 X-HE-Meta: U2FsdGVkX1+D6YgsfeybgSexaPs/Kcuq2g2uipmNDQchJVwg38Bft2vE0K9AT24/3lPBHaEIXt6t/QICp2s+m+ZcWmo2C+NppKuA2oIHk548K7A7de7avizZT2HnyzLC51cZICw/aoTjNgEe3e12WoXMivLG0O7GyjfmdWlm9RZg0V1QCE2Pz0m3Vz4c7fyuDxuneb0LoQeE0XAeImH+1o4pBW6bvS14ZpboY3wQkcMQPH/IeH5hYiMvImMQmDfEOd44Tq3I33KFF9In6XGLTNF40lEvM09e/+ahzTzDoDavF3npL6axz6IK2EOvYoJqKWHdjmoEwTEgWbOKP2Yfgqc9zUCNMGfHQB7uMMFaG8pCVoh5Oi4WiTBuWOfZcqr6XBXBBPa67BlMd5ZcO019JpU6VKGZZBIIf3u59mMsEZn26Qn2hn/4qYLHn1RWYWBxIindKtMFbgqL+OyXvgHK4VystZPyKFafrUBdR24JftA5dxtgIYOo6gYowjdpSyM9c8lGb64vQaXdUFS6/QLKUuipMIsIFfNaQ8LN76KkzKJA/402BRTJIUxf1WIYr4fqAU+fKwwtxXY48M7vnkJ42UcuZAT/hokbd+eLvUYJx7kD+uKDl2+fy4dT2tV/0vlDrox+QhVuVJbv+zwROJJrFQ9sRqA0kYxFfKnl4dKUWvA4OwFMygpLQOBtln9n4LijVBkGULjWqcOl889lnl7HoFiaNz0BxXkKa92/4blUjh+dJeMwjaxE+Pi29gJGVV8Hijj1sADWhVwbFy3L3sA2C+z/jPuQeKrvoh8smStSDsRfk1xBwq6rkATaUs7bfHeQPouK2kR5l6GX6GS63N5X+yRcWtSQXM75kUg1fIof7ytSdrcCENhcXynIPtu1J4uDra47k1FqMZ/CS/35XfhPvFvX69ZZV0tPLZa0SxlaLhUwKUEQCrgST/WnxP7uSXnjcSvY+K1HkEK36syZWas g9Vv/mXr D/bVtoZZ6T0tIWUhhvKozt73szdQEMd4FNNl86On1g8n4+TE+f0FqEMFh3iYXbsUjn2objrNn1MXiwFyqjtnf+lJ2Ge0/QJUTlzBz8YAKWxngsWu4brA1/YGK9rwNwFxMAgveIphzonEIS1iTpItKuhTB/1f2YJFa8sYxk3sMLtLpoB9s4DwEa7blw446IqacpRxXr4c3TdcrWyoagsviHQwJ6WLK/L4r4MHNWpW6To2JXU7vtogZdbhDVlce0iaZCmuF/WJt3vATEsoTWKUgadALRARK9BSZeCJfFP4Sm1gJCIVjsqx/6TjQnuk18NLJxsGg7RwGKQ2H36wzjB4GcbLDMNpg0lksU0afAqzVT0rf8r81VOavDs6GXPAmmWDXDBRpXiByTZJeLEIq8Mqq/C4SaE98fH5uDgolTeeSxggetyGJhT6V7ceSyw== 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: Changes made 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 0400f5e8ac60de555f43d85f1d36f67e48b4ebed..2c099d0819b1896390b842af76069a46bffabc23 100644 --- a/mm/kmemleak.c +++ b/mm/kmemleak.c @@ -1816,7 +1816,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); @@ -2202,7 +2202,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);