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 2CC56C433F5 for ; Tue, 11 Oct 2022 13:00:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229927AbiJKNAZ (ORCPT ); Tue, 11 Oct 2022 09:00:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37316 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229964AbiJKNAJ (ORCPT ); Tue, 11 Oct 2022 09:00:09 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 1592C3B73D; Tue, 11 Oct 2022 06:00:06 -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 2676B1042; Tue, 11 Oct 2022 06:00:12 -0700 (PDT) Received: from [10.57.2.177] (unknown [10.57.2.177]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 5E25F3F792; Tue, 11 Oct 2022 06:00:04 -0700 (PDT) Message-ID: Date: Tue, 11 Oct 2022 14:00:02 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.11.0 Subject: Re: [PATCH 1/1] perf test: Fix attr tests for PERF_FORMAT_LOST Content-Language: en-US To: acme@kernel.org, namhyung@kernel.org Cc: linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Peter Zijlstra , Ingo Molnar , Mark Rutland , Alexander Shishkin , Jiri Olsa , Adrian Hunter References: <20220926144948.223641-1-james.clark@arm.com> <20220926144948.223641-2-james.clark@arm.com> From: James Clark In-Reply-To: <20220926144948.223641-2-james.clark@arm.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 26/09/2022 15:49, James Clark wrote: > 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=0|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=128 > config=0 > sample_period=* > sample_type=263 > -read_format=0|4 > +read_format=0|20 Hi Namhyung, Did you manage to take a look at this review? Are you ok with it being 0|20 or should I change it to 0|4|20? Thanks James > disabled=1 > inherit=1 > pinned=0 > diff --git a/tools/perf/tests/attr/system-wide-dummy b/tools/perf/tests/attr/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=128 > config=9 > sample_period=4000 > sample_type=455 > -read_format=4 > +read_format=20 > # Event will be enabled right away. > disabled=0 > inherit=1 > diff --git a/tools/perf/tests/attr/test-record-group b/tools/perf/tests/attr/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 = 1 > fd=1 > group_fd=-1 > sample_type=327 > -read_format=4 > +read_format=20 > > [event-2:base-record] > fd=2 > group_fd=1 > config=1 > sample_type=327 > -read_format=4 > +read_format=20 > mmap=0 > comm=0 > task=0 > 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 = 1 > fd=1 > group_fd=-1 > sample_type=343 > -read_format=12 > +read_format=28 > inherit=0 > > [event-2:base-record] > @@ -21,8 +21,8 @@ config=3 > # default | PERF_SAMPLE_READ > sample_type=343 > > -# PERF_FORMAT_ID | PERF_FORMAT_GROUP > -read_format=12 > +# PERF_FORMAT_ID | PERF_FORMAT_GROUP | PERF_FORMAT_LOST > +read_format=28 > task=0 > mmap=0 > comm=0 > diff --git a/tools/perf/tests/attr/test-record-group1 b/tools/perf/tests/attr/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 = 1 > fd=1 > group_fd=-1 > sample_type=327 > -read_format=4 > +read_format=20 > > [event-2:base-record] > fd=2 > @@ -15,7 +15,7 @@ group_fd=1 > type=0 > config=1 > sample_type=327 > -read_format=4 > +read_format=20 > mmap=0 > comm=0 > task=0 > diff --git a/tools/perf/tests/attr/test-record-group2 b/tools/perf/tests/attr/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=-1 > config=0|1 > sample_period=1234000 > sample_type=87 > -read_format=12 > +read_format=28 > inherit=0 > freq=0 > > @@ -19,7 +19,7 @@ group_fd=1 > config=0|1 > sample_period=6789000 > sample_type=87 > -read_format=12 > +read_format=28 > disabled=0 > inherit=0 > mmap=0