From patchwork Tue Dec 10 22:02:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Easwar Hariharan X-Patchwork-Id: 13902184 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 5CEB7E77180 for ; Tue, 10 Dec 2024 22:03:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 85CAC8D001C; Tue, 10 Dec 2024 17:02:51 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 7084C6B009B; 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 1B2306B00A9; Tue, 10 Dec 2024 17:02:51 -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 D17D78D001D for ; Tue, 10 Dec 2024 17:02:50 -0500 (EST) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 82C1BC0EFF for ; Tue, 10 Dec 2024 22:02:50 +0000 (UTC) X-FDA: 82880423850.08.A5608EC Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by imf12.hostedemail.com (Postfix) with ESMTP id 223B84001A for ; Tue, 10 Dec 2024 22:02:35 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=linux.microsoft.com header.s=default header.b=MyS1GphF; spf=pass (imf12.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=1733868155; 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=Nu1FTDRwT3eJ8G3TZ1SOaVXDK1brjinK2gy4k85VNBc=; b=mIkk1l+XhyfbQvFLN5iZV6S9ZLD7nBRgruwXaOaMs80qMR9WiL7d7fJTbI8tkrBYY13qxg lO09VASN1VoOhX2YIZAXQMPf89JTS3xTdtmULSGj1eNgNhzWcB+IUAGyLgXeyKcicwrwWm 1nCjaG0su+7C+ZUfiw4swBo5AKDUWNs= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1733868155; a=rsa-sha256; cv=none; b=koJXtrCfZjtuQ93bDmDv1Idf0S5MX7AF0yBNHw157iKaqVepGCsmNqqyoFQX7CVzfq8AsY OxiuN1igUDykM0NeHORhC2ol0k4KeE5/8m3fIotAiIhTiRUe4WxnB/1/bCNxZOZR8wB8NW 7iYgdYfCq4PvUr8g0Q8sRc1HGI/fxss= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=linux.microsoft.com header.s=default header.b=MyS1GphF; spf=pass (imf12.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 CC9872047232; Tue, 10 Dec 2024 14:02:38 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com CC9872047232 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1733868158; bh=Nu1FTDRwT3eJ8G3TZ1SOaVXDK1brjinK2gy4k85VNBc=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=MyS1GphFvmGr2JHW6tyCf5nlmMH9PAcPu/qJOqDicxYHN3ga/E8mPiUpYdOmKe+08 ESmMPf61fW9R/vd5fEqw2UI0IyMH9O+5zBGiCitLbR/PLOMP+sV+LtAwK3GV6cBnMZ qMuvwZX6TCbpYuenDC/gzSBNDFt3OVWamZA4/4ys= From: Easwar Hariharan Date: Tue, 10 Dec 2024 22:02:44 +0000 Subject: [PATCH v3 13/19] gve: Convert timeouts to secs_to_jiffies() MIME-Version: 1.0 Message-Id: <20241210-converge-secs-to-jiffies-v3-13-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-Server: rspam10 X-Rspamd-Queue-Id: 223B84001A X-Stat-Signature: anr8yq1r38bwewx7sdkhhonjmeq5f45q X-Rspam-User: X-HE-Tag: 1733868155-533665 X-HE-Meta: U2FsdGVkX19n6lUL0S0VNonazSaciOM/QKZF4E2zWBpD+weBPM1gy5Z+oca0FtZtI0M+6c/4g+NY802YHpf/EToYZ18twKMArdNPcxvcwnhXXKrQq4DWhbi/WWklt23HKnQJipOVnkuiTxd8RBWZ1jBbBMYDglNaXyyi8TP9kOAvzagV5PFko9nBhD8RX4fcFIvDJT6xouLcZ50BZ5xOLe/UkIKoD52hzIqHkP6bcknyqQ06qOVd2SS4JL9bmugA/Tu2bJMmhp4Ye4aoOy/FmbYTcFOFeq+b6mme8EDzGyOt0xQsXB9+2sLJxD/Ro1ymjxgUV4TBwAICOJfQvVyAh1oPwFEGOJiIGfitSCsW4f3v77w9Deq1uwiLaDqfAarsvfvZuk7HqYD4Mtu1RLcwO0ORu9egA4jxFHyqY8ArnjZ34s2hPgdS2E3wYmYYokmnsCxrKXZeijZ9kQNPy2BG6K+wZw1pqPzsflVIniVIuI3j2CuUC9VGRSxNebELn49+xaLKmh2GqHG7oPzR34h1rea5y5l1zdcmYIE/xcRyra1/9B3JiPOSKaqaoMAeeEHhko60cH2LgKjuSzjgB5dM4GVhkqNGcUuMNk9qDh58J0ifdsi5sEfmCrQgJ31Ol5AGeLabD03RG+TvREI32rPtV1m0pA8KFu0sUYkXynUd7XWx2O1V2jO+v0T6G+Y7rfag2iS934xykQT4/+99ofmY0osvq6N6jmJ7VUCIIxEy2lYhe5TQVDYwWlgBuGXFC5qgswLgWz6r90G6vLPWS9kSPuTH0DBA3MBD1KjTx5Bj/tS+hh9icq9YzE8AGovH/csNCreIOKrI1lSWqIdLSMvs3r1j+MnbS0toXADzZFI+8vBkhc/owAK6LKyqjWumTqGsFf4TH3/W/p8K/G0510MjXFsOkFKUinf+sA1fWNDXauwSYd1RdXXljAn4Z4d4u2s5v+vY8IZAd4V1T2tbK3G YPXQh3Ip IKjAn/0wYHNcHp5j10Ne8vyHKP8aFGgORyMGZ1m6K1+BxHrtJKa15+HCfGD/Ie9/s6vv+ckKNLBwIv0rxrh0Uxvxr4rz/Zf9FyCK0IYM2Z3LCKPUwmggNKNbLvjlRLLhV18DuIHgKkciy6IDPo9vO6cShQuqlqmF3ues40tgIj3xON6B1V6O1l97dlxoodVcvWoICzJZpX2aFy8QW4qzJJXU7KKV+/HucsVcItE+imLUPTZO3WQ0mSp/aUMKBsb6UmBAN91NOiId4ybJ9KH9E2wuDNurTG6+Olc8RbJuTzi+YbGEpOEqt61ao7OwAj0CH/aaopMQQnn842w1PtPBoXhA0NxaDE3Lbv2Otl5Zru1Fc8zRSmOox42+GVB74uF/OqHINxWD/4bDDB6X34TqCDRyCyX4Gre+/jC4yUvFh8/YC+tMpDxs3S7nVAA== 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/net/ethernet/google/gve/gve_tx_dqo.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/google/gve/gve_tx_dqo.c b/drivers/net/ethernet/google/gve/gve_tx_dqo.c index f879426cb5523a7e150f363b5e57b9d472b5817c..394debc62268aadf2579f9b516e045cb48287e7c 100644 --- a/drivers/net/ethernet/google/gve/gve_tx_dqo.c +++ b/drivers/net/ethernet/google/gve/gve_tx_dqo.c @@ -1146,8 +1146,7 @@ static void gve_handle_miss_completion(struct gve_priv *priv, /* jiffies can wraparound but time comparisons can handle overflows. */ pending_packet->timeout_jiffies = jiffies + - msecs_to_jiffies(GVE_REINJECT_COMPL_TIMEOUT * - MSEC_PER_SEC); + secs_to_jiffies(GVE_REINJECT_COMPL_TIMEOUT); add_to_list(tx, &tx->dqo_compl.miss_completions, pending_packet); *bytes += pending_packet->skb->len; @@ -1191,8 +1190,7 @@ static void remove_miss_completions(struct gve_priv *priv, pending_packet->state = GVE_PACKET_STATE_TIMED_OUT_COMPL; pending_packet->timeout_jiffies = jiffies + - msecs_to_jiffies(GVE_DEALLOCATE_COMPL_TIMEOUT * - MSEC_PER_SEC); + secs_to_jiffies(GVE_DEALLOCATE_COMPL_TIMEOUT); /* Maintain pending packet in another list so the packet can be * unallocated at a later time. */