From patchwork Tue Dec 10 22:02:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Easwar Hariharan X-Patchwork-Id: 13902182 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 A943CE7717F for ; Tue, 10 Dec 2024 22:03:21 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1B6926B00AA; Tue, 10 Dec 2024 17:02:51 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 0F11B6B00A7; Tue, 10 Dec 2024 17:02:51 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D999A8D001E; Tue, 10 Dec 2024 17:02:50 -0500 (EST) 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 B23E28D001C for ; Tue, 10 Dec 2024 17:02:50 -0500 (EST) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 645AF1C7BF9 for ; Tue, 10 Dec 2024 22:02:50 +0000 (UTC) X-FDA: 82880423976.27.3C2B56D Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by imf08.hostedemail.com (Postfix) with ESMTP id C7160160006 for ; Tue, 10 Dec 2024 22:02:33 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=linux.microsoft.com header.s=default header.b="e/J9gwCA"; 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=1733868147; a=rsa-sha256; cv=none; b=dPTeagQ/son5ulVHIwmz56gaAae9ltlgWYT4dieZkrEx+q3xa6v3ihwO0Dqy0FYuapwSSr dmJP5peNJHyZu1Sx47KWA2x5rToyFPYdvU0xuvwMOiLrSKA/Q3VpXvHjUJYXlJS+6fP5Sw OEFwDbrcO1q+17onAobDp7ON1xFtuh8= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=linux.microsoft.com header.s=default header.b="e/J9gwCA"; 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=1733868147; 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=RbQWNnMSFMFriUk4NuHYTwiGcsEx+EnrYdZ9JaogvX4=; b=8McIW51PBlpTuVTP5qre6dy1yfAb1UlS12Q0yzg9E1sbWpxz1gMAgIl9EIALNIjSxOc2xJ ifh3tElrTLOhLLHhIdSBKvtywuSYUfLpr24FfzcT5mXBY6TNgcRatVBamdAV1vy0whPOK3 WIH8YsrqiKWJey8XkDWTacBBzlILAe4= Received: from eahariha-devbox.internal.cloudapp.net (unknown [40.91.112.99]) by linux.microsoft.com (Postfix) with ESMTPSA id C173C20ACD6E; Tue, 10 Dec 2024 14:02:39 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com C173C20ACD6E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1733868159; bh=RbQWNnMSFMFriUk4NuHYTwiGcsEx+EnrYdZ9JaogvX4=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=e/J9gwCA4uBKGknzsmiO3oet8slWv1kdiClhfZ9LTUvDcAr8km71ONqn/wjRdmpri 4EyHjbbYG4CKX/8T2eN5ATCPWVrLNipH5jKYYefAMdH+qlSBTJn1LIV6HX/UxzfdGn 9DHlxQpHUKnw1xm9c/b/XukYCVTGP1/9SF9qgehM= From: Easwar Hariharan Date: Tue, 10 Dec 2024 22:02:49 +0000 Subject: [PATCH v3 18/19] livepatch: Convert timeouts to secs_to_jiffies() MIME-Version: 1.0 Message-Id: <20241210-converge-secs-to-jiffies-v3-18-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: C7160160006 X-Stat-Signature: qarosbsu5g3hc9ab7dnemj3p388w6imu X-Rspam-User: X-Rspamd-Server: rspam09 X-HE-Tag: 1733868153-658113 X-HE-Meta: U2FsdGVkX18R0mCVgRFzFfYWyPDZ6PCRsd4vplkvVnO5q2mUhqLab7KiT0fV9waQ/9hLEmE8ch2ZUsrOxMjlHF5gOc7NJl8zNRhdB3ZbhY0bO/8/UAwyCNnAtdybiSoKx1RUFD9AqAVd41fX0/zYBK6uxg/2yCdh/l49Cdoc06ZvIsepGSzO/mjMkWdi3puH6ZQ8+nPz+Im7Xp+yzTYUH/68qRd0D3LQJLFsbtTWvcuLnNqJUQiyzMtfhnGglWVBaCq2TXnNALkN4PV0y+aURC63mHmb+VkT0HO9xFnC+9xs2Mt0aOdC1kitwMycDvPn8ADK9XgOVIdMDE+KR6VYrGOysTInCM0PZdA6On/nGOz3RhttSDuU3QUnH36S938rTSdPeKQy/ZFTuIEVEwv78ud7gcqm6t2HWXEb/KCrj3vuLZJGOyTW8S1Un0oXNgQVEJ0ErSOv/zNm+vJttKTLhYhxTR/sD21gYVHiLH78MtcjoRDrRW5KaR0B/R3+sAD2ADYM5+1vQ5MWAzG/RyZbGQl+Bw0vNLHCt2qzubcTceTx7+nmDcbpXkcr1NhKUtq35eisScfFJ/aCmNjXibfVcbQEtw1mzSpeBj2DYESQhO//XOInLWZ+Y1UsUECz6iFGRClCb6AzmHU+bXItU3TqGm5X9N2E6icWhP7P7ZzYwfibFngRuzwxRmzBcrfaug1lRwMaES38Flr520z7uiFSWuvpe8jc7Ra4iW2FRw0vypbrld7MaGd2UJ05itpTrKh8eDLbkj+vT0u8baZ37gcKQ9whCSjlaqIKpBF/gT4l7JAnS0fWcfcP0SFkRiOjk3ADDf2aP5z9Wv4TUTgjxkkYGceXyDvMxO2HvdUufYm81Knc08UJ/bTZ090pC3igYWty/UQQ+yBRgTBlMygGY3mWj+/18HIdX6BXD+aVw6SmlAnJqlJUR+YBV4VSqaoHyp4akRAowj4fShWlpQmE1R0 aCNzbP43 kzpKZmgJnGZUM7ZA+Bl1cz7Wi6cb6X0tAiHcTsizWVqeY91eWqCsSeZH0X/z8E6M0CQeOS3y58Pne2PSqmsWq8t5jmOAKRiqrnEGchEmsD7qaaRZ/JfXMzBUNn8GVwZXxHWzVR1ftqu+yU2xhQU2hm+DLjiQApQPcpdx/7hMpQ/Dvi8mKDIOVA2//1Hr3relbxDJ5jijZY7keasU6KayA5y5RgPE5BBLomu7/IV8qYrNkLQeVViaGtPlgFCvux86FdHeN4AlWyWAFTx4mnVSDoVOGoqY0CmhiN9thqQfFXPTqitgLlNhNzrN+D7YGMWI63krQfP6Q/Xoj1FmaL9Zhs9Kn4z294b8Nwkvy7LcpG8JcrDlkHGc5H/WLy6uepyvagVjH9+EE6OgM04y0R7GIVKdyi8EjNWbER+XKEFTIcWnA8TQ= 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 --- samples/livepatch/livepatch-callbacks-busymod.c | 3 +-- samples/livepatch/livepatch-shadow-fix1.c | 3 +-- samples/livepatch/livepatch-shadow-mod.c | 15 +++++---------- 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/samples/livepatch/livepatch-callbacks-busymod.c b/samples/livepatch/livepatch-callbacks-busymod.c index 378e2d40271a9717d09eff51d3d3612c679736fc..69105596e72e6826aa2815cb2599eea56a0055ba 100644 --- a/samples/livepatch/livepatch-callbacks-busymod.c +++ b/samples/livepatch/livepatch-callbacks-busymod.c @@ -44,8 +44,7 @@ static void busymod_work_func(struct work_struct *work) static int livepatch_callbacks_mod_init(void) { pr_info("%s\n", __func__); - schedule_delayed_work(&work, - msecs_to_jiffies(1000 * 0)); + schedule_delayed_work(&work, 0); return 0; } diff --git a/samples/livepatch/livepatch-shadow-fix1.c b/samples/livepatch/livepatch-shadow-fix1.c index 6701641bf12d454a770e49abeeb0dea92560e55e..f3f153895d6ce751fc91ae1224d91b220cba3e37 100644 --- a/samples/livepatch/livepatch-shadow-fix1.c +++ b/samples/livepatch/livepatch-shadow-fix1.c @@ -72,8 +72,7 @@ static struct dummy *livepatch_fix1_dummy_alloc(void) if (!d) return NULL; - d->jiffies_expire = jiffies + - msecs_to_jiffies(1000 * EXPIRE_PERIOD); + d->jiffies_expire = jiffies + secs_to_jiffies(EXPIRE_PERIOD); /* * Patch: save the extra memory location into a SV_LEAK shadow diff --git a/samples/livepatch/livepatch-shadow-mod.c b/samples/livepatch/livepatch-shadow-mod.c index 7e753b0d2fa611524c9e2adbe02c8fa3e9b6015e..5d83ad5a8118dbbac897dfcbb92e6d5f399d1dc3 100644 --- a/samples/livepatch/livepatch-shadow-mod.c +++ b/samples/livepatch/livepatch-shadow-mod.c @@ -101,8 +101,7 @@ static __used noinline struct dummy *dummy_alloc(void) if (!d) return NULL; - d->jiffies_expire = jiffies + - msecs_to_jiffies(1000 * EXPIRE_PERIOD); + d->jiffies_expire = jiffies + secs_to_jiffies(EXPIRE_PERIOD); /* Oops, forgot to save leak! */ leak = kzalloc(sizeof(*leak), GFP_KERNEL); @@ -152,8 +151,7 @@ static void alloc_work_func(struct work_struct *work) list_add(&d->list, &dummy_list); mutex_unlock(&dummy_list_mutex); - schedule_delayed_work(&alloc_dwork, - msecs_to_jiffies(1000 * ALLOC_PERIOD)); + schedule_delayed_work(&alloc_dwork, secs_to_jiffies(ALLOC_PERIOD)); } /* @@ -184,16 +182,13 @@ static void cleanup_work_func(struct work_struct *work) } mutex_unlock(&dummy_list_mutex); - schedule_delayed_work(&cleanup_dwork, - msecs_to_jiffies(1000 * CLEANUP_PERIOD)); + schedule_delayed_work(&cleanup_dwork, secs_to_jiffies(CLEANUP_PERIOD)); } static int livepatch_shadow_mod_init(void) { - schedule_delayed_work(&alloc_dwork, - msecs_to_jiffies(1000 * ALLOC_PERIOD)); - schedule_delayed_work(&cleanup_dwork, - msecs_to_jiffies(1000 * CLEANUP_PERIOD)); + schedule_delayed_work(&alloc_dwork, secs_to_jiffies(ALLOC_PERIOD)); + schedule_delayed_work(&cleanup_dwork, secs_to_jiffies(CLEANUP_PERIOD)); return 0; }