Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp2235375pxb; Fri, 17 Sep 2021 05:32:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw+iIILn/J4qtjkqf2i7AvbyBpSL+cScytiySaSaWvPtuRwhyTBtWxo1qZw5eOUFmxpfZ5e X-Received: by 2002:a05:6602:1503:: with SMTP id g3mr8352565iow.25.1631881933045; Fri, 17 Sep 2021 05:32:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631881933; cv=none; d=google.com; s=arc-20160816; b=HWTKEEcqT4H4b6+MJjO6Fu2NNITR/wIk36Xj2iVxc2DvJdUkOGXEtTaf+6vnDluMQH uBrpKjDiHc6EWPYOBGJZO8p5uPTQLSUkZnyAaR7NuUafCDDnLuqfBlcDEH/W3nXV3Z99 5OVuPzCWDuaBEZXfU1rbF6WTlbGYBlNCGilLXfaj2jyYggGJEGrUr8kAVOAl2FhPtGT+ 91E+gl1m75fG9WI80+RBbKPHB9SBTGyN4+PCcL5cAmICpREbE57hvNqm4t4yVwh85cXA tqFvAWcYYHCzGmjCZCpWVf4d8vzkxVwCBSH5st8ycGaKzNEt6t4JZ6ckF9TGXNyAci12 /nEw== 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 :message-id:date:subject:cc:to:from:dkim-signature :wdcironportexception:ironport-sdr:ironport-sdr:dkim-signature; bh=gxukh2b4TMark4dZFGn+m9ia5mDooTDmd1B9B7qqPZA=; b=gzfXndjloXWVz4cjbob5t1Yh7+dvov8110NR57rNhGNNPrTxYpf0JKphGC/EBKpVc7 5APUXDoUJkbugpfMHIENWDHlxIDo9X5KR0SiP503b1l6VstUFBKZQkYAy9TwzUTcMCsk W4PP5NUn8A/xY8l+oOgsynM3VCwUqog3f8DqRwcrUOVMT6/vTjENUHiVZUh8GFJRZP2W ogAUnGQmhVCR2CMqfdyXn1GjY1DT3KSumTF5eIXIXctbe4STafcQRCPKxncLTPLESg7C Sb7zCfVnUc2WQ8YewPZEKOdOvA4G7VnRl2w6OwRiuD1cpBwutVs6OQZgSOvcplkCuhHT TzBw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@wdc.com header.s=dkim.wdc.com header.b=lSLF27xl; dkim=pass header.i=@opensource.wdc.com header.s=dkim header.b=FTpn5lTF; 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 g17si5187709ilr.112.2021.09.17.05.32.00; Fri, 17 Sep 2021 05:32:13 -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=lSLF27xl; dkim=pass header.i=@opensource.wdc.com header.s=dkim header.b=FTpn5lTF; 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 S244978AbhIQGMb (ORCPT + 99 others); Fri, 17 Sep 2021 02:12:31 -0400 Received: from esa4.hgst.iphmx.com ([216.71.154.42]:25066 "EHLO esa4.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242449AbhIQGMa (ORCPT ); Fri, 17 Sep 2021 02:12:30 -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=1631859069; x=1663395069; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=9y8Ut/ugz/WF4xLl6QXyYdgaBuD43Adc9tbqyoQdLNk=; b=lSLF27xlKj9YEJXoigJwVaCj4ClmGHLHB3QRQz7nQ+OYSMRgsWesbJNw kLI6JYGP8DBMSBeIPnVxAykbH7fKkbA6+3w/IW0jz+aMAGJZUOdqnEIaA I3cQ+gu2Fvpm9lFqZPIdFncvZaWlGaZniMMSRT5FD8DT+3mQamZ5c1stx a1UE9cflJWSOzD88bWEvNBhz4zXXp7lbqbhwgdcmiUxAqVHXSm/ZV42Vc PIMYK3kDQyWOIQi/O7JEPrer2e9+URtkpnM7J8jRMHsUNTDq69+mOk8BV w5aeM00F+Aew5ur4uhePBzRKedQH33qIhwU8B4wr/ZJxleh48R/WF2Diw Q==; X-IronPort-AV: E=Sophos;i="5.85,300,1624291200"; d="scan'208";a="179315999" 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; 17 Sep 2021 14:11:08 +0800 IronPort-SDR: fQP/rQvqT1YKeQSDOy7PxoFmcox1RzSW4Svcdq28b5VyN/bqdKpGpDsGU48i8OWKw7mKH5CK0c ERMA3tr+/sNrojhSTTxn5RvQCALScFJ0/i4b+3VB3QY5ilR/X3DfKO1jJU8XUkQ1nvFLJV5PJu 1JZg6nFniDSWydXZuv15PzlXiha8FzWGNpZg5olvJvublDEXsel2U9qk2WYXMOeQ2vbQKrsO/P DzRzTulQmctealjiv3qdFiI94RkXgUBIqsD18t3PSM5pliAOi21JF80yqMAq9p8jCvRn3ljHj2 FLNApdTks+ThAFSXnmI367B0 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; 16 Sep 2021 22:47:28 -0700 IronPort-SDR: x55plfc0VV/mF0NqlefEnYfpIUuUdOlXn1SJ2oYOpiON213TtOtvA3IEx+SeybBTw3XYTDv1Eu yFPxU6is4isuhKt57HaY4wnyb8dHyPvNsUPRyB9DCv7HGwLVHCZpr101OShc75igv53w4hCCI7 PX4F9nhegWKYWI4tMxGEB8Ju3wG7yfIe/KYJkVPP+6euLFXzqjkEaRO+9ukScZ/naN+SfdaMo0 YAsoPz1mdHhalw95eh17ZU8yVSsS8uySNxC7kBU7uhwSxoTyqBp+yADXZ+5S7T4nMd/bCtRIRp HDk= 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; 16 Sep 2021 23:11:09 -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 4H9k976njYz1Rws8 for ; Thu, 16 Sep 2021 23:11:07 -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 :x-mailer:message-id:date:subject:to:from; s=dkim; t=1631859060; x=1634451061; bh=9y8Ut/ugz/WF4xLl6QXyYdgaBuD43Adc9tbqyoQdLNk=; b= FTpn5lTFFIb7CVyFVdwEZTRODEyp/xPxiNLIytniHNV25YEqe3GBBHORFmhZkn1Z qR3HCQG52ChvU2fotwI5V0RCe4ar1n+OQGZSW2dB9qOkb9e9NgHwyPhQ/yB2JYf2 B1/OB8XVBFJobwj6Fmqwvts/Lpuo8h+0V+mjBx4BprEZMAMbYTmW1LdByZmAy33a 5rXG6f9Sy+PqjWf6GtHu5fc6g360pbneMvQXFltXRb4kiY58pynvf+Y3hn607BnF 3f+c1OHT4veuJ6QBGBva+lywRBq4clTcezshHAUYmOgZm2bBCfYEXUUdXJbDX7Js 3Q01W/o2EseiAQ05zscasg== 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 md8rA0d4XxXD for ; Thu, 16 Sep 2021 23:11:00 -0700 (PDT) Received: from toolbox.alistair23.me (unknown [10.225.165.23]) by usg-ed-osssrv.wdc.com (Postfix) with ESMTPSA id 4H9k8p5NrKz1Rvlb; Thu, 16 Sep 2021 23:10:50 -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 v3 1/2] perf benchmark: Call the futex syscall from a function Date: Fri, 17 Sep 2021 16:10:39 +1000 Message-Id: <20210917061040.2270822-1-alistair.francis@opensource.wdc.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Alistair Francis 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 --- tools/perf/bench/futex.h | 37 +++++++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 14 deletions(-) diff --git a/tools/perf/bench/futex.h b/tools/perf/bench/futex.h index b3853aac3021c..f80a4759ee79b 100644 --- a/tools/perf/bench/futex.h +++ b/tools/perf/bench/futex.h @@ -28,7 +28,7 @@ struct bench_futex_parameters { }; =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 @@ -38,17 +38,26 @@ struct bench_futex_parameters { * @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(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)= ; +} + +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) +{ + return syscall(SYS_futex, uaddr, op | opflags, val, nr_requeue, uaddr2,= val3); +} =20 /** * futex_wait() - block on uaddr with optional timeout @@ -57,7 +66,7 @@ struct bench_futex_parameters { static inline int futex_wait(u_int32_t *uaddr, u_int32_t val, struct timespec *timeout, in= t opflags) { - return futex(uaddr, FUTEX_WAIT, val, timeout, NULL, 0, opflags); + return futex_syscall(uaddr, FUTEX_WAIT, val, timeout, NULL, 0, opflags)= ; } =20 /** @@ -67,7 +76,7 @@ futex_wait(u_int32_t *uaddr, u_int32_t val, struct time= spec *timeout, int opflag static inline int futex_wake(u_int32_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 /** @@ -76,7 +85,7 @@ futex_wake(u_int32_t *uaddr, int nr_wake, int opflags) static inline int futex_lock_pi(u_int32_t *uaddr, struct timespec *timeout, int opflags) { - return futex(uaddr, FUTEX_LOCK_PI, 0, timeout, NULL, 0, opflags); + return futex_syscall(uaddr, FUTEX_LOCK_PI, 0, timeout, NULL, 0, opflags= ); } =20 /** @@ -85,7 +94,7 @@ futex_lock_pi(u_int32_t *uaddr, struct timespec *timeou= t, int opflags) static inline int futex_unlock_pi(u_int32_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 /** @@ -97,7 +106,7 @@ static inline int futex_cmp_requeue(u_int32_t *uaddr, u_int32_t val, u_int32_t *uaddr2, in= t nr_wake, int nr_requeue, int opflags) { - return futex(uaddr, FUTEX_CMP_REQUEUE, nr_wake, nr_requeue, uaddr2, + return futex_syscall_nr_requeue(uaddr, FUTEX_CMP_REQUEUE, nr_wake, nr_r= equeue, uaddr2, val, opflags); } =20 @@ -113,7 +122,7 @@ static inline int futex_wait_requeue_pi(u_int32_t *uaddr, u_int32_t val, u_int32_t *uaddr2= , struct timespec *timeout, int opflags) { - return futex(uaddr, FUTEX_WAIT_REQUEUE_PI, val, timeout, uaddr2, 0, + return futex_syscall(uaddr, FUTEX_WAIT_REQUEUE_PI, val, timeout, uaddr2= , 0, opflags); } =20 @@ -130,7 +139,7 @@ static inline int futex_cmp_requeue_pi(u_int32_t *uaddr, u_int32_t val, u_int32_t *uaddr2, int nr_requeue, int opflags) { - return futex(uaddr, FUTEX_CMP_REQUEUE_PI, 1, nr_requeue, uaddr2, + return futex_syscall_nr_requeue(uaddr, FUTEX_CMP_REQUEUE_PI, 1, nr_requ= eue, uaddr2, val, opflags); } =20 --=20 2.31.1