From patchwork Fri Feb 21 01:53:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnaldo Carvalho de Melo X-Patchwork-Id: 231053 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,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 EE84AC11D25 for ; Fri, 21 Feb 2020 01:53:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BCC2D24672 for ; Fri, 21 Feb 2020 01:53:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582250017; bh=Jcesa/3mjAuRfrWhL3C7FVYdEiKEQcqA5XsgOnrv+PA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=MRaJqXRlw+4ihHxGK5NXMFY4pp4ZxcIqEcKTs7shX/S9gI+AjTolvgwa3IO/UOOrI xlOmMkmciAUSRGtnoSi8VlNGlJItTRHSoheWdv0Z1m4Fc3IwOX6NUHy74sz3FZtpOD 8AowmNIZOrOBDyuursEcbJ5p26v+fyPIbCIDfA2U= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729648AbgBUBxg (ORCPT ); Thu, 20 Feb 2020 20:53:36 -0500 Received: from mail.kernel.org ([198.145.29.99]:57260 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729629AbgBUBxe (ORCPT ); Thu, 20 Feb 2020 20:53:34 -0500 Received: from quaco.ghostprotocols.net (unknown [179.97.37.151]) (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 03A9D208E4; Fri, 21 Feb 2020 01:53:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582250013; bh=Jcesa/3mjAuRfrWhL3C7FVYdEiKEQcqA5XsgOnrv+PA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=A+iFV9tKFunDDZU0xBglPs+lpdU60rLQzAahtRhk/LQM+03cS0r7wMEDbOjLMBrtk a3H+obmaGSjbzVCLgr8idoUL2BrX3j0m5T1+Vrz62gVyeV0mFBf08TxADtTUZ2jj6A 5KIeRyAi5q5he+XMCMVKTnqRnb7MRnsipJRO0gsc= From: Arnaldo Carvalho de Melo To: Ingo Molnar , Thomas Gleixner Cc: Jiri Olsa , Namhyung Kim , Clark Williams , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Wei Li , Jiri Olsa , Tan Xiaojun , stable@vger.kernel.org, Adrian Hunter , Arnaldo Carvalho de Melo Subject: [PATCH 4/8] perf intel-bts: Fix endless record after being terminated Date: Thu, 20 Feb 2020 22:53:06 -0300 Message-Id: <20200221015310.16914-5-acme@kernel.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200221015310.16914-1-acme@kernel.org> References: <20200221015310.16914-1-acme@kernel.org> MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Wei Li In __cmd_record(), when receiving SIGINT(ctrl + c), a 'done' flag will be set and the event list will be disabled by evlist__disable() once. While in auxtrace_record.read_finish(), the related events will be enabled again, if they are continuous, the recording seems to be endless. If the intel_bts event is disabled, we don't enable it again here. Note: This patch is NOT tested since i don't have such a machine with intel_bts feature, but the code seems buggy same as arm-spe and intel-pt. Signed-off-by: Wei Li Cc: Jiri Olsa Cc: Tan Xiaojun Cc: stable@vger.kernel.org # 5.4+ Link: http://lore.kernel.org/lkml/20200214132654.20395-3-adrian.hunter@intel.com [ahunter: removed redundant 'else' after 'return'] Signed-off-by: Adrian Hunter Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/arch/x86/util/intel-bts.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/perf/arch/x86/util/intel-bts.c b/tools/perf/arch/x86/util/intel-bts.c index 27d9e214d068..39e363151ad7 100644 --- a/tools/perf/arch/x86/util/intel-bts.c +++ b/tools/perf/arch/x86/util/intel-bts.c @@ -420,9 +420,12 @@ static int intel_bts_read_finish(struct auxtrace_record *itr, int idx) struct evsel *evsel; evlist__for_each_entry(btsr->evlist, evsel) { - if (evsel->core.attr.type == btsr->intel_bts_pmu->type) + if (evsel->core.attr.type == btsr->intel_bts_pmu->type) { + if (evsel->disabled) + return 0; return perf_evlist__enable_event_idx(btsr->evlist, evsel, idx); + } } return -EINVAL; } From patchwork Fri Feb 21 01:53:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnaldo Carvalho de Melo X-Patchwork-Id: 231052 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, URIBL_BLOCKED, 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 82039C11D00 for ; Fri, 21 Feb 2020 01:54:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4BE83206E2 for ; Fri, 21 Feb 2020 01:54:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582250043; bh=8pYWMpMHXaW4t1r1z4kxk51e/cZxhTXZJHIy5G18ELo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=KzRawjOCCjMYZh2zLOmcKb4jkx7g+HTdA3icJWcqVZ+sV5o69V29x5mCCyEbF0qFH RKEN5TOYG3yCUALYwkwnwIb9/jSXGxIkW/3/vWz3s/8rI3cCkQc1WPld2TD/Moifzb 0bxr/xGkhS0UiI3FY2kuQBnxsGJfOk76gOdBaRQk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729683AbgBUBxq (ORCPT ); Thu, 20 Feb 2020 20:53:46 -0500 Received: from mail.kernel.org ([198.145.29.99]:57486 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729675AbgBUBxn (ORCPT ); Thu, 20 Feb 2020 20:53:43 -0500 Received: from quaco.ghostprotocols.net (unknown [179.97.37.151]) (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 DC43B24653; Fri, 21 Feb 2020 01:53:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582250023; bh=8pYWMpMHXaW4t1r1z4kxk51e/cZxhTXZJHIy5G18ELo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SbK8KaMbFYYfWEpvuND5NZCct58WUcTsKlfvWrE/BnVv9fqL30hRcBfMT+1U0fdxS jHfthCkSmECV0E6yA8zbcAxm/muQQZp/i5NBQDTnYd/j3xM9o5+mHkuD6oLIodyCEz yEsTSo1GByKa//PHFlMLfTv+vb6uXy6eZGjSqvhE= From: Arnaldo Carvalho de Melo To: Ingo Molnar , Thomas Gleixner Cc: Jiri Olsa , Namhyung Kim , Clark Williams , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Adrian Hunter , Wei Li , Jiri Olsa , Tan Xiaojun , stable@vger.kernel.org, Arnaldo Carvalho de Melo Subject: [PATCH 6/8] perf arm-spe: Fix endless record after being terminated Date: Thu, 20 Feb 2020 22:53:08 -0300 Message-Id: <20200221015310.16914-7-acme@kernel.org> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200221015310.16914-1-acme@kernel.org> References: <20200221015310.16914-1-acme@kernel.org> MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Adrian Hunter In __cmd_record(), when receiving SIGINT(ctrl + c), a 'done' flag will be set and the event list will be disabled by evlist__disable() once. While in auxtrace_record.read_finish(), the related events will be enabled again, if they are continuous, the recording seems to be endless. If the event is disabled, don't enable it again here. Based-on-patch-by: Wei Li Signed-off-by: Adrian Hunter Cc: Jiri Olsa Cc: Tan Xiaojun Cc: stable@vger.kernel.org # 5.4+ Link: http://lore.kernel.org/lkml/20200214132654.20395-5-adrian.hunter@intel.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/arch/arm64/util/arm-spe.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/perf/arch/arm64/util/arm-spe.c b/tools/perf/arch/arm64/util/arm-spe.c index eba6541ec0f1..1d993c27242b 100644 --- a/tools/perf/arch/arm64/util/arm-spe.c +++ b/tools/perf/arch/arm64/util/arm-spe.c @@ -165,9 +165,12 @@ static int arm_spe_read_finish(struct auxtrace_record *itr, int idx) struct evsel *evsel; evlist__for_each_entry(sper->evlist, evsel) { - if (evsel->core.attr.type == sper->arm_spe_pmu->type) + if (evsel->core.attr.type == sper->arm_spe_pmu->type) { + if (evsel->disabled) + return 0; return perf_evlist__enable_event_idx(sper->evlist, evsel, idx); + } } return -EINVAL; }