generic: backport secs_to_jiffies
This is needed for mac80211 v6.14.5 update. b35108a51cf7b jiffies: Define secs_to_jiffies() bb2784d9ab495 jiffies: Cast to unsigned long in secs_to_jiffies() conversionb35108a51cbb2784d9abSigned-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
This commit is contained in:
Álvaro Fernández Rojas
parent
11c936e141
commit
f40250781d
4 changed files with 190 additions and 0 deletions
|
|
@ -0,0 +1,60 @@
|
|||
From b35108a51cf7bab58d7eace1267d7965978bcdb8 Mon Sep 17 00:00:00 2001
|
||||
From: Easwar Hariharan <eahariha@linux.microsoft.com>
|
||||
Date: Wed, 30 Oct 2024 17:47:35 +0000
|
||||
Subject: [PATCH] jiffies: Define secs_to_jiffies()
|
||||
|
||||
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
|
||||
---
|
||||
include/linux/jiffies.h | 13 +++++++++++++
|
||||
net/bluetooth/hci_event.c | 2 --
|
||||
2 files changed, 13 insertions(+), 2 deletions(-)
|
||||
|
||||
--- a/include/linux/jiffies.h
|
||||
+++ b/include/linux/jiffies.h
|
||||
@@ -526,6 +526,19 @@ static __always_inline unsigned long mse
|
||||
}
|
||||
}
|
||||
|
||||
+/**
|
||||
+ * 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)
|
||||
--- 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,
|
||||
|
|
@ -0,0 +1,35 @@
|
|||
From bb2784d9ab49587ba4fbff37a319fff2924db289 Mon Sep 17 00:00:00 2001
|
||||
From: Easwar Hariharan <eahariha@linux.microsoft.com>
|
||||
Date: Thu, 30 Jan 2025 19:26:58 +0000
|
||||
Subject: [PATCH] jiffies: Cast to unsigned long in secs_to_jiffies()
|
||||
conversion
|
||||
|
||||
While converting users of msecs_to_jiffies(), lkp reported that some range
|
||||
checks would always be true because of the mismatch between the implied int
|
||||
value of secs_to_jiffies() vs the unsigned long return value of the
|
||||
msecs_to_jiffies() calls it was replacing.
|
||||
|
||||
Fix this by casting the secs_to_jiffies() input value to unsigned long.
|
||||
|
||||
Fixes: b35108a51cf7ba ("jiffies: Define secs_to_jiffies()")
|
||||
Reported-by: kernel test robot <lkp@intel.com>
|
||||
Signed-off-by: Easwar Hariharan <eahariha@linux.microsoft.com>
|
||||
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
|
||||
Cc: stable@vger.kernel.org
|
||||
Link: https://lore.kernel.org/all/20250130192701.99626-1-eahariha@linux.microsoft.com
|
||||
Closes: https://lore.kernel.org/oe-kbuild-all/202501301334.NB6NszQR-lkp@intel.com/
|
||||
---
|
||||
include/linux/jiffies.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
--- a/include/linux/jiffies.h
|
||||
+++ b/include/linux/jiffies.h
|
||||
@@ -537,7 +537,7 @@ static __always_inline unsigned long mse
|
||||
*
|
||||
* Return: jiffies value
|
||||
*/
|
||||
-#define secs_to_jiffies(_secs) ((_secs) * HZ)
|
||||
+#define secs_to_jiffies(_secs) (unsigned long)((_secs) * HZ)
|
||||
|
||||
extern unsigned long __usecs_to_jiffies(const unsigned int u);
|
||||
#if !(USEC_PER_SEC % HZ)
|
||||
|
|
@ -0,0 +1,60 @@
|
|||
From b35108a51cf7bab58d7eace1267d7965978bcdb8 Mon Sep 17 00:00:00 2001
|
||||
From: Easwar Hariharan <eahariha@linux.microsoft.com>
|
||||
Date: Wed, 30 Oct 2024 17:47:35 +0000
|
||||
Subject: [PATCH] jiffies: Define secs_to_jiffies()
|
||||
|
||||
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
|
||||
---
|
||||
include/linux/jiffies.h | 13 +++++++++++++
|
||||
net/bluetooth/hci_event.c | 2 --
|
||||
2 files changed, 13 insertions(+), 2 deletions(-)
|
||||
|
||||
--- a/include/linux/jiffies.h
|
||||
+++ b/include/linux/jiffies.h
|
||||
@@ -523,6 +523,19 @@ static __always_inline unsigned long mse
|
||||
}
|
||||
}
|
||||
|
||||
+/**
|
||||
+ * 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)
|
||||
--- a/net/bluetooth/hci_event.c
|
||||
+++ b/net/bluetooth/hci_event.c
|
||||
@@ -43,8 +43,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,
|
||||
|
|
@ -0,0 +1,35 @@
|
|||
From bb2784d9ab49587ba4fbff37a319fff2924db289 Mon Sep 17 00:00:00 2001
|
||||
From: Easwar Hariharan <eahariha@linux.microsoft.com>
|
||||
Date: Thu, 30 Jan 2025 19:26:58 +0000
|
||||
Subject: [PATCH] jiffies: Cast to unsigned long in secs_to_jiffies()
|
||||
conversion
|
||||
|
||||
While converting users of msecs_to_jiffies(), lkp reported that some range
|
||||
checks would always be true because of the mismatch between the implied int
|
||||
value of secs_to_jiffies() vs the unsigned long return value of the
|
||||
msecs_to_jiffies() calls it was replacing.
|
||||
|
||||
Fix this by casting the secs_to_jiffies() input value to unsigned long.
|
||||
|
||||
Fixes: b35108a51cf7ba ("jiffies: Define secs_to_jiffies()")
|
||||
Reported-by: kernel test robot <lkp@intel.com>
|
||||
Signed-off-by: Easwar Hariharan <eahariha@linux.microsoft.com>
|
||||
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
|
||||
Cc: stable@vger.kernel.org
|
||||
Link: https://lore.kernel.org/all/20250130192701.99626-1-eahariha@linux.microsoft.com
|
||||
Closes: https://lore.kernel.org/oe-kbuild-all/202501301334.NB6NszQR-lkp@intel.com/
|
||||
---
|
||||
include/linux/jiffies.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
--- a/include/linux/jiffies.h
|
||||
+++ b/include/linux/jiffies.h
|
||||
@@ -534,7 +534,7 @@ static __always_inline unsigned long mse
|
||||
*
|
||||
* Return: jiffies value
|
||||
*/
|
||||
-#define secs_to_jiffies(_secs) ((_secs) * HZ)
|
||||
+#define secs_to_jiffies(_secs) (unsigned long)((_secs) * HZ)
|
||||
|
||||
extern unsigned long __usecs_to_jiffies(const unsigned int u);
|
||||
#if !(USEC_PER_SEC % HZ)
|
||||
Loading…
Reference in a new issue