Skip to contentSkip to conversation

selftests/timers: Fix integer overlow errors on 32 bit systems

PATCH In review Terry Tritton 2 participants 3 messages Jun 3, 2025 – Jun 4, 2025

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 selftests/timers: Fix integer overlow errors on 32 bit systems

The use of NSEC_PER_SEC (1000000000L) as defined in include/vdso/time64.h causes several integer overflow warnings and test errors on 32 bit architectures.

Use a long long instead of long to prevent integer overflow when converting seconds to nanoseconds.

---
 tools/testing/selftests/timers/adjtick.c             | 5 ++++-
 tools/testing/selftests/timers/alarmtimer-suspend.c  | 4 +++-
 tools/testing/selftests/timers/inconsistency-check.c | 4 +++-
 tools/testing/selftests/timers/leap-a-day.c          | 4 +++-
 tools/testing/selftests/timers/mqueue-lat.c          | 3 ++-
 tools/testing/selftests/timers/nanosleep.c           | 4 +++-
 tools/testing/selftests/timers/nsleep-lat.c          | 4 +++-
 tools/testing/selftests/timers/posix_timers.c        | 5 ++++-
 tools/testing/selftests/timers/raw_skew.c            | 4 +++-
 tools/testing/selftests/timers/set-2038.c            | 4 +++-
 tools/testing/selftests/timers/set-timer-lat.c       | 4 +++-
 tools/testing/selftests/timers/valid-adjtimex.c      | 5 ++++-
 12 files changed, 38 insertions(+), 12 deletions(-)
tools/testing/selftests/timers/adjtick.c +4 -1
index 777d9494b683..b5929c33b632 100644
@@ -22,10 +22,13 @@
 #include <sys/time.h>
 #include <sys/timex.h>
 #include <time.h>
-#include <include/vdso/time64.h>
 
 #include "../kselftest.h"
 
+/* define NSEC_PER_SEC as long long to avoid overflow on 32 bit architectures*/
+#define NSEC_PER_SEC   1000000000LL
+#define USEC_PER_SEC   1000000LL
+
 #define MILLION			1000000
 
 long systick;
tools/testing/selftests/timers/alarmtimer-suspend.c +3 -1
index a9ef76ea6051..b5799df271ae 100644
@@ -28,10 +28,12 @@
 #include <signal.h>
 #include <stdlib.h>
 #include <pthread.h>
-#include <include/vdso/time64.h>
 #include <errno.h>
 #include "../kselftest.h"
 
+/* define NSEC_PER_SEC as long long to avoid overflow on 32 bit architectures*/
+#define NSEC_PER_SEC   1000000000LL
+
 #define UNREASONABLE_LAT (NSEC_PER_SEC * 5) /* hopefully we resume in 5 secs */
 
 #define SUSPEND_SECS 15
tools/testing/selftests/timers/inconsistency-check.c +3 -1
index 9d1573769d55..2b2d7293b313 100644
@@ -28,9 +28,11 @@
 #include <sys/timex.h>
 #include <string.h>
 #include <signal.h>
-#include <include/vdso/time64.h>
 #include "../kselftest.h"
 
+/* define NSEC_PER_SEC as long long to avoid overflow on 32 bit architectures*/
+#define NSEC_PER_SEC   1000000000LL
+
 /* CLOCK_HWSPECIFIC == CLOCK_SGI_CYCLE (Deprecated) */
 #define CLOCK_HWSPECIFIC		10
 
tools/testing/selftests/timers/leap-a-day.c +3 -1
index 04004a7c0934..008c38ce4b2f 100644
@@ -48,9 +48,11 @@
 #include <string.h>
 #include <signal.h>
 #include <unistd.h>
-#include <include/vdso/time64.h>
 #include "../kselftest.h"
 
+/* define NSEC_PER_SEC as long long to avoid overflow on 32 bit architectures*/
+#define NSEC_PER_SEC   1000000000LL
+
 #define CLOCK_TAI 11
 
 time_t next_leap;
tools/testing/selftests/timers/mqueue-lat.c +2 -1
index 63de2334a291..1a6d26f86137 100644
@@ -29,9 +29,10 @@
 #include <signal.h>
 #include <errno.h>
 #include <mqueue.h>
-#include <include/vdso/time64.h>
 #include "../kselftest.h"
 
+/* define NSEC_PER_SEC as long long to avoid overflow on 32 bit architectures*/
+#define NSEC_PER_SEC   1000000000LL
 
 #define TARGET_TIMEOUT		100000000	/* 100ms in nanoseconds */
 #define UNRESONABLE_LATENCY	40000000	/* 40ms in nanosecs */
tools/testing/selftests/timers/nanosleep.c +3 -1
index 252c6308c569..55ea67478fdd 100644
@@ -27,9 +27,11 @@
 #include <sys/timex.h>
 #include <string.h>
 #include <signal.h>
-#include <include/vdso/time64.h>
 #include "../kselftest.h"
 
+/* define NSEC_PER_SEC as long long to avoid overflow on 32 bit architectures*/
+#define NSEC_PER_SEC   1000000000LL
+
 /* CLOCK_HWSPECIFIC == CLOCK_SGI_CYCLE (Deprecated) */
 #define CLOCK_HWSPECIFIC		10
 
tools/testing/selftests/timers/nsleep-lat.c +3 -1
index de23dc0c9f97..347d622987c8 100644
@@ -24,9 +24,11 @@
 #include <sys/timex.h>
 #include <string.h>
 #include <signal.h>
-#include <include/vdso/time64.h>
 #include "../kselftest.h"
 
+/* define NSEC_PER_SEC as long long to avoid overflow on 32 bit architectures*/
+#define NSEC_PER_SEC   1000000000LL
+
 #define UNRESONABLE_LATENCY 40000000 /* 40ms in nanosecs */
 
 /* CLOCK_HWSPECIFIC == CLOCK_SGI_CYCLE (Deprecated) */
tools/testing/selftests/timers/posix_timers.c +4 -1
index f0eceb0faf34..555bf161f420 100644
@@ -16,11 +16,14 @@
 #include <string.h>
 #include <unistd.h>
 #include <time.h>
-#include <include/vdso/time64.h>
 #include <pthread.h>
 
 #include "../kselftest.h"
 
+/* define NSEC_PER_SEC as long long to avoid overflow on 32 bit architectures*/
+#define NSEC_PER_SEC   1000000000LL
+#define USEC_PER_SEC   1000000LL
+
 #define DELAY 2
 
 static void __fatal_error(const char *test, const char *name, const char *what)
tools/testing/selftests/timers/raw_skew.c +3 -1
index 957f7cd29cb1..ff7675d98560 100644
@@ -25,9 +25,11 @@
 #include <sys/time.h>
 #include <sys/timex.h>
 #include <time.h>
-#include <include/vdso/time64.h>
 #include "../kselftest.h"
 
+/* define NSEC_PER_SEC as long long to avoid overflow on 32 bit architectures*/
+#define NSEC_PER_SEC   1000000000LL
+
 #define shift_right(x, s) ({		\
 	__typeof__(x) __x = (x);	\
 	__typeof__(s) __s = (s);	\
tools/testing/selftests/timers/set-2038.c +3 -1
index ed244315e11c..8130d551a11c 100644
@@ -27,9 +27,11 @@
 #include <unistd.h>
 #include <time.h>
 #include <sys/time.h>
-#include <include/vdso/time64.h>
 #include "../kselftest.h"
 
+/* define NSEC_PER_SEC as long long to avoid overflow on 32 bit architectures*/
+#define NSEC_PER_SEC   1000000000LL
+
 #define KTIME_MAX	((long long)~((unsigned long long)1 << 63))
 #define KTIME_SEC_MAX	(KTIME_MAX / NSEC_PER_SEC)
 
tools/testing/selftests/timers/set-timer-lat.c +3 -1
index 9d8437c13929..79a6a6cba186 100644
@@ -28,9 +28,11 @@
 #include <signal.h>
 #include <stdlib.h>
 #include <pthread.h>
-#include <include/vdso/time64.h>
 #include "../kselftest.h"
 
+/* define NSEC_PER_SEC as long long to avoid overflow on 32 bit architectures*/
+#define NSEC_PER_SEC   1000000000LL
+
 /* CLOCK_HWSPECIFIC == CLOCK_SGI_CYCLE (Deprecated) */
 #define CLOCK_HWSPECIFIC		10
 
tools/testing/selftests/timers/valid-adjtimex.c +4 -1
index 6b7801055ad1..e4f31e678630 100644
@@ -29,9 +29,12 @@
 #include <string.h>
 #include <signal.h>
 #include <unistd.h>
-#include <include/vdso/time64.h>
 #include "../kselftest.h"
 
+/* define NSEC_PER_SEC as long long to avoid overflow on 32 bit architectures*/
+#define NSEC_PER_SEC   1000000000LL
+#define USEC_PER_SEC   1000000LL
+
 #define ADJ_SETOFFSET 0x0100
 
 #include <sys/syscall.h>
Signature · 1 line
2.39.5
maintainer
#1 lore raw
Quoted 9 lines · Terry Tritton

The use of NSEC_PER_SEC (1000000000L) as defined in include/vdso/time64.h causes several integer overflow warnings and test errors on 32 bit architectures.

Use a long long instead of long to prevent integer overflow when converting seconds to nanoseconds.

Needs a Fixes: tag?

Quoted 40 lines
---
 tools/testing/selftests/timers/adjtick.c             | 5 ++++-
 tools/testing/selftests/timers/alarmtimer-suspend.c  | 4 +++-
 tools/testing/selftests/timers/inconsistency-check.c | 4 +++-
 tools/testing/selftests/timers/leap-a-day.c          | 4 +++-
 tools/testing/selftests/timers/mqueue-lat.c          | 3 ++-
 tools/testing/selftests/timers/nanosleep.c           | 4 +++-
 tools/testing/selftests/timers/nsleep-lat.c          | 4 +++-
 tools/testing/selftests/timers/posix_timers.c        | 5 ++++-
 tools/testing/selftests/timers/raw_skew.c            | 4 +++-
 tools/testing/selftests/timers/set-2038.c            | 4 +++-
 tools/testing/selftests/timers/set-timer-lat.c       | 4 +++-
 tools/testing/selftests/timers/valid-adjtimex.c      | 5 ++++-
 12 files changed, 38 insertions(+), 12 deletions(-)
tools/testing/selftests/timers/adjtick.c +4 -1
index 777d9494b683..b5929c33b632 100644
@@ -22,10 +22,13 @@
 #include <sys/time.h>
 #include <sys/timex.h>
 #include <time.h>
-#include <include/vdso/time64.h>
 
 #include "../kselftest.h"
 
+/* define NSEC_PER_SEC as long long to avoid overflow on 32 bit architectures*/
+#define NSEC_PER_SEC   1000000000LL
+#define USEC_PER_SEC   1000000LL
+
 #define MILLION                        1000000
 
 long systick;
tools/testing/selftests/timers/alarmtimer-suspend.c +0 -0
index a9ef76ea6051..b5799df271ae 100644
@@ -28,10 +28,12 @@
 #include <signal.h>

tools/testing/selftests/timers/alarmtimer-suspend.c line 37

Quoted 10 lines
tools/testing/selftests/timers/alarmtimer-suspend.c +3 -1
 #include <stdlib.h>
 #include <pthread.h>
-#include <include/vdso/time64.h>
 #include <errno.h>
 #include "../kselftest.h"
 
+/* define NSEC_PER_SEC as long long to avoid overflow on 32 bit architectures*/
+#define NSEC_PER_SEC   1000000000LL
+
 #define UNREASONABLE_LAT (NSEC_PER_SEC * 5) /* hopefully we resume in 5 secs */

So this seems to be undoing commit 80fa614e2fbc ("selftests: timers:
Remove local NSEC_PER_SEC and USEC_PER_SEC defines")

Would it make more sense to fix the NSEC_PER_SEC definition in time64.h to a LL?

thanks
-john

#2 lore raw
Quoted 2 lines

So this seems to be undoing commit 80fa614e2fbc ("selftests: timers:
Remove local NSEC_PER_SEC and USEC_PER_SEC defines")

Thanks John, I somehow missed 80fa614e2fbc and was wondering how this had got in.

Quoted 1 line

Would it make more sense to fix the NSEC_PER_SEC definition in time64.h to a LL?

I was just thinking the same this morning but wasn't sure if this would cause issues anywhere else.

I'll send a patch to change NSEC_PER_SEC in time64.h as its a lot cleaner that way.

Thanks
Terry