[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20250704190234.14230-1-terry.tritton@linaro.org>
Date: Fri, 4 Jul 2025 20:02:34 +0100
From: Terry Tritton <terry.tritton@...aro.org>
To: Thomas Gleixner <tglx@...utronix.de>,
Shuah Khan <shuah@...nel.org>,
Ingo Molnar <mingo@...hat.com>,
Peter Zijlstra <peterz@...radead.org>,
Darren Hart <dvhart@...radead.org>,
Davidlohr Bueso <dave@...olabs.net>,
André Almeida <andrealmeid@...lia.com>
Cc: ttritton@...gle.com,
linux-kselftest@...r.kernel.org,
linux-kernel@...r.kernel.org,
Terry Tritton <terry.tritton@...aro.org>,
Wei Gao <wegao@...e.com>
Subject: [PATCH v5] selftests/futex: Convert 32bit timespec struct to 64bit version for 32bit compatibility mode
sys_futex_wait() can not accept old_timespec32 struct, so userspace should
convert it from 32bit to 64bit before syscall to support 32bit compatible
mode.
This fix is based off [1]
Link: https://lore.kernel.org/all/20231203235117.29677-1-wegao@suse.com/ [1]
Originally-by: Wei Gao <wegao@...e.com>
Signed-off-by: Terry Tritton <terry.tritton@...aro.org>
---
Changes in v5:
- Fixed checkpatch errors
Changes in v4:
- Change to use __kernel_timespec as suggested by tglx
Changes in v3:
- Fix signed-off-by chain but for real this time
Changes in v2:
- Fix signed-off-by chain
tools/testing/selftests/futex/include/futex2test.h | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/tools/testing/selftests/futex/include/futex2test.h b/tools/testing/selftests/futex/include/futex2test.h
index ea79662405bc..ff9eebcc270c 100644
--- a/tools/testing/selftests/futex/include/futex2test.h
+++ b/tools/testing/selftests/futex/include/futex2test.h
@@ -5,6 +5,7 @@
* Copyright 2021 Collabora Ltd.
*/
#include <stdint.h>
+#include <linux/time_types.h>
#define u64_to_ptr(x) ((void *)(uintptr_t)(x))
@@ -65,7 +66,12 @@ struct futex32_numa {
static inline int futex_waitv(volatile struct futex_waitv *waiters, unsigned long nr_waiters,
unsigned long flags, struct timespec *timo, clockid_t clockid)
{
- return syscall(__NR_futex_waitv, waiters, nr_waiters, flags, timo, clockid);
+ struct __kernel_timespec ts = {
+ .tv_sec = timo->tv_sec,
+ .tv_nsec = timo->tv_nsec,
+ };
+
+ return syscall(__NR_futex_waitv, waiters, nr_waiters, flags, &ts, clockid);
}
/*
--
2.39.5
Powered by blists - more mailing lists