Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
IronPort-SDR: XR6tseZ9KPfvwmOVTCKJMpC6Hca0bG8UKMMtBM8DCu77tTyt3kJCZjFgpVsEt0y3qsMFAuyxB+
 TFSP5aYQr467Th3m/42iaMGaAI5tp3dfVMecuD4c+h5BfO+jOWG8xAUnfUltKH/NFhQ8jCwE1/
 bW+a2WY9C7x7APq0SUzNtc0FcbX7pIhLIKn3rPkiKNqXjihfz/5mwW5ekhBZgvXcKok7sPKYT1
 FEr802J+VcdqrQIw7fIX4qb7qb5nDsD0SxyJmwD0AAhbf+8G+gflrn1NzT0fE1TmsnQKxQ5N0I
 cra0E77q2MZqn9113M09LDRp
IronPort-SDR: IxmNl1uIt4AtQ/z1CYngkhdNHMNXkf91ky94avUy4B9ZaRSABv0rU9oL5jJK70HKwdrbKmu7lY
 UCMdYAHq8lCe1+USGYK6EwHDVKcn1mEtex6wE6m42HwqUCVFs16xkigCaNb7cz3XhYn+XbmfqM
 BoDCiLI0rl9wuYKG4Xh1W42S0pnbN9vGBfaogkQrPzV+xtQcW3vi7r0J/4bSN9NBrCaQkFkisT
 J5FwxYozzSbn3UZQiA00IeRKWb8+WfHuHZRPi2tKYrWZd0E0o3B+YvTH14fZNhWCDJhE1Iexsa
 PUA=
WDCIronportException: Internal
From:   Alistair Francis <alistair.francis@opensource.wdc.com>
To:     linux-riscv@lists.infradead.org, linux-perf-users@vger.kernel.org
Cc:     linux-kernel@vger.kernel.org, alistair23@gmail.com,
        namhyung@kernel.org, jolsa@redhat.com,
        alexander.shishkin@linux.intel.com, mark.rutland@arm.com,
        acme@kernel.org, dave@stgolabs.net, dvhart@infradead.org,
        peterz@infradead.org, mingo@redhat.com, tglx@linutronix.de,
        atish.patra@wdc.com, arnd@arndb.de,
        Alistair Francis <alistair.francis@wdc.com>
Subject: [PATCH v2 2/2] perf bench: Add support for 32-bit systems with 64-bit time_t
Date:   Fri, 10 Sep 2021 14:31:02 +1000
Message-Id: <20210910043102.3616198-2-alistair.francis@opensource.wdc.com>
In-Reply-To: <20210910043102.3616198-1-alistair.francis@opensource.wdc.com>
References: <20210910043102.3616198-1-alistair.francis@opensource.wdc.com>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

From: Alistair Francis <alistair.francis@wdc.com>

Some 32-bit architectures (such are 32-bit RISC-V) only have a 64-bit
time_t and as such don't have the SYS_futex syscall. This patch will
allow us to use the SYS_futex_time64 syscall on those platforms.

Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
---
 tools/perf/bench/futex.h | 43 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 42 insertions(+), 1 deletion(-)

diff --git a/tools/perf/bench/futex.h b/tools/perf/bench/futex.h
index f80a4759ee79b..09c5596726c60 100644
--- a/tools/perf/bench/futex.h
+++ b/tools/perf/bench/futex.h
@@ -27,6 +27,12 @@ struct bench_futex_parameters {
 	unsigned int nrequeue;
 };
=20
+/* A version of 'struct timespec' with 32-bit time_t and nanoseconds.  *=
/
+struct __timespec32 {
+	__kernel_long_t tv_sec;
+	__kernel_long_t tv_nsec;
+};
+
 /**
  * futex_syscall() - SYS_futex syscall wrapper
  * @uaddr:	address of first futex
@@ -49,14 +55,49 @@ static inline int
 futex_syscall(u_int32_t *uaddr, int op, u_int32_t val, struct timespec *=
timeout,
 	u_int32_t *uaddr2, int val3, int opflags)
 {
-	return syscall(SYS_futex, uaddr, op | opflags, val, ts32, uaddr2, val3)=
;
+#if defined(SYS_futex_time64)
+	if (sizeof(*timeout) !=3D sizeof(struct __timespec32)) {
+		int ret =3D  syscall(SYS_futex_time64, uaddr, op | opflags, val, timeo=
ut,
+				   uaddr2, val3);
+	if (ret =3D=3D 0 || errno !=3D ENOSYS)
+		return ret;
+	}
+#endif
+
+#if defined(SYS_futex)
+	if (sizeof(*timeout) =3D=3D sizeof(struct __timespec32))
+		return syscall(SYS_futex, uaddr, op | opflags, val, timeout, uaddr2, v=
al3);
+
+	if (timeout && timeout->tv_sec =3D=3D (long)timeout->tv_sec) {
+		struct __timespec32 ts32;
+
+		ts32.tv_sec =3D (__kernel_long_t) timeout->tv_sec;
+		ts32.tv_nsec =3D (__kernel_long_t) timeout->tv_nsec;
+
+		return syscall(SYS_futex, uaddr, op | opflags, val, ts32, uaddr2, val3=
);
+	} else if (!timeout) {
+		return syscall(SYS_futex, uaddr, op | opflags, val, NULL, uaddr2, val3=
);
+	}
+#endif
+
+	errno =3D ENOSYS;
+	return -1;
 }
=20
 static inline int
 futex_syscall_nr_requeue(u_int32_t *uaddr, int op, u_int32_t val, int nr=
_requeue,
 	u_int32_t *uaddr2, int val3, int opflags)
 {
+#if defined(SYS_futex_time64)
+	int ret =3D  syscall(SYS_futex_time64, uaddr, op | opflags, val, nr_req=
ueue,
+			   uaddr2, val3);
+	if (ret =3D=3D 0 || errno !=3D ENOSYS)
+		return ret;
+#endif
+
+#if defined(SYS_futex)
 	return syscall(SYS_futex, uaddr, op | opflags, val, nr_requeue, uaddr2,=
 val3);
+#endif
 }
=20
 /**
--=20
2.31.1