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 7D126C43334 for ; Mon, 4 Jul 2022 14:55:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231392AbiGDOzj (ORCPT ); Mon, 4 Jul 2022 10:55:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52134 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234728AbiGDOzb (ORCPT ); Mon, 4 Jul 2022 10:55:31 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id D8024C03; Mon, 4 Jul 2022 07:55:23 -0700 (PDT) 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> Precedence: bulk List-ID: X-Mailing-List: linux-perf-users@vger.kernel.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 -- 2.17.1