From patchwork Fri Nov 15 21:22:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Easwar Hariharan X-Patchwork-Id: 13876906 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 F33B8D68BE3 for ; Fri, 15 Nov 2024 21:22:59 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 950A06B0096; Fri, 15 Nov 2024 16:22:49 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 8D79B6B0098; Fri, 15 Nov 2024 16:22:49 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 57D0B6B0099; Fri, 15 Nov 2024 16:22:49 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 21C206B0096 for ; Fri, 15 Nov 2024 16:22:49 -0500 (EST) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id D13684037B for ; Fri, 15 Nov 2024 21:22:48 +0000 (UTC) X-FDA: 82789602924.15.D02561E Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by imf20.hostedemail.com (Postfix) with ESMTP id E38881C0004 for ; Fri, 15 Nov 2024 21:21:49 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=linux.microsoft.com header.s=default header.b="imd3kVk/"; spf=pass (imf20.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=1731705710; 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=xLLMmnjauQQd0DUGviMvtRgN1fyV88G3fuFSy7fVBGGtPLer/iBJFEtRIkqZegD1c6+T9N 2ErLY3NxdgKcm6svSaZhC1nf9egKfcNaozIfQTB+LEmba0j0TUjd9hHYgV8vwV2f28ONNK cnbl0/9dXYw08t2H6qTAqZHu3vp7K7g= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1731705710; a=rsa-sha256; cv=none; b=0+nX1EFlk9l5FjGXWY/V3WUP4WJ44sUwFW3D4xtjjtjCaSEYZKBV3xyFo9dTdHvtzEBNSK 4blM4n1Yu5sTXzzgXMJbqjiKM/Ikf2b6oqJu3xGyvHyECXdF7HIBSJeids5Xxzokj91nTQ pkdLl5fyZUhA+3OM3TCN073/UaLifwE= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=linux.microsoft.com header.s=default header.b="imd3kVk/"; spf=pass (imf20.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 Received: from eahariha-devbox.internal.cloudapp.net (unknown [40.91.112.99]) by linux.microsoft.com (Postfix) with ESMTPSA id 256D9206BCE9; Fri, 15 Nov 2024 13:22:43 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 256D9206BCE9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1731705763; bh=cDb5q9ey4rgvzuTMFsMkjW3R4ZHiX3a+lRd3JDjV6+Q=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=imd3kVk/tJhJYNa/xeixDhpAwYPvx4IlSinPbk/21FlgSBXFMaFV4APntdnbxA1fq WRyS0aWoUlD4yY9/jG3e/ehoXMMrIljBVBgBQNEO519W/APj0YYahRFp6DV4wrhONm 8XT+qK7qOCSuyxWBlS/5K7TjbCkS44CjtifGQlCE= From: Easwar Hariharan Date: Fri, 15 Nov 2024 21:22:36 +0000 Subject: [PATCH 06/22] mm: kmemleak: Convert timeouts to secs_to_jiffies() MIME-Version: 1.0 Message-Id: <20241115-converge-secs-to-jiffies-v1-6-19aadc34941b@linux.microsoft.com> References: <20241115-converge-secs-to-jiffies-v1-0-19aadc34941b@linux.microsoft.com> In-Reply-To: <20241115-converge-secs-to-jiffies-v1-0-19aadc34941b@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-Stat-Signature: 13y1uwoa4tmnn1dh778dahy6yjp54qpy X-Rspam-User: X-Rspamd-Queue-Id: E38881C0004 X-Rspamd-Server: rspam02 X-HE-Tag: 1731705709-416518 X-HE-Meta: U2FsdGVkX19VkDap37JDTH07p5SiuDMdMb1b9yTLTsg8qyHFn25I2f9KeviLidUPvHtXggX5FGsq/6FlzEyLuiV0bcn63bWBaNKGAexo3Hu9UTzR7CBeoaHenI2vaAiPFjMlWtaCfv1deKSWNf4vIj7+EixCsEgm5m9uBwtJtufyFS6Otgz1k2DJjNz2NX0eJaUwd3KO5IgtGiBi94nc/bCCwJdWI9NbYvz6m5HOIMUXucoRJ3OdyuxXpjqxVprH5PibTp2FxrKuOLQ69+T6PSz+pSUyvH9HMOzBVmUjdVD/jmYJ0zOHULaKBv830OMiSCDquedQQUMJWHG7qhVfG/cEmR9o45PfgD0BCwL1ym92gfzsWUBy4Zk5nWzCOSwdpaTJIZ/m8qw27cn9fIGb3rt4oes2coL4LBBNozRosOMJX+dckgEachdgnQVxq7EEVTkyG2CC1TCmwHym9mBgmRf8jtmDGRYjL1ZFSVwp1uYeaXXBvU1JdujtJ0QRdUTcnQnV4+hUCLTeYvZULcB1xYgOirQBhEgdcvWhCxRyg8ixkkrNwkR9cIakHPZFeCY+HmEBedrolXo9Iz5lDt/l/ZyAqxtPAuR+uAM5BEj/wK9xNBbHoLRaVD0IzgCAiUvPmFqr4VZUETLomtkOozEe08tigMnAwm6/o/g9u8LsYfk6BvoXMT6+uv+PmaV3n3lHJU7bFvH76lODB0Q4/UZ1QCVtb/9rzPZMdUz3baz3xZ5mSZD3BZ8by38dTXYsErEnmGeDFXMV02J5OaBnwFJQlqMToyRuLgmbYvbjZhsOjlyrlG7mHq3Wddhvb5+eip3sNmoDS5SxHCrgBD9UrVH3K4LR1xf/nCPkyb00RKW66Icp/xeEjOclXlxuyHJAYNWEUQuixCGjy2vh02yMx6RUxTxnjgwdEAjObhK9FX0QhTDBlNRoXDFQbrh6FflyIOnjVMio+dFmxDI4g6cQnbX g5MRPPQ7 GNtuIVH+gXS44rogH+WCLOswH5Q4prC+Dnxmz7diNz7Tqbos9LgXXrjIXDagRdm13SkTVMoZ0VG0dHPIFXKUBwBUD86MCVBmPjLjU4IXtKIXYhMb/i8z3Y7AX8zSlFjAGEWBqWYgiEFaeKzhAmGtJXvXUl2kGUqM07tePJQYzIZSlrG5kqIalSinacx3sp70+l2MlFaq0g8k4raEQaWngYJe91nQi9S5bOSNvIFJUeRG4tuYdvf2KHK42lCs1Ay4kLrYZSb4j1p6iFHKl+jcBozJgeKdNnTtLFb3P4w/6bqQ93XlkzOAoEdKc8A/5uKaezEXpAQBw9S0P6Ko1bcJp13ALgnGU1N/hF/2SFac1em53qbNxuPbBbajcn0U6q0iz7euyGNdsVHVAgw/+Q48DCKNq2GAEjRpPyPJQbTmLAK0x5TZLZ2JZio4eDwDVemrXhmkP 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);