From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3D280C43603 for ; Tue, 10 Dec 2019 22:35:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 04A9420836 for ; Tue, 10 Dec 2019 22:35:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576017313; bh=QsV8U8qwTMqNA+mAFhcYDJs81JqiREYZbKCLRDI00TA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=mWebs+nngsYpuogH2x153q4NTSw3/vgcQbE8y5BNP/Kis0xAPVd3t0gVo613o9pZz 8wD5tuSTrpfZwBaNgFkncpBP3e7i6pBwB+usNyfpb8bWdlJnyWFpVZGz8haioyurGA ZpgMm9vK+yiwDe+njEYUrYrOBa3+OnzfCap7aoUU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729462AbfLJWfE (ORCPT ); Tue, 10 Dec 2019 17:35:04 -0500 Received: from mail.kernel.org ([198.145.29.99]:56334 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730441AbfLJWel (ORCPT ); Tue, 10 Dec 2019 17:34:41 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B230621556; Tue, 10 Dec 2019 22:34:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576017280; bh=QsV8U8qwTMqNA+mAFhcYDJs81JqiREYZbKCLRDI00TA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ExjbpuKbVO19nflmfHoOqRwBOLpXJk0/8HApUOp6PSF50APw/mlU7d7Rf/JuS5a72 f6Nn9z+3XK8T1s9UMYtBpZjD5Lzb3a0bPGbyaxIjkjD7vT5MMRtagjNuPan71Ps54z QF5itds6ty/w2BnpBUScDPg9VkeutE3jQ3gVoYK8= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Adrian Hunter , Jiri Olsa , Arnaldo Carvalho de Melo , Sasha Levin Subject: [PATCH AUTOSEL 4.4 70/71] perf intel-bts: Does not support AUX area sampling Date: Tue, 10 Dec 2019 17:33:15 -0500 Message-Id: <20191210223316.14988-70-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191210223316.14988-1-sashal@kernel.org> References: <20191210223316.14988-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Adrian Hunter [ Upstream commit 32a1ece4bdbde24734ab16484bad7316f03fc42d ] Add an error message because Intel BTS does not support AUX area sampling. Signed-off-by: Adrian Hunter Cc: Jiri Olsa Link: http://lore.kernel.org/lkml/20191115124225.5247-16-adrian.hunter@intel.com Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Sasha Levin --- tools/perf/arch/x86/util/auxtrace.c | 2 ++ tools/perf/arch/x86/util/intel-bts.c | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/tools/perf/arch/x86/util/auxtrace.c b/tools/perf/arch/x86/util/auxtrace.c index 7a7805583e3fe..ab641cfc8c2bb 100644 --- a/tools/perf/arch/x86/util/auxtrace.c +++ b/tools/perf/arch/x86/util/auxtrace.c @@ -35,6 +35,8 @@ struct auxtrace_record *auxtrace_record__init_intel(struct perf_evlist *evlist, intel_pt_pmu = perf_pmu__find(INTEL_PT_PMU_NAME); intel_bts_pmu = perf_pmu__find(INTEL_BTS_PMU_NAME); + if (intel_bts_pmu) + intel_bts_pmu->auxtrace = true; if (evlist) { evlist__for_each(evlist, evsel) { diff --git a/tools/perf/arch/x86/util/intel-bts.c b/tools/perf/arch/x86/util/intel-bts.c index 9b94ce5209170..9d83a7f3496cb 100644 --- a/tools/perf/arch/x86/util/intel-bts.c +++ b/tools/perf/arch/x86/util/intel-bts.c @@ -119,6 +119,11 @@ static int intel_bts_recording_options(struct auxtrace_record *itr, const struct cpu_map *cpus = evlist->cpus; bool privileged = geteuid() == 0 || perf_event_paranoid() < 0; + if (opts->auxtrace_sample_mode) { + pr_err("Intel BTS does not support AUX area sampling\n"); + return -EINVAL; + } + btsr->evlist = evlist; btsr->snapshot_mode = opts->auxtrace_snapshot_mode; -- 2.20.1