From patchwork Tue Dec 10 22:02:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Easwar Hariharan X-Patchwork-Id: 13902170 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 867F5E77192 for ; Tue, 10 Dec 2024 22:02:50 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 498316B0099; Tue, 10 Dec 2024 17:02:43 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 3FC506B0093; Tue, 10 Dec 2024 17:02:43 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2280E6B009F; Tue, 10 Dec 2024 17:02:43 -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 E1A396B0098 for ; Tue, 10 Dec 2024 17:02:42 -0500 (EST) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 63DF3120F4F for ; Tue, 10 Dec 2024 22:02:42 +0000 (UTC) X-FDA: 82880424018.15.424D78E Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by imf29.hostedemail.com (Postfix) with ESMTP id 5FA8F120005 for ; Tue, 10 Dec 2024 22:02:09 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=linux.microsoft.com header.s=default header.b=Cha0cDHP; 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; 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=1733868137; 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=q4DaHZqCWeIKQe7TTG2rV3K7PdI1M/As9LhjCxxNuts=; b=JI0e7AkM8gMoVnR4HW24I+ihR5ApWe9ukwqRqrXKzstJLwufcBFxRhKFHo3CDWc/n+UNRT 5EONe46uHD6yZ8lSOsuOYtKFZwAdexadHRqeKfrvTjar1iedLL6PzfOVr868dMI6n3CTRN Ubhu4HDh1EB9+h97tdere0vDs1HuImw= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1733868137; a=rsa-sha256; cv=none; b=KBmbQhdG3rO3g2jsbNytzqBpEyCoRO71XMFTJjltPk1VNf5hqBtbmVQ/viV2/YMK1HRRy7 Siuw0QHMz/hVU+3cmEkjleyDts8Bs2cqnPdfLXRc7kcshyGQ7H1QW/khZryGdZvrfdaQHh 5ZcjnHY4Vz0f3BaTWjIyhBtImdkQnQU= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=linux.microsoft.com header.s=default header.b=Cha0cDHP; 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; 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 1CDB6204722B; Tue, 10 Dec 2024 14:02:37 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 1CDB6204722B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1733868157; bh=q4DaHZqCWeIKQe7TTG2rV3K7PdI1M/As9LhjCxxNuts=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=Cha0cDHP2vqeI8GSgKLIifsRbCjhIP9dfadMSDrPMIXzCzmN2lfENv6VOGo3TWGGc RhOk4eEHD3feUGZkxL7/wUYX3ev+tB6zBroy0qt0RlqU7ha1EGeg6x38R1w2x8kfbl wuStr/zn04e6xBcfNPjBsiQEchSCZugge2XzJeQs= From: Easwar Hariharan Date: Tue, 10 Dec 2024 22:02:35 +0000 Subject: [PATCH v3 04/19] s390: kernel: Convert timeouts to use secs_to_jiffies() MIME-Version: 1.0 Message-Id: <20241210-converge-secs-to-jiffies-v3-4-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: 5FA8F120005 X-Rspam-User: X-Rspamd-Server: rspam07 X-Stat-Signature: bqwwcsz5qmqdb9uihajng6s3g711rp8d X-HE-Tag: 1733868129-644322 X-HE-Meta: U2FsdGVkX1+0rqchtS432dktsrGNk3KPlcyTY2wo9NW9h1vUJ5fK5aUiYMClyRNuG8xITmcCnuhugdMkYnsaxfruXm3/VPb/NGpP5cv7jGe1nfeVsHlTqdI8p0nK/km5nfqe1RYDXZvSYiaXbH9w/LT+mdE8IxYwo8LXxjx5mxkAEzGzXfOfvwtMi23V7xpwoxhCSjE3hjxMumsYDE/aiQ0pWoXfuLAHuVuze9EAqRTkCLakMRK7mR00Q+mXq6PxeE2siGlbcTr4ab/XHO9ZBfU7KOWmEkfwdl8PgR3P1b6gKsgE32s8fBFKZ3uRHODqQwhh9dwjJbVdzBne5KmRYrfHvKagAFLL2w9r+AxUWCddkqZTEDDJVYKVisNjRmKb9GVMYSsExcUH4RdT6crzsUi+rSxSZAGPOIIyD2xVW/h2rPeIOCnIr+zatxAc9P/2sm3+Si9mi0ghtxSstN6Nr6Xx2ezPHHBDaKHn0sy6gyKMMgPQzoJeXFlautMc7FjPG9GG3qU9wiTwZmOPWpGb138thdkLS5RIPDyKHK9NNYzqmH85APihVzpLYL00AthpVx8nhnGnjC22fQFaSvnCtpkGCaMs2jafAokeCRZ0WYPjjyoJj4IEiYmG222dII1/rt4v8qqczFvLQmdipg9n8V0Wvq+jk9KtQD+aR9lUper8jAXAT62eBI7kbg1ZF+WkpsHdg8TBzlSEjkNn6c5e8tPLB0R72KhQKq2+kuTkWmb8z2xNAiQlpjYAgXOb2tGg2Bhd8xlk23y0ISepGuTBGZL484HyFSFMHHV5bPjV+RaR10tHRC0uEt7rUFYhCINBOX/V8s2fmv8PdwEnRsoQ+frEGVD4toCUfJtVohgFzmros3YimxIAGOCmROGHCp8ZowHXZsyXUWe4Lg1BOrEXZlrjD1jazsrC+ISGdZHZNq2f5IRxl9CBfBpMxrtzTGzsAcgHR5jZCVv0EkHHzvn SfYm7OzS KX80FGFVowDjGH/ZCnnXcxt0lrTxET4j6gYvjvIp3fIdX+c2wkkg9ifHuKZVyHnKRtSOBepbJi8aIXNA98kIuoes0PS1itKPY9xtl4ETqZtlfREhL3in7/sj8vOihcy7Ou0ju+Ksk52641KOZZ4gxYC0ctAkEUiWYXJt4yY98GoFsDbtmItumLM5yVWqdhmq7RDj4zfzzLTtIm3CDaoAOIMUOWF9rSs8cBWJCszow4fL1yZ+uxchlT4I2BXmPRjIXUBeV9mXauqIdne6vsdoyYyuMoKkFtZlUT3A8BNm234Sn0DiYd7VgTlu3zv9cEN94URzBRIxT31AsHqr+SBrMd59A4I509ZkiFa0Lxag68QnWdbBHmf4bDha0+awCtslgA4+o27Ae5UZcf56O7X6WpjtakRv8JGrmIa3OJEu1Fk0sPN4= 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 values here are 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 Acked-by: Alexander Gordeev --- arch/s390/kernel/lgr.c | 2 +- arch/s390/kernel/time.c | 4 ++-- arch/s390/kernel/topology.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/s390/kernel/lgr.c b/arch/s390/kernel/lgr.c index 6652e54cf3db9fbdd8cfb06f8a0dc1d4c05ae7d7..6d1ffca5f798086160112990cb947ec8deed0659 100644 --- a/arch/s390/kernel/lgr.c +++ b/arch/s390/kernel/lgr.c @@ -166,7 +166,7 @@ static struct timer_list lgr_timer; */ static void lgr_timer_set(void) { - mod_timer(&lgr_timer, jiffies + msecs_to_jiffies(LGR_TIMER_INTERVAL_SECS * MSEC_PER_SEC)); + mod_timer(&lgr_timer, jiffies + secs_to_jiffies(LGR_TIMER_INTERVAL_SECS)); } /* diff --git a/arch/s390/kernel/time.c b/arch/s390/kernel/time.c index 34a65c141ea076ba97b3238f1f36f077b15961df..e9f47c3a61978a45c72aee23bc44dcb128113c8c 100644 --- a/arch/s390/kernel/time.c +++ b/arch/s390/kernel/time.c @@ -662,12 +662,12 @@ static void stp_check_leap(void) if (ret < 0) pr_err("failed to set leap second flags\n"); /* arm Timer to clear leap second flags */ - mod_timer(&stp_timer, jiffies + msecs_to_jiffies(14400 * MSEC_PER_SEC)); + mod_timer(&stp_timer, jiffies + secs_to_jiffies(14400)); } else { /* The day the leap second is scheduled for hasn't been reached. Retry * in one hour. */ - mod_timer(&stp_timer, jiffies + msecs_to_jiffies(3600 * MSEC_PER_SEC)); + mod_timer(&stp_timer, jiffies + secs_to_jiffies(3600)); } } diff --git a/arch/s390/kernel/topology.c b/arch/s390/kernel/topology.c index 4f9c301a705b63f8dd0e7bc33e7206ad1222e7a7..0fd56a1cadbd4f41a9876a3a3fec7f5dc08ac2db 100644 --- a/arch/s390/kernel/topology.c +++ b/arch/s390/kernel/topology.c @@ -371,7 +371,7 @@ static void set_topology_timer(void) if (atomic_add_unless(&topology_poll, -1, 0)) mod_timer(&topology_timer, jiffies + msecs_to_jiffies(100)); else - mod_timer(&topology_timer, jiffies + msecs_to_jiffies(60 * MSEC_PER_SEC)); + mod_timer(&topology_timer, jiffies + secs_to_jiffies(60)); } void topology_expect_change(void)