From patchwork Fri Nov 15 21:22:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Easwar Hariharan X-Patchwork-Id: 13876922 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 4CB92D68BD7 for ; Fri, 15 Nov 2024 21:23:44 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A3A976B00AB; Fri, 15 Nov 2024 16:22:58 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 8AF006B00AC; Fri, 15 Nov 2024 16:22:58 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 68DDD6B00AE; Fri, 15 Nov 2024 16:22:58 -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 449436B00AC for ; Fri, 15 Nov 2024 16:22:58 -0500 (EST) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id EB3AC120422 for ; Fri, 15 Nov 2024 21:22:57 +0000 (UTC) X-FDA: 82789602630.06.BC11F44 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by imf11.hostedemail.com (Postfix) with ESMTP id 5F66B40007 for ; Fri, 15 Nov 2024 21:21:59 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=linux.microsoft.com header.s=default header.b=iplUk1Nd; dmarc=pass (policy=none) header.from=linux.microsoft.com; spf=pass (imf11.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=1731705596; a=rsa-sha256; cv=none; b=tqjSZrC3ITZUQUVLUC8WOhbcr4JR7Twu42N+pXfwswIXhCBDIybUJUkp1NyhGAqnpqV0JL gZ3XzXWjXgYgbFpp0fM8ZWf+ZprZSsFieDpcWXi64Eg25Vy6EQvLyqeGKQ8dkAdPm1Naxg iooxA4R8FXfEykAS6R8E2DmPXc0b4Mc= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=linux.microsoft.com header.s=default header.b=iplUk1Nd; dmarc=pass (policy=none) header.from=linux.microsoft.com; spf=pass (imf11.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=1731705596; 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=8an4FgjBOt1s+5Gzupd7mugSuJBcUUHR7ha3x9HR0Ag=; b=hBxUtQ+MhocM0OGR1r1qoGHwc2V887K+yOazX56v+IWTW7cC0v9xoapwvWyN7yPipXdQoe 46wvfol0j8Xo1zmLqP6HnEhll0neELFOHtaVQ23yaI3fcXY4R6Iwo2KJfFIpDOzvW5wILA 0zIXHEXYGsnyFJnYWx/14A8bPKgj2Ik= Received: from eahariha-devbox.internal.cloudapp.net (unknown [40.91.112.99]) by linux.microsoft.com (Postfix) with ESMTPSA id A22AA206BCEE; Fri, 15 Nov 2024 13:22:46 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com A22AA206BCEE DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1731705766; bh=8an4FgjBOt1s+5Gzupd7mugSuJBcUUHR7ha3x9HR0Ag=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=iplUk1Nduoh9asilHgzn6HQycVN1VFv/mFBOdW0Mpd4aq8sOOirOgItcWBMTidM3Q FvxfPpyBxEWdptBjBV3AGgplTOjNGMgWDICXRk9fFUvguk5wrwqFw5sjChgX9PZPt7 /h1a1SkEI1LPNYXASotI6c+cUqHfSyHVemxnfBAU= From: Easwar Hariharan Date: Fri, 15 Nov 2024 21:22:52 +0000 Subject: [PATCH 22/22] jiffies: Define secs_to_jiffies() MIME-Version: 1.0 Message-Id: <20241115-converge-secs-to-jiffies-v1-22-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 , Michael Kelley , Thomas Gleixner , Luiz Augusto von Dentz X-Mailer: b4 0.14.2 X-Stat-Signature: tz9777exhwpcbyzbxfgd1q4mtx358pa1 X-Rspamd-Queue-Id: 5F66B40007 X-Rspamd-Server: rspam08 X-Rspam-User: X-HE-Tag: 1731705719-50082 X-HE-Meta: U2FsdGVkX1/M3q4+CilB+XqnpcZegjXTkJ2sIQ0Ch6RyTkyjnpMz5xWt/p9XqcdXTxH3xZEIZajwMnuMbwlUxq7E1k1EhYy+qpljSB9UYHqvxqkHGgxjFmHedIt3Y780Zej2IhmVLt+RbTur4G4Hdk/UDXxKAfEdU2TL525PtwFTdacAcVlRKZEr3wpY9zAlYW8sJd/y6nH/UCofgR8Z0Ao9ireCPnztG/ULvz1GwYKdbP/myRyyXzrF6ExJeOP/749x6svfnnGvbT0VHEUiUtUMy5qPeOvYPhlbkrRmIN39mv0X1R2OZiH/ZM28FWLRytNeH5fRyR/g+y9MMLl4ohfM6EWeUHqOXVeOCF138aCOvEFGDQDhFCY7ff8kXxBbAPxl3EGN3usRipKZMai0wPf2jxYwJKEPMkZ62L2hfqRpJ8NEE+fr6l9eLKPJZ7iKc7y6wyDCi+zk+vi4d7tWZE40wbpFUxQFrPqJdyir5tIvdcID0etSi28pARI/+9ifR0NXYefCCOW2A7ywhpVwaAvxXzQilYAl2f7HlsapHSDlZDsDKnELYewBx6UUc7suml2NRKy7BODKagED9Qpyy34eOwPkJOd4aB3rqTWV1NJBL6Lc0XIDisrZyi6po90KGTbWXiKysUvDS/+c1d+y8mOx3BIgtsQTQt85aXt/lVBWzlvTJPIZBh3kn/sicxydHCNeuSy0QKAgKhNQiknOOYC4x08+zIqfqPxAcXhcz5h+5/52tORdTVdZJpT2C4ULPrGLah+jQnrDjTTQYgh2qJ5TjhL/JEwCerbVhQT2Lef3B/ZEjUvrFBf7yd0wZaJ+jJms0uWdsPtZE8m3v0RFHsvnIgSMi9isMAb0XTVn9LhhbOM/asTaTUXgcZ0nUDFZczIxmsgp6sDMAOjJxaZN8bHy7aOLSNTmB1087g1ju7H1uFPlG7CuxOs8Dw71gb5wpL4XPFvGvxJ1RSwovCi PurRC6nA CpQyuyGfbNbQaVEMuQnrrkcNABGvB/rGShqe+GbPCgVG8XANyy97xAXvy4emNOYotSVMtRG//lJABuZ4Pz+2l+wO9H5t4HyTL67MMR3jNldPhoJb6VW7mudH/gg5GosijxgFVjv3ON07hCwFItSQSNzN9XZeGv369CLCHWzfQluIF1MhEhKCiwffxYExyEvxIyDbsCsU/Kg301OnDq0cLgJ67NwagEZcaVnC5/JR7OsT5PA3YoPMCTbynP8RCBRDZ8DDq5nwUNk9uwiM0GGtbM/wrxKmnuESAk5AHq7WlfPhXzzIONmBVvngjJ4EGi/TchlWB1eoA5/i07Wj46GHr0FvEJKjP4TQyMxR0exPSG3iI+wSLmHyxksoJEe9mT6xaTLC8OHVvanYLh5nId1FregGX5emq4MVQMDeR5GK4TkjebiV4OhEfrSf+7fH1Vbdwem07NkhGSEpC1+JlCiUVj5s3mqT8huKazvaxL7OcG84nyswc038Cm5xfU9VidAu/KCiu 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: secs_to_jiffies() is defined in hci_event.c and cannot be reused by other call sites. Hoist it into the core code to allow conversion of the ~1150 usages of msecs_to_jiffies() that either: - use a multiplier value of 1000 or equivalently MSEC_PER_SEC, or - have timeouts that are denominated in seconds (i.e. end in 000) It's implemented as a macro to allow usage in static initializers. This will also allow conversion of yet more sites that use (sec * HZ) directly, and improve their readability. Suggested-by: Michael Kelley Signed-off-by: Easwar Hariharan Signed-off-by: Thomas Gleixner Reviewed-by: Luiz Augusto von Dentz Link: https://lore.kernel.org/all/20241030-open-coded-timeouts-v3-1-9ba123facf88@linux.microsoft.com --- include/linux/jiffies.h | 13 +++++++++++++ net/bluetooth/hci_event.c | 2 -- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/include/linux/jiffies.h b/include/linux/jiffies.h index 1220f0fbe5bf9fb6c559b4efd603db3e97db9b65..0a7382753c6b636fe285599953e314fb7479ea01 100644 --- a/include/linux/jiffies.h +++ b/include/linux/jiffies.h @@ -526,6 +526,19 @@ static __always_inline unsigned long msecs_to_jiffies(const unsigned int m) } } +/** + * secs_to_jiffies: - convert seconds to jiffies + * @_secs: time in seconds + * + * Conversion is done by simple multiplication with HZ + * + * secs_to_jiffies() is defined as a macro rather than a static inline + * function so it can be used in static initializers. + * + * Return: jiffies value + */ +#define secs_to_jiffies(_secs) ((_secs) * HZ) + extern unsigned long __usecs_to_jiffies(const unsigned int u); #if !(USEC_PER_SEC % HZ) static inline unsigned long _usecs_to_jiffies(const unsigned int u) diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index 0bbad90ddd6f87e87c03859bae48a7901d39b634..7b35c58bbbeb79f2b50a02212771fb283ba5643d 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c @@ -42,8 +42,6 @@ #define ZERO_KEY "\x00\x00\x00\x00\x00\x00\x00\x00" \ "\x00\x00\x00\x00\x00\x00\x00\x00" -#define secs_to_jiffies(_secs) msecs_to_jiffies((_secs) * 1000) - /* Handle HCI Event packets */ static void *hci_ev_skb_pull(struct hci_dev *hdev, struct sk_buff *skb,