From patchwork Wed Mar 15 12:13:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Richter X-Patchwork-Id: 70186 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2292518wrd; Wed, 15 Mar 2023 05:16:35 -0700 (PDT) X-Google-Smtp-Source: AK7set93yw8T+PgwqqjPFDIWY/t/zNHL8ga0gI/Jtl2qjKygTJHPyJNB17uaTrrZE1mrKfdbfb9c X-Received: by 2002:a05:6a20:1447:b0:d5:8518:1995 with SMTP id a7-20020a056a20144700b000d585181995mr6380363pzi.12.1678882594922; Wed, 15 Mar 2023 05:16:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678882594; cv=none; d=google.com; s=arc-20160816; b=Va5lmoOZNU0nVWL+JD0WzfiEu2vEio/aN4MT+TxON6hupUNdY1AIckmmGEveoLG9IO apJ5DMkdibouypdduWeoHYG/DVZvPQdneBirYoVSdI1loly4XSkd6xibLMFQH4SJKB0L SLD4jFGFwFoXevFuqepfylMtDZKek58UvB2WiF6G2NuilC+e0KR1xKbtTYR22BrLR1P2 pwvi8dXr2DmKGJqa+wfdfgGioYlqgvWQF9EwqogT0JRn8cjCiCOVrU+nMKq/NTD5SNoE zV7ZHTkciUdlJXHpvS0dQjzbKgsHjh39bjPn97CO9duBzJrbgd0ftW4KdKzNCNdt8yrf Zosg== 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; bh=j0p3XaXWcGUZYuh4Y5vSdyab6x2UuLWlOkMnbG1Md24=; b=BeGulQ5ghWdpzue1TmdSANxhx6SQWaxFeS1essFDL2+J85nTm9AQPUFqv0VEEF44ko mpp/l7An1LcYIFvW2EGHSV1mcVhDB/nZLFLCJF0vt9c6wImQ+3Wtyz/ptcEPjqNWKbyK Llp0IWt4ARf3T+nRWKzyjKEgUmj53crhBistAIRzzFebZ6jrxA6XwI/SYGVTkYxoKe9Q 0hNMsWdkW59vmhL3DeVHN6AQ6PeF6zxzEc4ECUIhejw5CfKj2mb5DiTZoWGMHs974ckV vH317h7ixhBcQeJrmFOeoKx1Q76xtp7jSH4nyuqEd5yfUGgqdUXiFVoDLiGp//UHBJ5g VJSg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ibm.com header.s=pp1 header.b=b3nfJDo7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=NONE dis=NONE) header.from=ibm.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 1-20020a630d41000000b00507681e1281si4913905pgn.525.2023.03.15.05.16.21; Wed, 15 Mar 2023 05:16:34 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@ibm.com header.s=pp1 header.b=b3nfJDo7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=NONE dis=NONE) header.from=ibm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231484AbjCOMNc (ORCPT + 99 others); Wed, 15 Mar 2023 08:13:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34634 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229734AbjCOMNa (ORCPT ); Wed, 15 Mar 2023 08:13:30 -0400 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 678AB1FEB; Wed, 15 Mar 2023 05:13:28 -0700 (PDT) Received: from pps.filterd (m0187473.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 32FBdlT1016756; Wed, 15 Mar 2023 12:13:20 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : mime-version : content-transfer-encoding; s=pp1; bh=j0p3XaXWcGUZYuh4Y5vSdyab6x2UuLWlOkMnbG1Md24=; b=b3nfJDo7Zepm2NJZRMqL3tOVju40YVz/cCH9giate+53EjvhN0oNY9oeYmtedTyxa6/j p9jV6xK/U3b8FuKEhV+qRbc45hpmBgCx1ygJGoPrLK1x39gXRffH03bnDm8wCpRI/FaN IUFGtz13ewZwTuXd/K/Q9B+rlBdHbzN2RbqDt8vwJZ8/qPdaaM4ivzQVVSKkCPZG/cOK /Gl8p8KCk4xpi9sTUO89YRQOVnD0C9UWYkAZm1Aohu3bd9el8QL3UgxGmzZlSBUiD14D rioLGfhwOYZjvSArqvaq26b0Kq9PVPZVgsSxIOyZ/nHnyaw7S/Xdn3qrR4/rLaYCPHud zA== Received: from ppma04ams.nl.ibm.com (63.31.33a9.ip4.static.sl-reverse.com [169.51.49.99]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3pbak5n8tv-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 15 Mar 2023 12:13:19 +0000 Received: from pps.filterd (ppma04ams.nl.ibm.com [127.0.0.1]) by ppma04ams.nl.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 32EN65jf032370; Wed, 15 Mar 2023 12:13:17 GMT Received: from smtprelay02.fra02v.mail.ibm.com ([9.218.2.226]) by ppma04ams.nl.ibm.com (PPS) with ESMTPS id 3pb29u8rmd-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 15 Mar 2023 12:13:17 +0000 Received: from smtpav02.fra02v.mail.ibm.com (smtpav02.fra02v.mail.ibm.com [10.20.54.101]) by smtprelay02.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 32FCDEoL32375256 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 15 Mar 2023 12:13:14 GMT Received: from smtpav02.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 3638F20043; Wed, 15 Mar 2023 12:13:14 +0000 (GMT) Received: from smtpav02.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id EB63C20040; Wed, 15 Mar 2023 12:13:13 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.152.85.9]) by smtpav02.fra02v.mail.ibm.com (Postfix) with ESMTP; Wed, 15 Mar 2023 12:13:13 +0000 (GMT) From: Thomas Richter To: linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, acme@kernel.org, robh@kernel.org, jolsa@kernel.org Cc: svens@linux.ibm.com, gor@linux.ibm.com, sumanthk@linux.ibm.com, hca@linux.ibm.com, Thomas Richter Subject: [PATCH] perf/test: Fix wrong size for perf test Setup struct perf_event_attr Date: Wed, 15 Mar 2023 13:13:03 +0100 Message-Id: <20230315121303.3358416-1-tmricht@linux.ibm.com> X-Mailer: git-send-email 2.37.2 MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: hqVPdD_roCM9jfVXpW0rr2tqrngw4ump X-Proofpoint-GUID: hqVPdD_roCM9jfVXpW0rr2tqrngw4ump X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-03-15_06,2023-03-15_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 impostorscore=0 clxscore=1011 spamscore=0 bulkscore=0 malwarescore=0 phishscore=0 lowpriorityscore=0 mlxscore=0 mlxlogscore=999 adultscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2302240000 definitions=main-2303150104 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760435995924076269?= X-GMAIL-MSGID: =?utf-8?q?1760435995924076269?= The test case ./perf test 'Setup struct perf_event_attr' fails. On s390 this output is observed: # ./perf test -Fvvvv 17 17: Setup struct perf_event_attr : --- start --- running './tests/attr/test-stat-C0' Using CPUID IBM,8561,703,T01,3.6,002f ..... Event event:base-stat fd = 1 group_fd = -1 flags = 0|8 cpu = * type = 0 size = 128 <<<--- wrong, specified in file base-stat config = 0 sample_period = 0 sample_type = 65536 ... 'PERF_TEST_ATTR=/tmp/tmpgw574wvg ./perf stat -o \ /tmp/tmpgw574wvg/perf.data -e cycles -C 0 kill >/dev/null \ 2>&1 ret '1', expected '1' loading result events Event event-0-0-4 fd = 4 group_fd = -1 cpu = 0 pid = -1 flags = 8 type = 0 size = 136 <<<--- actual size used in system call ..... compare matching [event-0-0-4] to [event:base-stat] [cpu] 0 * [flags] 8 0|8 [type] 0 0 [size] 136 128 ->FAIL match: [event-0-0-4] matches [] expected size=136, got 128 FAILED './tests/attr/test-stat-C0' - match failure This mismatch is caused by commit 09519ec3b19e ("perf: Add perf_event_attr::config3") which enlarges the structure perf_event_attr by 8 bytes. Fix this by adjusting the expected value of size. Output after: # ./perf test -Fvvvv 17 17: Setup struct perf_event_attr : --- start --- running './tests/attr/test-stat-C0' Using CPUID IBM,8561,703,T01,3.6,002f ... matched compare matching [event-0-0-4] to [event:base-stat] [cpu] 0 * [flags] 8 0|8 [type] 0 0 [size] 136 136 .... ->OK match: [event-0-0-4] matches ['event:base-stat'] matched Fixes: 09519ec3b19e ("perf: Add perf_event_attr::config3") Signed-off-by: Thomas Richter Acked-by: Namhyung Kim Acked-by: Rob Herring --- tools/perf/tests/attr/base-record | 2 +- tools/perf/tests/attr/base-stat | 2 +- tools/perf/tests/attr/system-wide-dummy | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/perf/tests/attr/base-record b/tools/perf/tests/attr/base-record index 3ef07a12aa14..27c21271a16c 100644 --- a/tools/perf/tests/attr/base-record +++ b/tools/perf/tests/attr/base-record @@ -5,7 +5,7 @@ group_fd=-1 flags=0|8 cpu=* type=0|1 -size=128 +size=136 config=0 sample_period=* sample_type=263 diff --git a/tools/perf/tests/attr/base-stat b/tools/perf/tests/attr/base-stat index 408164456530..a21fb65bc012 100644 --- a/tools/perf/tests/attr/base-stat +++ b/tools/perf/tests/attr/base-stat @@ -5,7 +5,7 @@ group_fd=-1 flags=0|8 cpu=* type=0 -size=128 +size=136 config=0 sample_period=0 sample_type=65536 diff --git a/tools/perf/tests/attr/system-wide-dummy b/tools/perf/tests/attr/system-wide-dummy index 8fec06eda5f9..2f3e3eb728eb 100644 --- a/tools/perf/tests/attr/system-wide-dummy +++ b/tools/perf/tests/attr/system-wide-dummy @@ -7,7 +7,7 @@ cpu=* pid=-1 flags=8 type=1 -size=128 +size=136 config=9 sample_period=4000 sample_type=455