From patchwork Fri Nov 15 21:26: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: 13877141 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 D8A0CD68BD9 for ; Fri, 15 Nov 2024 21:27:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0E9D98D0016; Fri, 15 Nov 2024 16:26:54 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 09DC68D0014; Fri, 15 Nov 2024 16:26:54 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C827B8D0016; Fri, 15 Nov 2024 16:26:53 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 9EEE48D0015 for ; Fri, 15 Nov 2024 16:26:53 -0500 (EST) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 5C05D403FC for ; Fri, 15 Nov 2024 21:26:53 +0000 (UTC) X-FDA: 82789611954.01.19BF05E Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by imf19.hostedemail.com (Postfix) with ESMTP id 261AC1A0008 for ; Fri, 15 Nov 2024 21:25:53 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=linux.microsoft.com header.s=default header.b=ge1adyPG; dmarc=pass (policy=none) header.from=linux.microsoft.com; spf=pass (imf19.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=1731705922; 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=DChbJW+DaqGHGWE0sMF41tmxT4FReQ1FKA/KDyHL32Y=; b=RWUAChQGBrYniPCls7kiRRlqxVHAvM7q5LXp8P0gBT4H0FBoFONSMkCt2s1QHUv5Q3yF0g rq9uIGGLV+CtPyD892VIw8c+WMcqqf6GoyE56cCjzQ6lgGCjuC0fP0tf/9bn7BqNPojn2j JdPviagVJLQk8wCRdstAoiD6x9If14M= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=linux.microsoft.com header.s=default header.b=ge1adyPG; dmarc=pass (policy=none) header.from=linux.microsoft.com; spf=pass (imf19.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=1731705922; a=rsa-sha256; cv=none; b=4oettsk1sbsTdAkRxKUzI5+TFKQOkBWfnsn4EkJwUqnTkZ8aYChM6Lhmr7QW1yiMTgdHyZ 2RnT9U07p2yqtpYmFoZn15hjBrWv2WHxlUD1YYm+r3BuBmh6o2LXklWqk8I5XQJAfdwVFX e81Pt75jCGoUf8BZRX3oyPiq7TGrrrM= Received: from eahariha-devbox.internal.cloudapp.net (unknown [40.91.112.99]) by linux.microsoft.com (Postfix) with ESMTPSA id 5CD1F2064AE2; Fri, 15 Nov 2024 13:26:45 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 5CD1F2064AE2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1731706005; bh=DChbJW+DaqGHGWE0sMF41tmxT4FReQ1FKA/KDyHL32Y=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=ge1adyPGW09osua+wGGbdGdLanSrZuA2fUn6nHmkQB9BNqn7wXFeAp1cdPu9VCOCp 35/hCv3XcEWTsrlvlhY2AjaoCI0WZCFykTU/SVB+MenGuEggOAvCtL12icddG0ZBHS CbMDQbZbPdYcJR1LvpcZibK937QvjL6m/Aizu5/Q= From: Easwar Hariharan Date: Fri, 15 Nov 2024 21:26:36 +0000 Subject: [PATCH v2 19/21] livepatch: Convert timeouts to secs_to_jiffies() MIME-Version: 1.0 Message-Id: <20241115-converge-secs-to-jiffies-v2-19-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-Rspam-User: X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 261AC1A0008 X-Stat-Signature: 7yfhduq7yyydzh5mg831acgqnir9w76c X-HE-Tag: 1731705953-944812 X-HE-Meta: U2FsdGVkX1/aHCYth2q04zlO5NOmUxIVcD59OKDsYHHssH08qUqIQd8bkQ/h2gv0O9ArSSCKt+TSwtJYiTKvhjU54jp7xDXVA9wLBSQBLr5e+lpoa+KqLzS/q5lXemt+pQaWVYQRhAR4jrxN/BoTStkmahWRORWiXCzlr+jX4TsEx/Jvdns+NrUGhnNfkTkKmOtZ+25Bz8uZu3cq3wqLwXTfQFFHaWtg+TZAnvpWWY9sXoYaj6/SOilKmSSfBvj0aZ34vuhcXznGnx+CCvz5txGJ00adg7MkwJo0Wm+J4fTDocjR3VthC7T88P+0EPB/4D8abhQKV91AWHuOkKlPqxD/D5k6ETSq2kx5kHoJsQoxoCmyteSU51tL76uC+jJadDGZlB+CotZPGeUDS3sxMgzZKBvYcxmq1wYe6irU0+EhAxxiPZJm5FZbDDfPrKAuRj/Bl/H7dDnPqo1fY95QPpNnD0SfpHyOx9I6sCZvI68zu7iQjtt46GyDExzr7rWetU5viWikRjkLjDYIavFX30wqLQR3VqjX7A/6JeTBlTXEg3Ohf+wGJq5MZdMcNCIypZpg0HdsadYb6eJ4GQNZXMzCR1kckiAyW1JtS59RiuQYg7mIzkGpjIGNukGBb7Yqn/9vXEtxeoJE2AivyorYkT/16VWkL3WhDBSZGaF0yInA/Y2jwjWgtz9/P1ZPFEpUUT79j6C6tGh8R2BkD5WXg71Ed4o+fcl1prCjyw4Yc2PF5vMQFR+tgNDfC/rWgVvVx3IUG9LJc00lSKy8YuwBjYTJu7SeZLahnfiWRujXkYoBCED8vSPaUASnHbiju+wfSqkemzIpkx5BQ54UpLnRN27c/hheT8hMldHDQW3smKHxUYeqH/j/CgG9/38SdPSqxhEOhcScHvo4/oDinhafsYXm9/xN3tF1UBCg6uO9j655QfSHxR/+WXHdTvN6/ND6Qh63rP3HTS07WxMp8QS zgcTNNOB ZKNebHgYOB3dOUaIFy9v5m9N0nIEg2QLdkYblo0rfybB+yHqCapOp8XMS0QdqHTL204dExUy9N+Am6t4igZO7I3cGrylbVG5sjQd4xwWz+Xqp2mPfgbLRUj91j8EDY8wjLRy5DOf7+kiNzlIzmfdaRaCgzGggZeHMHpqoR7KvJNc6P9VFyKPKsRARLiG9x6dOvYgDkYcIizOf9fXW2RALpejnZh6DFxB7oSqU2vUQTpjX22B/XUHHuTdk52DanX79lvdkygQku4CeXhRK2rXzcoUrOlS+pQ5fDVdw057SiHnxMkxwd+RZyTYO5Qp1QmIvUnEqIYLaz/Ce7zKglXy51qzmYg5Guu6HLk/5GxljE/FjJNnQOkhvANOslOcPUDC0qv1uYmdsVp4iWUMbVR2HkEHP/EKiS66N/ws5ofZYqB5WHuj5U1U1QTBPLwNamGxc4CPU 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 --- samples/livepatch/livepatch-callbacks-busymod.c | 2 +- samples/livepatch/livepatch-shadow-fix1.c | 2 +- samples/livepatch/livepatch-shadow-mod.c | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/samples/livepatch/livepatch-callbacks-busymod.c b/samples/livepatch/livepatch-callbacks-busymod.c index 378e2d40271a9717d09eff51d3d3612c679736fc..d0fd801a7c21b7d7939c29d83f9d993badcc9aba 100644 --- a/samples/livepatch/livepatch-callbacks-busymod.c +++ b/samples/livepatch/livepatch-callbacks-busymod.c @@ -45,7 +45,7 @@ static int livepatch_callbacks_mod_init(void) { pr_info("%s\n", __func__); schedule_delayed_work(&work, - msecs_to_jiffies(1000 * 0)); + secs_to_jiffies(0)); return 0; } diff --git a/samples/livepatch/livepatch-shadow-fix1.c b/samples/livepatch/livepatch-shadow-fix1.c index 6701641bf12d454a770e49abeeb0dea92560e55e..948ea1f5760fed2fa27baf478c97cf98ad5c99a8 100644 --- a/samples/livepatch/livepatch-shadow-fix1.c +++ b/samples/livepatch/livepatch-shadow-fix1.c @@ -73,7 +73,7 @@ static struct dummy *livepatch_fix1_dummy_alloc(void) return NULL; d->jiffies_expire = jiffies + - msecs_to_jiffies(1000 * EXPIRE_PERIOD); + 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..79296e6ccb119f521e86a121623855d841c9fc5e 100644 --- a/samples/livepatch/livepatch-shadow-mod.c +++ b/samples/livepatch/livepatch-shadow-mod.c @@ -102,7 +102,7 @@ static __used noinline struct dummy *dummy_alloc(void) return NULL; d->jiffies_expire = jiffies + - msecs_to_jiffies(1000 * EXPIRE_PERIOD); + secs_to_jiffies(EXPIRE_PERIOD); /* Oops, forgot to save leak! */ leak = kzalloc(sizeof(*leak), GFP_KERNEL); @@ -153,7 +153,7 @@ static void alloc_work_func(struct work_struct *work) mutex_unlock(&dummy_list_mutex); schedule_delayed_work(&alloc_dwork, - msecs_to_jiffies(1000 * ALLOC_PERIOD)); + secs_to_jiffies(ALLOC_PERIOD)); } /* @@ -185,15 +185,15 @@ 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)); + secs_to_jiffies(CLEANUP_PERIOD)); } static int livepatch_shadow_mod_init(void) { schedule_delayed_work(&alloc_dwork, - msecs_to_jiffies(1000 * ALLOC_PERIOD)); + secs_to_jiffies(ALLOC_PERIOD)); schedule_delayed_work(&cleanup_dwork, - msecs_to_jiffies(1000 * CLEANUP_PERIOD)); + secs_to_jiffies(CLEANUP_PERIOD)); return 0; }