From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Ingo Molnar <mingo@kernel.org>, Thomas Gleixner <tglx@linutronix.de>
Cc: Jiri Olsa <jolsa@kernel.org>, Namhyung Kim <namhyung@kernel.org>,
Clark Williams <williams@redhat.com>,
linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org,
Adrian Hunter <adrian.hunter@intel.com>,
Wei Li <liwei391@huawei.com>, Jiri Olsa <jolsa@redhat.com>,
Tan Xiaojun <tanxiaojun@huawei.com>,
stable@vger.kernel.org,
Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH 6/8] perf arm-spe: Fix endless record after being terminated
Date: Thu, 20 Feb 2020 22:53:08 -0300 [thread overview]
Message-ID: <20200221015310.16914-7-acme@kernel.org> (raw)
In-Reply-To: <20200221015310.16914-1-acme@kernel.org>
From: Adrian Hunter <adrian.hunter@intel.com>
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 <liwei391@huawei.com>
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Tan Xiaojun <tanxiaojun@huawei.com>
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 <acme@redhat.com>
---
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;
}
--
2.21.1
next prev parent reply other threads:[~2020-02-21 1:53 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-21 1:53 [GIT PULL] perf/urgent improvements and fixes Arnaldo Carvalho de Melo
2020-02-21 1:53 ` [PATCH 1/8] perf bpf: Remove bpf/ subdir from bpf.h headers used to build bpf events Arnaldo Carvalho de Melo
2020-02-21 1:53 ` [PATCH 2/8] perf test: Fix test trace+probe_vfs_getname.sh on s390 Arnaldo Carvalho de Melo
2020-02-21 1:53 ` [PATCH 3/8] perf intel-pt: Fix endless record after being terminated Arnaldo Carvalho de Melo
2020-02-21 1:53 ` [PATCH 4/8] perf intel-bts: " Arnaldo Carvalho de Melo
2020-02-21 1:53 ` [PATCH 5/8] perf cs-etm: " Arnaldo Carvalho de Melo
2020-02-21 1:53 ` Arnaldo Carvalho de Melo [this message]
2020-02-21 1:53 ` [PATCH 7/8] perf auxtrace: Add auxtrace_record__read_finish() Arnaldo Carvalho de Melo
2020-02-21 1:53 ` [PATCH 8/8] perf arch powerpc: Sync powerpc syscall.tbl with the kernel sources Arnaldo Carvalho de Melo
2020-02-26 14:19 ` [GIT PULL] perf/urgent improvements and fixes Ingo Molnar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200221015310.16914-7-acme@kernel.org \
--to=acme@kernel.org \
--cc=acme@redhat.com \
--cc=adrian.hunter@intel.com \
--cc=jolsa@kernel.org \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=liwei391@huawei.com \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
--cc=stable@vger.kernel.org \
--cc=tanxiaojun@huawei.com \
--cc=tglx@linutronix.de \
--cc=williams@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.