Received: by 2002:a05:6a10:5bc5:0:0:0:0 with SMTP id os5csp26728pxb; Wed, 20 Oct 2021 15:43:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz7xFBCDYU9Z+w/qgY7KdeSsbk7/07JLNxmmj0lWZdCezoT4H+lzJxmuh5g1RmDGIY7S91F X-Received: by 2002:a63:d80c:: with SMTP id b12mr1573628pgh.331.1634769808673; Wed, 20 Oct 2021 15:43:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634769808; cv=none; d=google.com; s=arc-20160816; b=WP/1FCCxhvIa8SHAXGLB9EzFTnzb5QhVQlItC2JUMNUBmT/+t4ydDb28w1mnm9Dm1V cFowUTr17zmG/nScOtrnBgoY59b/BI1Qc0XasjsJnDAbAbhIgA74fi2f6z/kGnRgr5Uo VBiTNJMZCGJIjFvabSoskjjP+ZJ14Hl16fdBctMffSam5Z1+1ozAlS2rBqoEWHdAZc7B 9SKNcdkWBx2bGlf8WRKTw8Hy07OjFeeP3X1YRwTGxCngXwqzuH3FrJuup/j/EVMNk3jr beOlJRmvhZI0sMCyFAp/Ce5nc7PWq/jRzgcG7GLScLIDGXW5qqxLZvxPivJz2gi9BYUt 9SaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:wdcironportexception:ironport-sdr:ironport-sdr :dkim-signature; bh=RfzCWdb2fAj2i29IE9MSneRYrI5O50PT1V0SgmN0fFU=; b=fx2x5fFnVn7SH1Mg5/D66ajNSPzdmeInIDVbQTpTP20Mgqi8YgQBD1qrYaCd5iw7zx fDWTq4es0gSHXZcbcZeGTl6RkvuEp36CeBge7Awnd6aEPce6c3VJP2+2eR2vOlI6/lTE 6xAGz52Gq/F7oXhDZDoaVr9U1MUbPxFrLmjuG7CSDutFulHyGZj4q1tHM8B93c5M+MXB lC0oRpM2u0D8UyQoruPDt/hYoGiVJn8T3dxWb7nWY+jZ9y5FT6nF3fV8lUd9Lt6uM2Ae lKnAzGlUKtN3Z7y9lEyTW4lsExBhQ7QXj/a6zhIJWt02RuAvnzVSExHHkCuDB42ptDJn rl+A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@wdc.com header.s=dkim.wdc.com header.b=gnoMKgqs; dkim=pass header.i=@opensource.wdc.com header.s=dkim header.b=WK0NYuGJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=opensource.wdc.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id n26si4564672pfe.304.2021.10.20.15.42.46; Wed, 20 Oct 2021 15:43:28 -0700 (PDT) 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; Authentication-Results: mx.google.com; dkim=fail header.i=@wdc.com header.s=dkim.wdc.com header.b=gnoMKgqs; dkim=pass header.i=@opensource.wdc.com header.s=dkim header.b=WK0NYuGJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=opensource.wdc.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231292AbhJTWme (ORCPT + 99 others); Wed, 20 Oct 2021 18:42:34 -0400 Received: from esa6.hgst.iphmx.com ([216.71.154.45]:46082 "EHLO esa6.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231290AbhJTWme (ORCPT ); Wed, 20 Oct 2021 18:42:34 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1634769620; x=1666305620; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Y8ldQtnZtH2nNau0fDjjtgFR2uznY4wI2KcEdQP3NCw=; b=gnoMKgqsAB9NGlzlTCfBO2sW6W5zM1/L4v7jOQRJyuzD3TwiPkOgk9Lx wi2kuPN1PhWj/v7xrEbT3I+BE7ZtaCu7ru+MIqqfRd++yhdDDxPe0Ucfg tbQ/cRoHL20FE1cHECraTaFsGZRZO/fh7o9ZDOQMdqTSQXDVuv9zuOn9j 5ZqX7yGeHFm1ogNM9NpEJQZoHW5N1XNDV4Et8/AAFRqpTqt3IGyDdR04+ d/BO3fvDto6igeY3l2AnpyJcdM/CfIZf6pPu+oRoAVeZ7EVwQcTq4jH3w zvacXk3UR9hvOdOVlJGuA1kkaz3jirqSuMnklYi0AC04rTFOmYDlJfi7I g==; X-IronPort-AV: E=Sophos;i="5.87,168,1631548800"; d="scan'208";a="184393913" 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; 21 Oct 2021 06:40:19 +0800 IronPort-SDR: FU0XuVFGO48HR/ImpugtnFiOy/WVyBz5tPP3Dxz6DXXVjWRWuStSWKWxu6knPYO6vm10HWgciK ExxYc7OvwvampC0WUT8faBo+k6VsP9O/yQddlv/PzQ9ywcJMOA8H9sS2ODAYsh/xIKyg0eHFAb 334BMxGB9HmwkYsLwmbaWDqTUAHACtxm9Tp4hYjtv08gZ7LN1tcq73zwSQC/Nl+7xj3mv+iO4a LreqXpC4U56ZDCZdVHnHOFawHBHdnhBdMhQJG2/YbwJTi7HhruElSWXRGa+kJeHq56n6DOlAn5 HmGKwsk3EuhrQYNptyPtOZ3i Received: from uls-op-cesaip01.wdc.com ([10.248.3.36]) by uls-op-cesaep01.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Oct 2021 15:15:55 -0700 IronPort-SDR: el6PD1Ct6bZ4Qob1ObcVqdZQNbF4y3VQY1OTnil2rAF0QfGHggP6sLbxtO+U9plzvSsT8T1Id+ ItMivbfXiPuU7+SEj2XkEQTVQI6vXW3s93zi8Oz5wCkAOqVYMPYOcmWbyI4ELMr+GLOWy+ZJjJ 6NavZNKcp4wi78kD2TIULrZppPHU2ujEgOWCTFxLSxIG6hbIrJRLpQvfOFDm3DWZT9w9/m38ie v837QQvvrzHLDOG/Vh/Q6qz8NEEQ5P5+i9T4W02ZS//GZuZhC7uvuuwYXXSSVpHH6e/EROd/6k 5PQ= WDCIronportException: Internal Received: from usg-ed-osssrv.wdc.com ([10.3.10.180]) by uls-op-cesaip01.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Oct 2021 15:40:19 -0700 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 4HZQYG0kVTz1RvmL for ; Wed, 20 Oct 2021 15:40:18 -0700 (PDT) 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=1634769616; x=1637361617; bh=Y8ldQtnZtH2nNau0fD jjtgFR2uznY4wI2KcEdQP3NCw=; b=WK0NYuGJdpZqBNJPokPtHztBAhbhlaT4MD e4vwlTrR1XjMEFYPuwJD7cp7Rd305TW9/D054K0mtEtQp040ZT4YM4F3TldzZii3 b88A0isBPV5Hul6AZP35l5x6IY6KnqY0OI9u46qHAC7gzFhbfAzuW7F1L4TsaonJ 9kCgVh419XVoXm6P14csyRgX5nU7oOeUWUfzKZ8WbkcAo9wC2gXqrT9NTPkvfjBW FD529WF0cxmg11JUCeD38fejiJmRcZkCwqxGZoD2vAUB8Q4aA18zoCd57/lBXlBV W2o4bU6vwZwoQv4IJv7mDkMngtTwcidqSJtuRvFnpu7bYVyG9lbw== 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 EKqRpjoR9o3q for ; Wed, 20 Oct 2021 15:40:16 -0700 (PDT) Received: from toolbox.wdc.com (unknown [10.225.165.39]) by usg-ed-osssrv.wdc.com (Postfix) with ESMTPSA id 4HZQY10Kx0z1SGYQ; Wed, 20 Oct 2021 15:40:04 -0700 (PDT) From: Alistair Francis 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 Subject: [PATCH v4 3/4] selftests: futex: Call the futex syscall from a function Date: Thu, 21 Oct 2021 08:39:19 +1000 Message-Id: <20211020223920.2810727-3-alistair.francis@opensource.wdc.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211020223920.2810727-1-alistair.francis@opensource.wdc.com> References: <20211020223920.2810727-1-alistair.francis@opensource.wdc.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Alistair Francis Call the futex syscall from a function In preparation for a more complex futex() function let's convert the current macro into two functions. We need two functions to avoid compiler failures as the macro is overloaded. This will allow us to include pre-processor conditionals in the futex syscall functions. Signed-off-by: Alistair Francis --- .../selftests/futex/include/futextest.h | 59 +++++++++++-------- 1 file changed, 34 insertions(+), 25 deletions(-) diff --git a/tools/testing/selftests/futex/include/futextest.h b/tools/te= sting/selftests/futex/include/futextest.h index ddbcfc9b7bac4..1b133f81e9b7b 100644 --- a/tools/testing/selftests/futex/include/futextest.h +++ b/tools/testing/selftests/futex/include/futextest.h @@ -48,7 +48,7 @@ typedef volatile u_int32_t futex_t; #endif =20 /** - * futex() - SYS_futex syscall wrapper + * futex_syscall() - SYS_futex syscall wrapper * @uaddr: address of first futex * @op: futex op code * @val: typically expected value of uaddr, but varies by op @@ -58,17 +58,26 @@ typedef volatile u_int32_t futex_t; * @val3: varies by op * @opflags: flags to be bitwise OR'd with op, such as FUTEX_PRIVATE_FLA= G * - * futex() is used by all the following futex op wrappers. It can also b= e + * futex_syscall() is used by all the following futex op wrappers. It ca= n also be * used for misuse and abuse testing. Generally, the specific op wrapper= s - * should be used instead. It is a macro instead of an static inline fun= ction as - * some of the types over overloaded (timeout is used for nr_requeue for - * example). + * should be used instead. * * These argument descriptions are the defaults for all * like-named arguments in the following wrappers except where noted bel= ow. */ -#define futex(uaddr, op, val, timeout, uaddr2, val3, opflags) \ - syscall(SYS_futex, uaddr, op | opflags, val, timeout, uaddr2, val3) +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, ts32, uaddr2, val3)= ; +} + +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); +} =20 /** * futex_wait() - block on uaddr with optional timeout @@ -77,7 +86,7 @@ typedef volatile u_int32_t futex_t; static inline int futex_wait(futex_t *uaddr, futex_t val, struct timespec *timeout, int op= flags) { - return futex(uaddr, FUTEX_WAIT, val, timeout, NULL, 0, opflags); + return futex_syscall(uaddr, FUTEX_WAIT, val, timeout, NULL, 0, opflags)= ; } =20 /** @@ -87,7 +96,7 @@ futex_wait(futex_t *uaddr, futex_t val, struct timespec= *timeout, int opflags) static inline int futex_wake(futex_t *uaddr, int nr_wake, int opflags) { - return futex(uaddr, FUTEX_WAKE, nr_wake, NULL, NULL, 0, opflags); + return futex_syscall(uaddr, FUTEX_WAKE, nr_wake, NULL, NULL, 0, opflags= ); } =20 /** @@ -98,8 +107,8 @@ static inline int futex_wait_bitset(futex_t *uaddr, futex_t val, struct timespec *timeout, u_int32_t bitset, int opflags) { - return futex(uaddr, FUTEX_WAIT_BITSET, val, timeout, NULL, bitset, - opflags); + return futex_syscall(uaddr, FUTEX_WAIT_BITSET, val, timeout, NULL, bits= et, + opflags); } =20 /** @@ -109,8 +118,8 @@ futex_wait_bitset(futex_t *uaddr, futex_t val, struct= timespec *timeout, static inline int futex_wake_bitset(futex_t *uaddr, int nr_wake, u_int32_t bitset, int opf= lags) { - return futex(uaddr, FUTEX_WAKE_BITSET, nr_wake, NULL, NULL, bitset, - opflags); + return futex_syscall(uaddr, FUTEX_WAKE_BITSET, nr_wake, NULL, NULL, bit= set, + opflags); } =20 /** @@ -121,7 +130,7 @@ static inline int futex_lock_pi(futex_t *uaddr, struct timespec *timeout, int detect, int opflags) { - return futex(uaddr, FUTEX_LOCK_PI, detect, timeout, NULL, 0, opflags); + return futex_syscall(uaddr, FUTEX_LOCK_PI, detect, timeout, NULL, 0, op= flags); } =20 /** @@ -130,7 +139,7 @@ futex_lock_pi(futex_t *uaddr, struct timespec *timeou= t, int detect, static inline int futex_unlock_pi(futex_t *uaddr, int opflags) { - return futex(uaddr, FUTEX_UNLOCK_PI, 0, NULL, NULL, 0, opflags); + return futex_syscall(uaddr, FUTEX_UNLOCK_PI, 0, NULL, NULL, 0, opflags)= ; } =20 /** @@ -140,8 +149,8 @@ static inline int futex_wake_op(futex_t *uaddr, futex_t *uaddr2, int nr_wake, int nr_wake2= , int wake_op, int opflags) { - return futex(uaddr, FUTEX_WAKE_OP, nr_wake, nr_wake2, uaddr2, wake_op, - opflags); + return futex_syscall_nr_requeue(uaddr, FUTEX_WAKE_OP, nr_wake, nr_wake2= , uaddr2, wake_op, + opflags); } =20 /** @@ -156,8 +165,8 @@ static inline int futex_requeue(futex_t *uaddr, futex_t *uaddr2, int nr_wake, int nr_reque= ue, int opflags) { - return futex(uaddr, FUTEX_REQUEUE, nr_wake, nr_requeue, uaddr2, 0, - opflags); + return futex_syscall_nr_requeue(uaddr, FUTEX_REQUEUE, nr_wake, nr_reque= ue, uaddr2, 0, + opflags); } =20 /** @@ -169,8 +178,8 @@ static inline int futex_cmp_requeue(futex_t *uaddr, futex_t val, futex_t *uaddr2, int nr_w= ake, int nr_requeue, int opflags) { - return futex(uaddr, FUTEX_CMP_REQUEUE, nr_wake, nr_requeue, uaddr2, - val, opflags); + return futex_syscall_nr_requeue(uaddr, FUTEX_CMP_REQUEUE, nr_wake, nr_r= equeue, uaddr2, + val, opflags); } =20 /** @@ -185,8 +194,8 @@ static inline int futex_wait_requeue_pi(futex_t *uaddr, futex_t val, futex_t *uaddr2, struct timespec *timeout, int opflags) { - return futex(uaddr, FUTEX_WAIT_REQUEUE_PI, val, timeout, uaddr2, 0, - opflags); + return futex_syscall(uaddr, FUTEX_WAIT_REQUEUE_PI, val, timeout, uaddr2= , 0, + opflags); } =20 /** @@ -200,8 +209,8 @@ static inline int futex_cmp_requeue_pi(futex_t *uaddr, futex_t val, futex_t *uaddr2, int n= r_wake, int nr_requeue, int opflags) { - return futex(uaddr, FUTEX_CMP_REQUEUE_PI, nr_wake, nr_requeue, uaddr2, - val, opflags); + return futex_syscall_nr_requeue(uaddr, FUTEX_CMP_REQUEUE_PI, nr_wake, n= r_requeue, uaddr2, + val, opflags); } =20 /** --=20 2.31.1