From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-1451573-1517181469-2-14441523578660737437 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.001, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES en, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='com', MailFrom='org', XOriginatingCountry='US' X-Spam-charsets: plain='iso-8859-1' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=arctest; t=1517181468; b=KwMSOjQs55wAJKABSdOeCa8iYY+Epfkf26UjQicGNJzyCai la3wNU3F9vKxOoHCbyw705Aai+H2Q/ofmWpNZ3Paevd3F6JnWpl+9BsrcS+NflIE p6idpAP0v6rfOUXMg3dO21YnC74MoavTzTft9H4ooieJO5lwC/CaQCqYQ7yiNT26 UxZHZiu50J1B87hHE8LkmWJWmwtF6Q05CqX91Qvic7rpujHcDeoPAlZV7Pucdlxj 8lDdR//XdGNW2qDoBlfO3WAimyl/65U8yTcLUzRPT3/0oETVVE6gFDKXdtCbtKlk kAlN+27qvLp8OGBG2zl8wbrfHCMQarhpehF2jww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :references:in-reply-to:content-type:content-transfer-encoding :mime-version:sender:list-id; s=arctest; t=1517181468; bh=E+XUev 5R+E5dTfjSffpxlvsSFKTqXHXU48w7vLqIwrQ=; b=bFPMRNL2lkLBfU/yCNu5E3 KUCbzF2+Wnk0rk+HLv/N4zNt4idNuJAUyDP06aRIoC83qHi4oEcivb6psEfdHVDz aBqRxQlulc0LkJuptpI23ufgOqR6ReAui42Zy3Uk371Q1uX7Iv3XS/NYiQ42Fk/c S66o5t9vcE4BuUdnfLDbfQih42ZGspMmngdvY06XmyE9nNa7FQA569KKKB2pFUXX /9g6syb3Ae1cS3X2tCB0WU3q4SWZPeFUuFfDizNL13N6AE+U464nBxeoAH++RF9e rWBDCoCBcMkVyr+0c2wE2nwxxsLWS8u454GwdZhQgq8SAhya3NZmjTfQWHLiX77g == ARC-Authentication-Results: i=1; mx5.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=So/WStVO x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Authentication-Results: mx5.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=So/WStVO x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754158AbeA1XRT (ORCPT ); Sun, 28 Jan 2018 18:17:19 -0500 Received: from mail-by2nam01on0099.outbound.protection.outlook.com ([104.47.34.99]:35296 "EHLO NAM01-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751931AbeA1W0J (ORCPT ); Sun, 28 Jan 2018 17:26:09 -0500 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Thomas Richter , Hendrik Brueckner , Arnaldo Carvalho de Melo , Sasha Levin Subject: [PATCH AUTOSEL for 4.14 013/100] perf test shell: Fix check open filename arg using 'perf trace' on s390x Thread-Topic: [PATCH AUTOSEL for 4.14 013/100] perf test shell: Fix check open filename arg using 'perf trace' on s390x Thread-Index: AQHTmIb89nXB7BubEkiJN36w0twHkQ== Date: Sun, 28 Jan 2018 22:26:04 +0000 Message-ID: <20180128222547.7398-13-alexander.levin@microsoft.com> References: <20180128222547.7398-1-alexander.levin@microsoft.com> In-Reply-To: <20180128222547.7398-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;MW2PR2101MB1004;7:uRCozf2kHBznvoIk2r08UPXAijP7nItARY19PavyHxOgLB1biPYI3r3Vq1WKZZSRhk7tksVBmYNtMQzNEJM6gp0892l7ibF/3QaD9g9aIFVSyHOCW0TL14qLoHHp5mT31akj443ZNwqosoQE5wrpbqw3HRLkMVfSexgrBjKhK9FPiWQEVl903uJFXTqj+UDsp2TtN0CNd1+BMMmAg/cTm68q7pKbP0DE/aNIXnjPjFXnjzjWS5zpsttN2mGlwj4z x-ms-exchange-antispam-srfa-diagnostics: SSOS;SSOR; x-forefront-antispam-report: SFV:SKI;SCL:-1;SFV:NSPM;SFS:(10019020)(346002)(396003)(376002)(39380400002)(39860400002)(366004)(199004)(189003)(2501003)(6486002)(186003)(110136005)(5660300001)(106356001)(97736004)(68736007)(6512007)(5250100002)(6306002)(316002)(6666003)(53936002)(66066001)(99286004)(2950100002)(575784001)(86362001)(54906003)(22452003)(6436002)(26005)(102836004)(59450400001)(25786009)(10090500001)(76176011)(8676002)(10290500003)(14454004)(6506007)(86612001)(8936002)(81156014)(2900100001)(81166006)(1076002)(107886003)(478600001)(3280700002)(2906002)(72206003)(7736002)(305945005)(105586002)(36756003)(3846002)(3660700001)(6116002)(4326008)(966005)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:MW2PR2101MB1004;H:MW2PR2101MB1034.namprd21.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: bcc96097-f9d4-4cd1-4c04-08d5669e202d x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(3008032)(2017052603307)(7193020);SRVR:MW2PR2101MB1004; x-ms-traffictypediagnostic: MW2PR2101MB1004: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171)(42068640409301)(84791874153150)(104084551191319); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(61425038)(6040501)(2401047)(5005006)(8121501046)(10201501046)(93006095)(93001095)(3002001)(3231101)(944501161)(6055026)(61426038)(61427038)(6041288)(20161123564045)(20161123560045)(20161123558120)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011);SRVR:MW2PR2101MB1004;BCL:0;PCL:0;RULEID:;SRVR:MW2PR2101MB1004; x-forefront-prvs: 05669A7924 x-microsoft-antispam-message-info: k1ZeqWaIqA9yR+9SCcmJ3OwrpsMe4KbjW6TeM2wXlg1XrNH8sJhlIDLb3DlVyGSeiJYMTdnrITCicX8OLPKzHQ== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: bcc96097-f9d4-4cd1-4c04-08d5669e202d X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Jan 2018 22:26:05.7817 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR2101MB1004 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: From: Thomas Richter [ Upstream commit ccafc38f1c778847ab6d53dd7933260426731cf3 ] This 'perf test' case fails on s390x. The 'touch' command on s390x uses the 'openat' system call to open the file named on the command line: [root@s35lp76 perf]# perf probe -l probe:vfs_getname (on getname_flags:72@fs/namei.c with pathname) [root@s35lp76 perf]# perf trace -e open touch /tmp/abc 0.400 ( 0.015 ms): touch/27542 open(filename: /usr/lib/locale/locale-archive, flags: CLOEXEC) =3D 3 [root@s35lp76 perf]# There is no 'open' system call for file '/tmp/abc'. Instead the 'openat' system call is used: [root@s35lp76 perf]# strace touch /tmp/abc execve("/usr/bin/touch", ["touch", "/tmp/abc"], 0x3ffd547ec98 /* 30 vars */) =3D 0 [...] openat(AT_FDCWD, "/tmp/abc", O_WRONLY|O_CREAT|O_NOCTTY|O_NONBLOCK, 0666= ) =3D 3 [...] On s390x the 'egrep' command does not find a matching pattern and returns an error. Fix this for s390x create a platform dependent command line to enable the 'perf probe' call to listen to the 'openat' system call and get the expected output. Signed-off-by: Thomas-Mich Richter Tested-by: Arnaldo Carvalho de Melo Cc: Hendrik Brueckner Cc: Thomas-Mich Richter LPU-Reference: 20171114071847.2381-1-tmricht@linux.vnet.ibm.com Link: http://lkml.kernel.org/n/tip-3qf38jk0prz54rhmhyu871my@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Sasha Levin --- tools/perf/tests/shell/trace+probe_vfs_getname.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/perf/tests/shell/trace+probe_vfs_getname.sh b/tools/perf= /tests/shell/trace+probe_vfs_getname.sh index 2e68c5f120da..2a9ef080efd0 100755 --- a/tools/perf/tests/shell/trace+probe_vfs_getname.sh +++ b/tools/perf/tests/shell/trace+probe_vfs_getname.sh @@ -17,8 +17,10 @@ skip_if_no_perf_probe || exit 2 file=3D$(mktemp /tmp/temporary_file.XXXXX) =20 trace_open_vfs_getname() { - perf trace -e open touch $file 2>&1 | \ - egrep " +[0-9]+\.[0-9]+ +\( +[0-9]+\.[0-9]+ ms\): +touch\/[0-9]+ open\(fi= lename: +${file}, +flags: CREAT\|NOCTTY\|NONBLOCK\|WRONLY, +mode: +IRUGO\|I= WUGO\) +=3D +[0-9]+$" + test "$(uname -m)" =3D s390x && { svc=3D"openat"; txt=3D"dfd: +CWD, +"; } + + perf trace -e ${svc:-open} touch $file 2>&1 | \ + egrep " +[0-9]+\.[0-9]+ +\( +[0-9]+\.[0-9]+ ms\): +touch\/[0-9]+ ${svc:-o= pen}\(${txt}filename: +${file}, +flags: CREAT\|NOCTTY\|NONBLOCK\|WRONLY, +m= ode: +IRUGO\|IWUGO\) +=3D +[0-9]+$" } =20 =20 --=20 2.11.0