From patchwork Tue Dec 10 22:02:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Easwar Hariharan X-Patchwork-Id: 13902178 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 2AC07E7717F for ; Tue, 10 Dec 2024 22:03:13 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 64C398D0015; Tue, 10 Dec 2024 17:02:47 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 5D1E28D0013; Tue, 10 Dec 2024 17:02:47 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 421B78D0015; Tue, 10 Dec 2024 17:02:47 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 1C4758D0013 for ; Tue, 10 Dec 2024 17:02:47 -0500 (EST) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id B7FE5AEE2A for ; Tue, 10 Dec 2024 22:02:46 +0000 (UTC) X-FDA: 82880423892.07.6CFE69E Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by imf15.hostedemail.com (Postfix) with ESMTP id 95E72A001D for ; Tue, 10 Dec 2024 22:02:21 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=linux.microsoft.com header.s=default header.b=svAtqGWU; dmarc=pass (policy=none) header.from=linux.microsoft.com; spf=pass (imf15.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=1733868144; a=rsa-sha256; cv=none; b=V8QqJXxWKpbaiCst4NgEA17VtTs8kHl7R0LaUFYHe2nvLXK2nLCOE9SUbarfL+lcgMiFvd Akto7xKRdR9kd0OEiN6AqAe9iSyJuitmdmQIEWSdVbK2rSOh9sOphPmdEAxDPlSb238nbk MKPKQS/qVAeBFbR/b0PQgW49pEGB2ps= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=linux.microsoft.com header.s=default header.b=svAtqGWU; dmarc=pass (policy=none) header.from=linux.microsoft.com; spf=pass (imf15.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=1733868144; 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=gKZLAOaJwfAP+6Kmm8Uoact7ay9fLs6b2uIK/ai8VsE=; b=cWQHm0FHVM7bs5wdL1O3qYshHjz/XG7pYQ3WHm5x/tnSBhaYx1Pc1CTxz41EYWpznBRiIL jXMMHD6d7O+/fOtnIYR3WcnkAq4M3MCBtxuDUmvLC255Df1WAk/0dKzM63lN3uV4HmXbTz A6xRBGFS2UsPDV6ADTY3qxR+DH1E9C0= Received: from eahariha-devbox.internal.cloudapp.net (unknown [40.91.112.99]) by linux.microsoft.com (Postfix) with ESMTPSA id 9DC932047231; Tue, 10 Dec 2024 14:02:38 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 9DC932047231 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1733868158; bh=gKZLAOaJwfAP+6Kmm8Uoact7ay9fLs6b2uIK/ai8VsE=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=svAtqGWUfwwxhkPtOsHM9wFpOe5H7V37CPLpc1efEJB+hZDbAOkD4T5b6sfMzxhZ+ yP7ZIp8mBgs9llSr4qUZT5sBXpDyffL9kReLgTxKKh0F7Rks+AtMLKTRz+ik8N0b4l Co5R1xYnpZA/XZN3kdMilWWEgRejdEMkmjUvT5B4= From: Easwar Hariharan Date: Tue, 10 Dec 2024 22:02:43 +0000 Subject: [PATCH v3 12/19] xen/blkback: Convert timeouts to secs_to_jiffies() MIME-Version: 1.0 Message-Id: <20241210-converge-secs-to-jiffies-v3-12-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-Stat-Signature: y9i5uh5c8n688s19hu1isazaf1jzyb1a X-Rspam-User: X-Rspamd-Queue-Id: 95E72A001D X-Rspamd-Server: rspam08 X-HE-Tag: 1733868141-345903 X-HE-Meta: U2FsdGVkX1/+7Dla1dSkwgsTX5uEuPQENiSIkEdEN89majPvLeUaZpCiSJSVtLTg5oLBHR+NPdFG1YAHtaEdE99c4xb0qJlta1GbLCq/bnDCuieR3uSFb/dSM0FiW3fF0uwhAFKI9toKKrsjV7rILwcHgec3a03Dh5eEM1CgbCLL98zLrREyis2ddsgSv2iv745T0l2NyODlEQ7muu6mXErl2CdMq32GpnCKCUHTen/qvqfXA1a81HCIJT+BpFYWWJsKdjV9dFleXHydyRspB2qnaxHzJ/wavBS1ejbin8JZgAvUKdaS4WfQc5Jema9ntr+v54I6VE2Yzx9w7JFEBTYl6vZb7hlHBXhitYyNXU7zSIcVd/h/Ux4o+UTqeJBmt8lYQkVdTL2n5xZn/NJNUFEK/f0808Px3743G2ux3glckjTojCP6t76q4FY1p2Kof6ul0GCTKu/tvw4mDmW9WNaJiXoL0b//NZMLMdn+YLYBbKfM5bXZwYmZN8sopIQJmYuo1zsUalFMqtdjxeJj6gtSuito4z6XtoC2/g/UPaSrj8FlW2fy4ucxBlzqwFiOgjDTWPclW9cFT9YdrtcY2MH5T9vkcIklJPBm/qWUYHcwuBiiDjGnkL6f9B9CF48q2wowf/+rC39c3S8rnPknMOyhzvdQ9ccmBq0odVX9+s4hN4M5VfK9Kf79TxEuegrkTkHlWCvl17KVdd+dwEIPTEs9DdNGVNdJSnDFvZI3JfKXyW69y2uGQ/FZ96slQ44iMRrgQtEDWOF65RAH9lzvYdXWJXFIORtuxSbMTdrINUTSGNB1cMjPysvbUvzrcYWBV/I3yXF4S7APq+t3RDSv3+NfcdGRyva2y827xdZ3rBezGAdEtlxHPGVuN8D4ejZ27pOFXAV2W4zPvrG2h7CV55PNoXTOEhZ6dsrv0qtujoLmAgBO3+nyal/xyWjuzzoOCIJ99xWFDTdUwBT8ymz z4gb2p1J Sz0MM/evWIoV6hR/X42WKHlPNGOBTd8l2efsQ7ZVrRqMoyA0TiPVsUj0XmzhHmpl4jmLHynPVOG+Z5cITi7pzeluCJtL3rX7pYKdjjiZUwlXP13moR176EFwX3RDKW/D5t9xk66tjPdebWKM45HDg789evAEqoyKhoaLdu+bVXlLaYWUDOqU9z1kF8KUIRDS44EKbY3hRfwm9pe6tSaYON8h6Q9PC+bM+mgNnWFG/dls0b7h/CYiMxYhwxoSNXNfNQSWKv0wGhfsXC3btFv6SkocF0fpKUA44/gxysx4245cjtnj0muDYo+1Ghf0GAlnJUktH4xzI8YP76KpnPfndqkMk4o+AgbyYY90RARSyrN/jrKDREqbPIyLb2qjIY8iLLdVJHTmaII1iu5EN/iPmTnh/2omkzLVzoC/dW3zVRCBSnik= 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 --- drivers/block/xen-blkback/blkback.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/block/xen-blkback/blkback.c b/drivers/block/xen-blkback/blkback.c index 838064593f62b75f3d937c0c041ea78dedbbaf84..a7c2b04ab943de9cbd69b596aad177a0534f7762 100644 --- a/drivers/block/xen-blkback/blkback.c +++ b/drivers/block/xen-blkback/blkback.c @@ -544,7 +544,7 @@ static void print_stats(struct xen_blkif_ring *ring) ring->st_rd_req, ring->st_wr_req, ring->st_f_req, ring->st_ds_req, ring->persistent_gnt_c, max_pgrants); - ring->st_print = jiffies + msecs_to_jiffies(10 * 1000); + ring->st_print = jiffies + secs_to_jiffies(10); ring->st_rd_req = 0; ring->st_wr_req = 0; ring->st_oo_req = 0;