From patchwork Fri Nov 15 21:22: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: 13876919 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 760D0D68BD8 for ; Fri, 15 Nov 2024 21:23:36 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DBBA36B00A7; Fri, 15 Nov 2024 16:22:56 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id D6DFD6B00A8; Fri, 15 Nov 2024 16:22:56 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9E7C36B00AA; Fri, 15 Nov 2024 16:22:56 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 7850B6B00A7 for ; Fri, 15 Nov 2024 16:22:56 -0500 (EST) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 352DCAC5AC for ; Fri, 15 Nov 2024 21:22:56 +0000 (UTC) X-FDA: 82789601790.09.0B4DFD1 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by imf29.hostedemail.com (Postfix) with ESMTP id 85430120023 for ; Fri, 15 Nov 2024 21:21:52 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=linux.microsoft.com header.s=default header.b=hyUr4x0S; dmarc=pass (policy=none) header.from=linux.microsoft.com; spf=pass (imf29.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=1731705685; 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=1b1z6PI5UAy4J23m0WJu61juY9yTu44/jok+8gOpIp5BU9DVA+GpNe6l4Mlh2X5ex+yZgJ veJ5Vw0wrCIgwFpYao/Nf2atWIbzv9ptmWhB2dPaeK5sFGw3cdcytZZJDdQG3JzbnveBSG e/j93OiS6Snca2p+xGmmcOYXHyuGP5M= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=linux.microsoft.com header.s=default header.b=hyUr4x0S; dmarc=pass (policy=none) header.from=linux.microsoft.com; spf=pass (imf29.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=1731705685; a=rsa-sha256; cv=none; b=rMzTBkgMidiXk5Mcp1wjflE/NkDoiEJiqgKctgqFn4hw30XrZj1otdk6dly6aOqEf8poGG bloZKytEb12wZ1d1J+Hvx0ZjEQmR7zOwWvVjXQ37tfeSJlWYtHYkAY6adQT3rB/KONpcWS D1FQNRikBa/FYS35v2MdJ3JXu1uUlOE= Received: from eahariha-devbox.internal.cloudapp.net (unknown [40.91.112.99]) by linux.microsoft.com (Postfix) with ESMTPSA id 06C52206BCEC; Fri, 15 Nov 2024 13:22:46 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 06C52206BCEC DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1731705766; bh=DChbJW+DaqGHGWE0sMF41tmxT4FReQ1FKA/KDyHL32Y=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=hyUr4x0SmruhyF9c/vR8v3QoqKPaKNqXRHaN80CQA/ABgyerOHG1uC/FlE1BJG1ZJ CRMPkjTTeOQg/xepSHO+SvOjz7TT6Fsw5oiwX3exTqn3S8Lu3Gz0gW082RgBKg6fy9 2WD2Rqjpa40SDuhEDGd3pTV1EDPYLPZRKnHzJ7/U= From: Easwar Hariharan Date: Fri, 15 Nov 2024 21:22:49 +0000 Subject: [PATCH 19/22] livepatch: Convert timeouts to secs_to_jiffies() MIME-Version: 1.0 Message-Id: <20241115-converge-secs-to-jiffies-v1-19-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-Rspam-User: X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 85430120023 X-Stat-Signature: e61ozcq9y7czphg5kqs3sk93uhtdzecb X-HE-Tag: 1731705712-92296 X-HE-Meta: U2FsdGVkX1+OMPdNxp0MDEroXK/u6n9DBvh/HkNqOfW3kxf+lcHlJMI3OZMibV3VoEAhnA3gVcw7ORqaULwmB95sI2Wjpbf7RwHJNhO78p0PEDtpT92P5VJDi9E3HkgrYcN6a5ZFsFpZWZwJWFH/j/HwVpBkNzV57VHcaOGWTgNcTCsvlssFedSoX+rpho+bmQS/Vz8/I8wiiXE2tCh+QxYHJL1BW69sGxlcoKNRNfdV2Xi/o82a6673R2xtlCj0fyUl3yHDy9nkrhZpm4y8RUho31SKGFyN/fJ7fLtnheSgHAgN3LBkwrtLYuZwZTJEOY4R8pZlKuOZN8yxedMDBJylv6ZJ9rIAnvNAde1Q2bNCL7WAqddNJ6vnlWnONuRjOhfFokXcICCHxyXyir23E3iVOwvOB0Q2p38TAucKplk4CXX2yqhTMcLkO1iQAw32c8CMHfMfE+x9ncP1CCphljskbTpibB7rZ2eB4yssOcJ6mOt3IxsvKrow6Phah3SWcOtpu3eMS4LiaYwsI3k1OtWgZcs7SYfgF40t9SrUY5uMxf/PkXStJg79vcgI8thbzwXw8kDDC62x7nDQPwN9MeJC5QlHEd5xhrZdNjIH/9xLW3jrFvxqZLTHhp+9mGoTB80st07Q/d1z4FO3k4TbP+V/1XN+5SP4c+YZDc69cEscDK1YmWZE/BRyystattqslCcGweDdzUODcf0YMYCyHwro6XbTSpRr1YYyQHowGEfAXl/s/Nator59/hlsMML+eTnQ+KjYP8n6/9DOO75LqM/o4NmsLA240Wky9qECeX157loXfnqclfPdR0z6GQIhif0GcgF20IucqpR/e2o5w0x8iYK1uaFuuiabFDd+BHHIBslljrfdNCu8wphTYch5Khzl3Wz0s9uZ+MjChpeZEmXff8+47dEj827XqhlUcUdb3rJakzKx2jB3FXGCXtvSfpMH/VqLLnDvRLrTfzB 8EZgWwvM VSG29k0eOy/xkRFHa9U0N5mlsmHeUQ1/ohyb2BYwwVfDHS8l1MD8Jo366P+58XdHGhpXvyQp1WpySA5QjD1GQzFpL/IRZOH3GesZX2cln87lSQ5CdatABtFkW/eMO/oskI1HDlSTxDhLottGvp89BO9PTtE4aX/5ECfP9aWnL+j1lyCJtuDTZ0co6Y9ia2JxHAVoZXEjla9AJXy3fw/qV9qOsnSH+4UTQMUo78zIStHLHh2LwHsAKdSVtRWZ6MIW7CJ78NYUxWvFL1Y2PgqQ+KKdJR+FLTM4wbABDeFA0Ih4X/dYftKxfLuuUAOG5mnebuLEvglAX5NQ6E2AtMHgRRLZZwfM6dgNW9j97xMmxOFd/fG93ydodwbRaZzZ0U0Ex1ditCPKXr7wXbyyNHy4pZvFd4c+Otnncp5okMtgWp80jH5dru8LD/EQD62T7gdS6scTi 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; }