From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-1153505-1520117322-2-12250776119452258042 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.249, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES unknown, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='CN', 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=1520117321; b=uWJq8FWaevw2301fEs7wesVidt13bZ6o984cI8NNAMlfa9E wm4qAoVr+1FVLryWzClz/hyO8yi6fgtOV/A5iNH7kAD3vXEJrNOsfVFnrH+qif1b LAstJ61m+7xjl1cWkgwyq131d2T2Fe6KJ0C36gVXGhzcfYNgISPIbV8hxFq/mq4D pJuzNdEXXyeJGbwYO9lAo9ag+PDseMt6ltX0Xb/Q69RZyhwiSDTikZbDyKbLw9ec LpNXTRpc41K/CDp5L7cox8KXczA/5T+kAI3uk3vwYJI5W7xiJ4RNpE+/b4kZXM7P wjiLJ/AdMv28bukTQP4+hIYG9t9cA15D9jur94A== 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=1520117321; bh=QRsBov CSeCjwdGHz2cFMuBfKpGgda7HFggg+4/Q8FWI=; b=YWW3c1yEPC2l9UQtkKw4p4 S6JZCeI3yI4Odrz8ATKUdwJY96XJD1ibELSdL/ZH/e+QIikPZyjLmUz43NVV4DAl G/mTKl5EdrmXMbAKCWSE+pn06EUfUFi1B6tcvTA7KFQSzqCX8gdjg539DeXwYXhR BkpWA0xe/oVyCRlWexK33YpF+bdH/zZFK/MfUuyywYwJCvG2FzevtJU+h2LBHlEt JsRJvvZpOOy7baubbBDew/c6B3o0dTdTvd8a0e4slBKuT/V9jvqVLuqmURiuBo20 WS1wLkpe4LosJUm0/Ww6LNrvSXMh+tfQgYAtQ7hZFORk4NxmEL2gBQ99uEQQk4dA == ARC-Authentication-Results: i=1; mx3.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=LvuwfcWK 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: mx3.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=LvuwfcWK 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 S933486AbeCCWsI (ORCPT ); Sat, 3 Mar 2018 17:48:08 -0500 Received: from mail-by2nam01on0129.outbound.protection.outlook.com ([104.47.34.129]:5824 "EHLO NAM01-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S935444AbeCCWlu (ORCPT ); Sat, 3 Mar 2018 17:41:50 -0500 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: David Carrillo-Cisneros , Alexander Shishkin , Andi Kleen , He Kuang , Masami Hiramatsu , Paul Turner , Peter Zijlstra , Simon Que , Stephane Eranian , Wang Nan , Arnaldo Carvalho de Melo , Sasha Levin Subject: [PATCH AUTOSEL for 3.18 41/63] perf session: Don't rely on evlist in pipe mode Thread-Topic: [PATCH AUTOSEL for 3.18 41/63] perf session: Don't rely on evlist in pipe mode Thread-Index: AQHTsz+qH9IqGaY5SEyPUv12nGVIUg== Date: Sat, 3 Mar 2018 22:33:35 +0000 Message-ID: <20180303223228.27323-41-alexander.levin@microsoft.com> References: <20180303223228.27323-1-alexander.levin@microsoft.com> In-Reply-To: <20180303223228.27323-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;MW2SPR01MB06;7:N8KnGaa4+nVNerJyMfDRUtXEJHT7GaNyQpQE17JVlKY/SCvCdQEF3qqymmewfeqHUMGSYfkaqHA0zCUw0rjP6ITMbLUjYjDma2IF+qP4wg262rC+D6LpLDGjh3GRyprKmrGQFq7iwic+1b4EVQPiQ1pfE0BqihDmO5lblKIcMqyeWJe22ShlEY/Qvawyy57zvdQp0sgoAIIbKH6MeIwIRyf5D4250N45QneB2Ab4QwtMHS5NtJO7iXJLGPA3hYv+ x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: afeadc68-47c9-4501-8aa7-08d58157f342 x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(3008032)(2017052603307)(7193020);SRVR:MW2SPR01MB06; x-ms-traffictypediagnostic: MW2SPR01MB06: 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)(50582790962513)(211936372134217)(42068640409301)(153496737603132)(228905959029699); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(8211001083)(61425038)(6040501)(2401047)(5005006)(8121501046)(3002001)(10201501046)(93006095)(93001095)(3231220)(944501244)(52105095)(6055026)(61426038)(61427038)(6041288)(20161123562045)(20161123560045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(6072148)(201708071742011);SRVR:MW2SPR01MB06;BCL:0;PCL:0;RULEID:;SRVR:MW2SPR01MB06; x-forefront-prvs: 0600F93FE1 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(346002)(396003)(39860400002)(39380400002)(366004)(376002)(189003)(199004)(3660700001)(8936002)(72206003)(5660300001)(14454004)(110136005)(6512007)(4326008)(6506007)(26005)(2501003)(66066001)(86362001)(7736002)(54906003)(305945005)(25786009)(966005)(6306002)(10290500003)(53936002)(6436002)(2906002)(81156014)(59450400001)(8676002)(478600001)(102836004)(106356001)(316002)(186003)(5250100002)(81166006)(6486002)(7416002)(76176011)(86612001)(6666003)(2900100001)(3846002)(68736007)(97736004)(36756003)(1076002)(107886003)(2950100002)(105586002)(99286004)(6116002)(3280700002)(22452003)(10090500001)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:MW2SPR01MB06;H:MW2PR2101MB1034.namprd21.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; x-microsoft-antispam-message-info: ysSW91FE6/gQyW1h/2yYzkgOmYSr9Csc+3IC+o3A+aDBsKqy7WzJ3ivnHXhPojWcFV2s9qhBcXLt8TciXH/Sbr8I58CfbBhoYuK1MfxPQ3c4ej1bY5jlXejqkHvSqJRskXmFNhVjOoFi8zarck9o0EjN7CEWZFfvdiM8BL0d5qg= 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: afeadc68-47c9-4501-8aa7-08d58157f342 X-MS-Exchange-CrossTenant-originalarrivaltime: 03 Mar 2018 22:33:35.2009 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2SPR01MB06 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: David Carrillo-Cisneros [ Upstream commit 0973ad97c187e06aece61f685b9c3b2d93290a73 ] Session sets a number parameters that rely on evlist. These parameters are not used in pipe-mode and should not be set, since evlist is unavailable. Fix that. Signed-off-by: David Carrillo-Cisneros Acked-by: Jiri Olsa Cc: Alexander Shishkin Cc: Andi Kleen Cc: He Kuang Cc: Masami Hiramatsu Cc: Paul Turner Cc: Peter Zijlstra Cc: Simon Que Cc: Stephane Eranian Cc: Wang Nan Link: http://lkml.kernel.org/r/20170410201432.24807-6-davidcc@google.com [ Check if file !=3D NULL in perf_session__new(), like when used by builtin= -top.c ] Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Sasha Levin --- tools/perf/util/session.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c index e798b58971bf..dc3d3b1b813e 100644 --- a/tools/perf/util/session.c +++ b/tools/perf/util/session.c @@ -108,8 +108,14 @@ struct perf_session *perf_session__new(struct perf_dat= a_file *file, if (perf_session__open(session) < 0) goto out_close; =20 - perf_session__set_id_hdr_size(session); - perf_session__set_comm_exec(session); + /* + * set session attributes that are present in perf.data + * but not in pipe-mode. + */ + if (!file->is_pipe) { + perf_session__set_id_hdr_size(session); + perf_session__set_comm_exec(session); + } } } =20 @@ -122,7 +128,11 @@ struct perf_session *perf_session__new(struct perf_dat= a_file *file, pr_warning("Cannot read kernel map\n"); } =20 - if (tool && tool->ordering_requires_timestamps && + /* + * In pipe-mode, evlist is empty until PERF_RECORD_HEADER_ATTR is + * processed, so perf_evlist__sample_id_all is not meaningful here. + */ + if ((!file || !file->is_pipe) && tool && tool->ordering_requires_timestam= ps && tool->ordered_events && !perf_evlist__sample_id_all(session->evlist))= { dump_printf("WARNING: No sample_id_all support, falling back to unordere= d processing\n"); tool->ordered_events =3D false; --=20 2.14.1