| Message ID | 20241115-converge-secs-to-jiffies-v1-22-19aadc34941b@linux.microsoft.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | Converge on using secs_to_jiffies() | expand |
On 11/15/2024 1:22 PM, Easwar Hariharan wrote: > 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 <mhklinux@outlook.com> > Signed-off-by: Easwar Hariharan <eahariha@linux.microsoft.com> > Signed-off-by: Thomas Gleixner <tglx@linutronix.de> > Reviewed-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com> > Link: https://lore.kernel.org/all/20241030-open-coded-timeouts-v3-1-9ba123facf88@linux.microsoft.com your signed-off-by should be last. and you have a patch ordering problem since this patch must come before all the patches that use secs_to_jiffies(), otherwise this series cannot be bisected
On 11/15/2024 1:30 PM, Jeff Johnson wrote: > On 11/15/2024 1:22 PM, Easwar Hariharan wrote: >> 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 <mhklinux@outlook.com> >> Signed-off-by: Easwar Hariharan <eahariha@linux.microsoft.com> >> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> >> Reviewed-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com> >> Link: https://lore.kernel.org/all/20241030-open-coded-timeouts-v3-1-9ba123facf88@linux.microsoft.com > > your signed-off-by should be last. > > and you have a patch ordering problem since this patch must come before all > the patches that use secs_to_jiffies(), otherwise this series cannot be bisected Thanks for the quick response, indeed this patch is already in tip[1], I pulled it in for testing the series but missed out on removing it before sending. Please review v2 that excludes this: https://lore.kernel.org/all/20241115-converge-secs-to-jiffies-v2-0-911fb7595e79@linux.microsoft.com/ [1]: https://git.kernel.org/tip/b35108a51cf7bab58d7eace1267d7965978bcdb8 Thanks, Easwar
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,