From patchwork Mon Jul 4 14:53:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Kilroy X-Patchwork-Id: 12905460 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B9A5CC433EF for ; Mon, 4 Jul 2022 14:56:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=gxVLMP0ahXZhBjD58d3733Re/1uTrAiIf7BUijxTVas=; b=tIR+ZDkXJgCwT0 exOfrhwYiyB+39w/HT0sEkyDzNzEDXceUPYDQhYX2kdztLJMs77plcGx2CiyHvNh5xZ2t7Pfcs3Xn pRLuDGDh2V4BKRe3wEa8VVbwsi6abF6hhRWCkkSrLG/IpEwYHkvrKRtSl6VbWRTGQl4XOz1Bsezv0 qHvtX2weUGaQ32ebU6WLHm94Cnp7QI2sjOaeS2Otn8uJ2adnwnsdGC1+wVLqAKgPIeZ/DTO/0WUyI B8ZCCnVG4SrlfI9bT+yzlzjz/nS0ADczzl559uR/1LjN0pLQVDVtrhhumkHQXs9qWbyK6gC2YjtTG gKBo4XS9GMuhD9I3iKhw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1o8NU2-009XTY-Jh; Mon, 04 Jul 2022 14:55:30 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1o8NTz-009XSI-Ks for linux-arm-kernel@lists.infradead.org; Mon, 04 Jul 2022 14:55:29 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 843B114BF; Mon, 4 Jul 2022 07:55:23 -0700 (PDT) Received: from e124483.cambridge.arm.com (e124483.cambridge.arm.com [10.1.29.145]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id BFBCA3F792; Mon, 4 Jul 2022 07:55:18 -0700 (PDT) From: Andrew Kilroy To: linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, acme@kernel.org Cc: German Gomez , Andrew Kilroy , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Martin KaFai Lau , Song Liu , Yonghong Song , John Fastabend , KP Singh , Tom Rix , linux-arm-kernel@lists.infradead.org, netdev@vger.kernel.org, bpf@vger.kernel.org, llvm@lists.linux.dev Subject: [PATCH 3/8] perf test: Update arm64 tests to expect ptrauth masks Date: Mon, 4 Jul 2022 15:53:27 +0100 Message-Id: <20220704145333.22557-4-andrew.kilroy@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220704145333.22557-1-andrew.kilroy@arm.com> References: <20220704145333.22557-1-andrew.kilroy@arm.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220704_075527_861402_3D6E4ABE X-CRM114-Status: GOOD ( 12.82 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: German Gomez We will request the pointer auth masks in a followup commit, so take the opportunity to update the relevant tests. Signed-off-by: German Gomez Signed-off-by: Andrew Kilroy --- tools/perf/tests/attr/README | 1 + .../tests/attr/test-record-graph-default-aarch64 | 3 ++- tools/perf/tests/attr/test-record-graph-dwarf | 1 + .../perf/tests/attr/test-record-graph-dwarf-aarch64 | 13 +++++++++++++ tools/perf/tests/attr/test-record-graph-fp-aarch64 | 3 ++- 5 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 tools/perf/tests/attr/test-record-graph-dwarf-aarch64 diff --git a/tools/perf/tests/attr/README b/tools/perf/tests/attr/README index eb3f7d4bb324..9d7f4646920f 100644 --- a/tools/perf/tests/attr/README +++ b/tools/perf/tests/attr/README @@ -47,6 +47,7 @@ Following tests are defined (with perf commands): perf record -g kill (test-record-graph-default) perf record -g kill (test-record-graph-default-aarch64) perf record --call-graph dwarf kill (test-record-graph-dwarf) + perf record --call-graph dwarf kill (test-record-graph-dwarf-aarch64) perf record --call-graph fp kill (test-record-graph-fp) perf record --call-graph fp kill (test-record-graph-fp-aarch64) perf record --group -e cycles,instructions kill (test-record-group) diff --git a/tools/perf/tests/attr/test-record-graph-default-aarch64 b/tools/perf/tests/attr/test-record-graph-default-aarch64 index e98d62efb6f7..948d41c162aa 100644 --- a/tools/perf/tests/attr/test-record-graph-default-aarch64 +++ b/tools/perf/tests/attr/test-record-graph-default-aarch64 @@ -5,5 +5,6 @@ ret = 1 arch = aarch64 [event:base-record] -sample_type=4391 +# handle both with and without ARM64_PTRAUTH +sample_type=4391|33558823 sample_regs_user=1073741824 diff --git a/tools/perf/tests/attr/test-record-graph-dwarf b/tools/perf/tests/attr/test-record-graph-dwarf index ae92061d611d..619bccd886c4 100644 --- a/tools/perf/tests/attr/test-record-graph-dwarf +++ b/tools/perf/tests/attr/test-record-graph-dwarf @@ -2,6 +2,7 @@ command = record args = --no-bpf-event --call-graph dwarf -- kill >/dev/null 2>&1 ret = 1 +arch = !aarch64 [event:base-record] sample_type=45359 diff --git a/tools/perf/tests/attr/test-record-graph-dwarf-aarch64 b/tools/perf/tests/attr/test-record-graph-dwarf-aarch64 new file mode 100644 index 000000000000..daec43b39e2e --- /dev/null +++ b/tools/perf/tests/attr/test-record-graph-dwarf-aarch64 @@ -0,0 +1,13 @@ +[config] +command = record +args = --no-bpf-event --call-graph dwarf -- kill >/dev/null 2>&1 +ret = 1 +arch = aarch64 + +[event:base-record] +# handle both with and without ARM64_PTRAUTH +sample_type=45359|33599791 +exclude_callchain_user=1 +sample_stack_user=8192 +sample_regs_user=* +mmap_data=1 diff --git a/tools/perf/tests/attr/test-record-graph-fp-aarch64 b/tools/perf/tests/attr/test-record-graph-fp-aarch64 index cbeea9971285..bc0880f71e8e 100644 --- a/tools/perf/tests/attr/test-record-graph-fp-aarch64 +++ b/tools/perf/tests/attr/test-record-graph-fp-aarch64 @@ -5,5 +5,6 @@ ret = 1 arch = aarch64 [event:base-record] -sample_type=4391 +# handle both with and without ARM64_PTRAUTH +sample_type=4391|33558823 sample_regs_user=1073741824