From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7BDEBC433EF for ; Thu, 2 Dec 2021 11:17:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1357259AbhLBLVM (ORCPT ); Thu, 2 Dec 2021 06:21:12 -0500 Received: from esa6.hgst.iphmx.com ([216.71.154.45]:43073 "EHLO esa6.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1357277AbhLBLVL (ORCPT ); Thu, 2 Dec 2021 06:21:11 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1638443870; x=1669979870; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=aTuTMZR7mHk5WuMQ4CKbLXlaRLZp274pvCDzMBGKakM=; b=kJp62AJMlzOZDKDPD2oqPuJIemQfu6IRHkH/ZB2/qJtSYrCM8bMkItt/ UMnFXW6YuGOSY9j2m/nbcLYBf7MceHafgKGG47ATF5zDJQrhlCnESk/f0 gGgJ1JUGd95PetdPuCSDvRcQNPWOGV+LLAJmXp5jvqnW1+81xsuS+9+2F 6yXP6rLwiv3SqMYQVWmYX+G4pVB1MdHxMZHfgJX3A7e1iKxc4sgELJEn8 P6lAiD6xk3ZrjVeBU4/1DZQjPr5PkZYi3XDFl5YuFZ9e6gWXxk8R3BcCT M1Z0Ll0diw8Y3eSin1aUfpuje8bVGnVQ8uXB7jNqW2gQVxqH85ln6HZMW w==; X-IronPort-AV: E=Sophos;i="5.87,281,1631548800"; d="scan'208";a="188288612" Received: from h199-255-45-14.hgst.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 02 Dec 2021 19:17:48 +0800 IronPort-SDR: UM1BJSp1gY/Sr0n33AvkbYi30Wd2FRn0y6DtvkXfSmsHEvEb7RWJSkw/FHcFSZ6a/H57nwf3oV YZR29+Iv42N4mv5vkB1RNUG7YqbEU6yuNaxgtBXdjbqV9FeXQ3G273CW5oPSEMr8tmfzyQwnrD PgmqvxiWA8setLvXYpOrL4tAgoDLVqN2tMe7hUU4y+vQT222xXTRg8ZQ9lIYqJ6zs8idQQIQFx gjLbmQLVBLFjYBNbWKWtR5CHo3fKK+X7vzJcBb5FwZTmOcB5hcUowJB+O3c7kJouFmbCKDKsm9 XKt9fhpvx0CoYJb9zPTJetwK Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep01.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Dec 2021 02:52:31 -0800 IronPort-SDR: T30Y+SzfsGYvbYJH//x07pF67sKYMIE4UXCpoc9LmjMiZHfutfWmNekPLuXafzvdLA2nbXNdLE 5Lp1P3l7nGzp7i1Ip4Fp7ma6/4RwN1Zns5D5WsBq1uZR6AnjXnlULmTbEprAfjSNTLVugDHdO9 f8NkwYTi7r7CY14JFFzReLOtnbnckUl28VJ92vhOMgSjRLl36SuttJiBCfNS7VcfJIjkKstRpX Ee7VoPC4Fvu9cRx2vw+DMgzy08qgtWd/1rIgSTx+Y0O6MDrk94nay0OfnVlErTHNn37imlHgUY MxE= WDCIronportException: Internal Received: from usg-ed-osssrv.wdc.com ([10.3.10.180]) by uls-op-cesaip02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Dec 2021 03:17:48 -0800 Received: from usg-ed-osssrv.wdc.com (usg-ed-osssrv.wdc.com [127.0.0.1]) by usg-ed-osssrv.wdc.com (Postfix) with ESMTP id 4J4YMv1x6nz1StCH for ; Thu, 2 Dec 2021 03:17:47 -0800 (PST) Authentication-Results: usg-ed-osssrv.wdc.com (amavisd-new); dkim=pass reason="pass (just generated, assumed good)" header.d=opensource.wdc.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d= opensource.wdc.com; h=content-transfer-encoding:mime-version :references:in-reply-to:x-mailer:message-id:date:subject:to :from; s=dkim; t=1638443866; x=1641035867; bh=aTuTMZR7mHk5WuMQ4C KbLXlaRLZp274pvCDzMBGKakM=; b=PxUsc9wgcmEcf9vF5mvyFSpXC61M2x7fxp ELeJocrDtiAGe3zcItH7Rm/ijJaUs3CGnM8ybRAW027y+xGE/WmcTmpeWu6hqhQt 7PQCd5yBcYUHJxlD2Wy3pw/ouUfjoQmkByryFEScZ6v23yslTcDowt6SpIppoPwH rnjv0OHLE+w/SBRTgvRtjWLt5BGOtWpEsjovSCXgRWAS8jfjWbGBsW6NbD6+mp/n jZqmQS5irIvOi52pvwlLqpT8511SEH171ZmouIE41Zuj0k80CWABOf7zH6c1DSBj 7nyGdB1TSvxhvP2zP8EWoR3L8BljPZnyBk0ZOVEgvDj9ZWITZzyw== X-Virus-Scanned: amavisd-new at usg-ed-osssrv.wdc.com Received: from usg-ed-osssrv.wdc.com ([127.0.0.1]) by usg-ed-osssrv.wdc.com (usg-ed-osssrv.wdc.com [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id 8ftWXO1FVd3o for ; Thu, 2 Dec 2021 03:17:46 -0800 (PST) Received: from toolbox.alistair23.me (unknown [10.225.165.64]) by usg-ed-osssrv.wdc.com (Postfix) with ESMTPSA id 4J4YMj2DhFz1Rx0t; Thu, 2 Dec 2021 03:17:36 -0800 (PST) From: Alistair Francis To: linux-kernel@vger.kernel.org Cc: jolsa@redhat.com, mingo@redhat.com, dave@stgolabs.net, linux-perf-users@vger.kernel.org, arnd@arndb.de, namhyung@kernel.org, alistair23@gmail.com, mark.rutland@arm.com, tglx@linutronix.de, acme@kernel.org, alexander.shishkin@linux.intel.com, peterz@infradead.org, dvhart@infradead.org, Alistair Francis Subject: [PATCH v4 4/6] selftests: futex: Add support for 32-bit systems with 64-bit time_t Date: Thu, 2 Dec 2021 21:16:57 +1000 Message-Id: <20211202111659.2077911-4-alistair.francis@opensource.wdc.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211202111659.2077911-1-alistair.francis@opensource.wdc.com> References: <20211202111659.2077911-1-alistair.francis@opensource.wdc.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-perf-users@vger.kernel.org From: Alistair Francis Using the new __kernel_futex_syscall*() functions let's add support for 32-bit systems with a 64-bit time_t. We can just direclty call the publically exposed __kernel_futex_syscall_timeout() and __kernel_futex_syscall_nr_requeue() functions to do this. Signed-off-by: Alistair Francis --- tools/testing/selftests/futex/functional/futex_requeue_pi.c | 2 +- tools/testing/selftests/futex/include/futextest.h | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/testing/selftests/futex/functional/futex_requeue_pi.c = b/tools/testing/selftests/futex/functional/futex_requeue_pi.c index 1ee5518ee6b7..556bf3e74755 100644 --- a/tools/testing/selftests/futex/functional/futex_requeue_pi.c +++ b/tools/testing/selftests/futex/functional/futex_requeue_pi.c @@ -294,7 +294,7 @@ int unit_test(int broadcast, long lock, int third_par= ty_owner, long timeout_ns) secs =3D (ts.tv_nsec + timeout_ns) / 1000000000; ts.tv_nsec =3D ((int64_t)ts.tv_nsec + timeout_ns) % 1000000000; ts.tv_sec +=3D secs; - info("ts.tv_sec =3D %ld\n", ts.tv_sec); + info("ts.tv_sec =3D %lld\n", (long long) ts.tv_sec); info("ts.tv_nsec =3D %ld\n", ts.tv_nsec); tsp =3D &ts; } diff --git a/tools/testing/selftests/futex/include/futextest.h b/tools/te= sting/selftests/futex/include/futextest.h index c786fffecb8a..1686f94667b1 100644 --- a/tools/testing/selftests/futex/include/futextest.h +++ b/tools/testing/selftests/futex/include/futextest.h @@ -21,6 +21,7 @@ #include #include #include +#include =20 typedef volatile u_int32_t futex_t; #define FUTEX_INITIALIZER 0 @@ -69,14 +70,14 @@ static inline int futex_syscall(volatile u_int32_t *uaddr, int op, u_int32_t val, struct t= imespec *timeout, volatile u_int32_t *uaddr2, int val3, int opflags) { - return syscall(SYS_futex, uaddr, op | opflags, val, timeout, uaddr2, va= l3); + return __kernel_futex_syscall_timeout(uaddr, op | opflags, val, timeout= , uaddr2, val3); } =20 static inline int futex_syscall_nr_requeue(volatile u_int32_t *uaddr, int op, u_int32_t va= l, int nr_requeue, volatile u_int32_t *uaddr2, int val3, int opflags) { - return syscall(SYS_futex, uaddr, op | opflags, val, nr_requeue, uaddr2,= val3); + return __kernel_futex_syscall_nr_requeue(uaddr, op | opflags, val, nr_r= equeue, uaddr2, val3); } =20 /** --=20 2.31.1