From patchwork Tue Sep 8 15:23:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 249366 Delivered-To: patch@linaro.org Received: by 2002:a92:5b9c:0:0:0:0:0 with SMTP id c28csp4833725ilg; Tue, 8 Sep 2020 12:24:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxcb5bL5Bjln+HpySloN/i7UQ8Cbn05muJVHeJDmZSrI0RBiqQI6nNSzBkI9SbQZiIz9fln X-Received: by 2002:a17:906:1f43:: with SMTP id d3mr26157604ejk.295.1599593075477; Tue, 08 Sep 2020 12:24:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1599593075; cv=none; d=google.com; s=arc-20160816; b=KHNqY9jjRNe/R2h1SJYthy5xpMtiTxIUlI4M5Ojar92SDmpkKIqBxZ6bXaD79RX8/f APLeEU6qsQAMbHd80O+dIc1yKUGO2ekJK44Zs1swujSCAXLgEu0ehKHlDSCoJVgQbig+ 5+VUNBCyxS5s2fRnBtfJvvPAMKfiaY3FHklDNdN/gekMHSJbWYf0CwQK8Iim+cgkxIZz R8M3xi8ZYCmMtkokFCa1/vnWT+2QrhKjxkSDY8UuUVQAVGuMX9ztF3iF+oCrkycsFFWC i8Xex/XiDWXzEhqy/ThD2l/X137acR2PqW1qxPKIMJ4NfZlfosXmON3BkRUVXWsun6OX 25Fg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=SGoeRrQOnA9Fts7F3EzynEI3Qjd0K7Uoxy27B79+150=; b=dQe5AAtkEJ4OZgqvzUAflMjunXSosLBO9CpIM1SglBz2A9tTdaj7wIkARWc/06jBvL kSnN5348BKWVA58ZnxemsGxL7YdvrPbUkAUrTwasex6O3yDdrvhuohYq6lOn04xpF4+O VdxP4XYo8v+7l/s23dB7n+o0F3BzKy8hIzUxzcdx2+LPdTsVHvGVZCCPqxxoOpY2QM71 H7TDm9lLOuCI4SfKtTzU/uvWRh8g2Xsila4BPAyUXIzSGlqZsU9uXdRhsQfPKCpKl/Ut shdBOF3Guk7b6GLWkDQOBMqkkfAP1PiXzUfH77lfRzO3D7tCKZBhYoDdc5o+bSTUtqaB 6S+A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=MMsLE2Q0; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id mc3si12142980ejb.404.2020.09.08.12.24.35; Tue, 08 Sep 2020 12:24:35 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=MMsLE2Q0; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730976AbgIHTXo (ORCPT + 15 others); Tue, 8 Sep 2020 15:23:44 -0400 Received: from mail.kernel.org ([198.145.29.99]:48732 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731096AbgIHQBY (ORCPT ); Tue, 8 Sep 2020 12:01:24 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 04DA423EAF; Tue, 8 Sep 2020 15:37:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1599579473; bh=3ahDVtPdEadssd8Vxb18CRDen5htLpWbWq5DrbGDtUo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MMsLE2Q0RC7Fn506i55HCvjukvjWUwyw5gCRcVc10uoVO7xjWglbWs2wzbbWtoFTx EYVbFti24aXsst6HBdaj2R+TwQl5NKsEPwJbsKTJbr+wIl/rfbMmqHaJqCzHCYmrXK KOXelm4fjAl8z4HJZz7s69fVZOtjQuM6JyDsYci0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Al Grant , Adrian Hunter , Mathieu Poirier , Alexander Shishkin , Andi Kleen , Jiri Olsa , Kan Liang , Leo Yan , Mark Rutland , Mike Leach , Namhyung Kim , Peter Zijlstra , Suzuki Poulouse , linux-arm-kernel@lists.infradead.org, Arnaldo Carvalho de Melo , Sasha Levin Subject: [PATCH 5.8 093/186] perf intel-pt: Fix corrupt data after perf inject from Date: Tue, 8 Sep 2020 17:23:55 +0200 Message-Id: <20200908152246.140021403@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200908152241.646390211@linuxfoundation.org> References: <20200908152241.646390211@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Al Grant [ Upstream commit a347306fbec5dcaf7c276777b11d530eab6a4526 ] Commit 42bbabed09ce6208 ("perf tools: Add hw_idx in struct branch_stack") changed the format of branch stacks in perf samples. When samples use this new format, a flag must be set in the corresponding event. Synthesized branch stacks generated from Intel PT were using the new format, but not setting the event attribute, leading to consumers seeing corrupt data. This patch fixes the issue by setting the event attribute to indicate use of the new format. Fixes: 42bbabed09ce6208 ("perf tools: Add hw_idx in struct branch_stack") Signed-off-by: Al Grant Acked-by: Adrian Hunter Reviewed-by: Mathieu Poirier Cc: Alexander Shishkin Cc: Andi Kleen Cc: Jiri Olsa Cc: Kan Liang Cc: Leo Yan Cc: Mark Rutland Cc: Mike Leach Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Suzuki Poulouse Cc: linux-arm-kernel@lists.infradead.org Link: http://lore.kernel.org/lkml/20200819084751.17686-2-leo.yan@linaro.org Signed-off-by: Leo Yan Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Sasha Levin --- tools/perf/util/intel-pt.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) -- 2.25.1 diff --git a/tools/perf/util/intel-pt.c b/tools/perf/util/intel-pt.c index cb3c1e569a2db..9357b5f62c273 100644 --- a/tools/perf/util/intel-pt.c +++ b/tools/perf/util/intel-pt.c @@ -2913,8 +2913,15 @@ static int intel_pt_synth_events(struct intel_pt *pt, if (pt->synth_opts.callchain) attr.sample_type |= PERF_SAMPLE_CALLCHAIN; - if (pt->synth_opts.last_branch) + if (pt->synth_opts.last_branch) { attr.sample_type |= PERF_SAMPLE_BRANCH_STACK; + /* + * We don't use the hardware index, but the sample generation + * code uses the new format branch_stack with this field, + * so the event attributes must indicate that it's present. + */ + attr.branch_sample_type |= PERF_SAMPLE_BRANCH_HW_INDEX; + } if (pt->synth_opts.instructions) { attr.config = PERF_COUNT_HW_INSTRUCTIONS;