From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-1452603-1517181331-2-8477031358493252556 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 enro, 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=1517181331; b=dDPsJ1vuLSnQ0rZ+S8BhF0sN3yjlRY0ry+toWZ/PcewLypL reFh4Di5T3Oe+ihyiMWGewvph0/N3NhBRF8682HuLCJ8Iml5BTpl8Bs7fhm/agCp ScrKRibWzCC+2GyT2R+Mahx/3gO45DYKtB9/xFuVXMx/viWRklIBLgTjUzWbwThO fuWSZ75dEl+sbhAHSmfiplnPPgI9HfurXYVfTUDOZPiCZUFXYtuXD8s6TOWTepk3 wuYbAbWc2KMU8Sy9f1A62azmKP8cpWDhohuzi8z+yRGWns+xp+4flMNhRse0YcS1 5dZiLZXzupqc4jbDYVpOJ9VGuy3U7l/DeUp9kZw== 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=1517181331; bh=ghqDCT keM3kT2dkJZbaLzEwvoTcy3GPaJkWHyg/ws0s=; b=pMR90Y73u31KAiX3R54Kgx zjic2BhpnTXPTSeekQVxfni+Rc9ToympmjO85y89KHQsxdW+up762hq0IlZM6Xqb 9cRn4O0MDExt35OdsQqUHTV5UAanzK7t23cZuQFwAOjqgxfE8SUEnKvBoavj/pSH Lit1oS/xb9NDhjb53liIJnFyZIOg6saUtEaptCkochj7wSdfM3KSi11Pu55KMEnG OzegDcNhbxwtjzjeEcAYtvWWWsGfToLIV5P1TH+0kccddhVT/+5d88C+53C6SIXn QZxG7G6KNIqQJGwtpkFfTrlFfSkF0FuLlkwSkOBFKgVxfnSCcdMdMk2HeX6mpLXw == ARC-Authentication-Results: i=1; mx1.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=h0fN0Dnb 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: mx1.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=h0fN0Dnb 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 S1752178AbeA1W0Q (ORCPT ); Sun, 28 Jan 2018 17:26:16 -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 S1751941AbeA1W0K (ORCPT ); Sun, 28 Jan 2018 17:26:10 -0500 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Jiri Olsa , Arnaldo Carvalho de Melo , Sasha Levin Subject: [PATCH AUTOSEL for 4.14 014/100] perf: Fix header.size for namespace events Thread-Topic: [PATCH AUTOSEL for 4.14 014/100] perf: Fix header.size for namespace events Thread-Index: AQHTmIb9B/v0xWLCy0WWfMqyzFQDkw== Date: Sun, 28 Jan 2018 22:26:06 +0000 Message-ID: <20180128222547.7398-14-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:ynYd1rcn7DsdunUMYISIb8wuBDQjRGPqM8uWbdrSq58l5XspMOhns9btSHZDaInTfL7NPb/gO7USMWiTv8IDpFcJCrHm+5va/OCypsLSYQGZGSqdI++yYZBm+dHdH/RJcAuBujOK7TVPSfzGURw/Ft5WXhw4aZQJ3W1w7GbkgzSOEHjtHJH4KpF4WWVKCnGiXXILGte9ebKXRkgKlaMFdmSRUTYheHSLxZl9OF7gz8j9iDU343pG7YCzd0bSKEpf x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: a32b87e7-bd73-4608-fd0c-08d5669e20d0 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); 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-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(346002)(396003)(376002)(39380400002)(39860400002)(366004)(199004)(189003)(2501003)(6486002)(186003)(110136005)(5660300001)(106356001)(97736004)(68736007)(6512007)(5250100002)(6306002)(316002)(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-microsoft-antispam-message-info: m50I77yIq9Y9c1GDNwcrmmW3vw+MPXEhoqVtIvVrQJINgHre0Iemvdvpv1mid+tRYIVO3cxiZexxmCQg3HoWVw== 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: a32b87e7-bd73-4608-fd0c-08d5669e20d0 X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Jan 2018 22:26:06.3931 (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: Jiri Olsa [ Upstream commit 34900ec5c9577cc1b0f22887ac7349f458ba8ac2 ] Reset header size for namespace events, otherwise it only gets bigger in ctx iterations. Signed-off-by: Jiri Olsa Acked-by: Peter Zijlstra (Intel) Fixes: e422267322cd ("perf: Add PERF_RECORD_NAMESPACES to include namespace= s related info") Link: http://lkml.kernel.org/n/tip-nlo4gonz9d4guyb8153ukzt0@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Sasha Levin --- kernel/events/core.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kernel/events/core.c b/kernel/events/core.c index 24ebad5567b4..5253dbba66ea 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -6719,6 +6719,7 @@ static void perf_event_namespaces_output(struct perf_= event *event, struct perf_namespaces_event *namespaces_event =3D data; struct perf_output_handle handle; struct perf_sample_data sample; + u16 header_size =3D namespaces_event->event_id.header.size; int ret; =20 if (!perf_event_namespaces_match(event)) @@ -6729,7 +6730,7 @@ static void perf_event_namespaces_output(struct perf_= event *event, ret =3D perf_output_begin(&handle, event, namespaces_event->event_id.header.size); if (ret) - return; + goto out; =20 namespaces_event->event_id.pid =3D perf_event_pid(event, namespaces_event->task); @@ -6741,6 +6742,8 @@ static void perf_event_namespaces_output(struct perf_= event *event, perf_event__output_id_sample(event, &handle, &sample); =20 perf_output_end(&handle); +out: + namespaces_event->event_id.header.size =3D header_size; } =20 static void perf_fill_ns_link_info(struct perf_ns_link_info *ns_link_info, --=20 2.11.0