From nobody Mon Apr 6 11:51:34 2026 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 3A0FAC6FA92 for ; Mon, 26 Sep 2022 16:03:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234971AbiIZQDL (ORCPT ); Mon, 26 Sep 2022 12:03:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50002 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234622AbiIZQC2 (ORCPT ); Mon, 26 Sep 2022 12:02:28 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 0F53C7D7A5; Mon, 26 Sep 2022 07:50:20 -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 400511063; Mon, 26 Sep 2022 07:50:27 -0700 (PDT) Received: from e121896.arm.com (unknown [10.57.0.51]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id D9F643F66F; Mon, 26 Sep 2022 07:50:18 -0700 (PDT) From: James Clark To: acme@kernel.org, namhyung@kernel.org Cc: linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, James Clark , Peter Zijlstra , Ingo Molnar , Mark Rutland , Alexander Shishkin , Jiri Olsa , Adrian Hunter Subject: [PATCH 1/1] perf test: Fix attr tests for PERF_FORMAT_LOST Date: Mon, 26 Sep 2022 15:49:47 +0100 Message-Id: <20220926144948.223641-2-james.clark@arm.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20220926144948.223641-1-james.clark@arm.com> References: <20220926144948.223641-1-james.clark@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Since PERF_FORMAT_LOST was added, the default read format has that bit set, so add it to the tests. When running on an older kernel the tests will still fail because Perf will not set that bit. This fixes the following failure: expected read_format=3D0|4, got 20 FAILED './tests/attr/test-record-C0' - match failure Fixes: 85b425f31c88 ("perf record: Set PERF_FORMAT_LOST by default") Signed-off-by: James Clark --- tools/perf/tests/attr/base-record | 2 +- tools/perf/tests/attr/system-wide-dummy | 2 +- tools/perf/tests/attr/test-record-group | 4 ++-- tools/perf/tests/attr/test-record-group-sampling | 6 +++--- tools/perf/tests/attr/test-record-group1 | 4 ++-- tools/perf/tests/attr/test-record-group2 | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/tools/perf/tests/attr/base-record b/tools/perf/tests/attr/base= -record index 8c10955eff93..9758e22daf9c 100644 --- a/tools/perf/tests/attr/base-record +++ b/tools/perf/tests/attr/base-record @@ -9,7 +9,7 @@ size=3D128 config=3D0 sample_period=3D* sample_type=3D263 -read_format=3D0|4 +read_format=3D0|20 disabled=3D1 inherit=3D1 pinned=3D0 diff --git a/tools/perf/tests/attr/system-wide-dummy b/tools/perf/tests/att= r/system-wide-dummy index 86a15dd359d9..0df8a997fe51 100644 --- a/tools/perf/tests/attr/system-wide-dummy +++ b/tools/perf/tests/attr/system-wide-dummy @@ -11,7 +11,7 @@ size=3D128 config=3D9 sample_period=3D4000 sample_type=3D455 -read_format=3D4 +read_format=3D20 # Event will be enabled right away. disabled=3D0 inherit=3D1 diff --git a/tools/perf/tests/attr/test-record-group b/tools/perf/tests/att= r/test-record-group index 14ee60fd3f41..09aa40af841c 100644 --- a/tools/perf/tests/attr/test-record-group +++ b/tools/perf/tests/attr/test-record-group @@ -7,14 +7,14 @@ ret =3D 1 fd=3D1 group_fd=3D-1 sample_type=3D327 -read_format=3D4 +read_format=3D20 =20 [event-2:base-record] fd=3D2 group_fd=3D1 config=3D1 sample_type=3D327 -read_format=3D4 +read_format=3D20 mmap=3D0 comm=3D0 task=3D0 diff --git a/tools/perf/tests/attr/test-record-group-sampling b/tools/perf/= tests/attr/test-record-group-sampling index 300b9f7e6d69..3ad68c3405c8 100644 --- a/tools/perf/tests/attr/test-record-group-sampling +++ b/tools/perf/tests/attr/test-record-group-sampling @@ -7,7 +7,7 @@ ret =3D 1 fd=3D1 group_fd=3D-1 sample_type=3D343 -read_format=3D12 +read_format=3D28 inherit=3D0 =20 [event-2:base-record] @@ -21,8 +21,8 @@ config=3D3 # default | PERF_SAMPLE_READ sample_type=3D343 =20 -# PERF_FORMAT_ID | PERF_FORMAT_GROUP -read_format=3D12 +# PERF_FORMAT_ID | PERF_FORMAT_GROUP | PERF_FORMAT_LOST +read_format=3D28 task=3D0 mmap=3D0 comm=3D0 diff --git a/tools/perf/tests/attr/test-record-group1 b/tools/perf/tests/at= tr/test-record-group1 index 3ffe246e0228..53e1ba38febc 100644 --- a/tools/perf/tests/attr/test-record-group1 +++ b/tools/perf/tests/attr/test-record-group1 @@ -7,7 +7,7 @@ ret =3D 1 fd=3D1 group_fd=3D-1 sample_type=3D327 -read_format=3D4 +read_format=3D20 =20 [event-2:base-record] fd=3D2 @@ -15,7 +15,7 @@ group_fd=3D1 type=3D0 config=3D1 sample_type=3D327 -read_format=3D4 +read_format=3D20 mmap=3D0 comm=3D0 task=3D0 diff --git a/tools/perf/tests/attr/test-record-group2 b/tools/perf/tests/at= tr/test-record-group2 index 6b9f8d182ce1..ca21b5ce71aa 100644 --- a/tools/perf/tests/attr/test-record-group2 +++ b/tools/perf/tests/attr/test-record-group2 @@ -9,7 +9,7 @@ group_fd=3D-1 config=3D0|1 sample_period=3D1234000 sample_type=3D87 -read_format=3D12 +read_format=3D28 inherit=3D0 freq=3D0 =20 @@ -19,7 +19,7 @@ group_fd=3D1 config=3D0|1 sample_period=3D6789000 sample_type=3D87 -read_format=3D12 +read_format=3D28 disabled=3D0 inherit=3D0 mmap=3D0 --=20 2.28.0