From: Adrian Hunter <adrian.hunter@intel.com>
To: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>,
linux-kernel@vger.kernel.org, Tan Xiaojun <tanxiaojun@huawei.com>,
Wei Li <liwei391@huawei.com>
Subject: [PATCH V2 1/5] perf tools: intel-pt: fix endless record after being terminated
Date: Fri, 14 Feb 2020 15:26:50 +0200 [thread overview]
Message-ID: <20200214132654.20395-2-adrian.hunter@intel.com> (raw)
In-Reply-To: <20200214132654.20395-1-adrian.hunter@intel.com>
From: Wei Li <liwei391@huawei.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 intel_pt event is disabled, we don't enable it again here.
Before the patch:
huawei@huawei-2288H-V5:~/linux-5.5-rc4/tools/perf$ ./perf record -e \
intel_pt//u -p 46803
^C^C^C^C^C^C
After the patch:
huawei@huawei-2288H-V5:~/linux-5.5-rc4/tools/perf$ ./perf record -e \
intel_pt//u -p 48591
^C[ perf record: Woken up 0 times to write data ]
Warning:
AUX data lost 504 times out of 4816!
[ perf record: Captured and wrote 2024.405 MB perf.data ]
Signed-off-by: Wei Li <liwei391@huawei.com>
[ahunter: removed redundant 'else' after 'return']
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Cc: stable@vger.kernel.org # 5.4+
---
tools/perf/arch/x86/util/intel-pt.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/tools/perf/arch/x86/util/intel-pt.c b/tools/perf/arch/x86/util/intel-pt.c
index ec75445ef7cf..2f0a0832907f 100644
--- a/tools/perf/arch/x86/util/intel-pt.c
+++ b/tools/perf/arch/x86/util/intel-pt.c
@@ -1177,9 +1177,12 @@ static int intel_pt_read_finish(struct auxtrace_record *itr, int idx)
struct evsel *evsel;
evlist__for_each_entry(ptr->evlist, evsel) {
- if (evsel->core.attr.type == ptr->intel_pt_pmu->type)
+ if (evsel->core.attr.type == ptr->intel_pt_pmu->type) {
+ if (evsel->disabled)
+ return 0;
return perf_evlist__enable_event_idx(ptr->evlist, evsel,
idx);
+ }
}
return -EINVAL;
}
--
2.17.1
next prev parent reply other threads:[~2020-02-14 13:28 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-14 13:26 [PATCH 0/5] perf tools: fix endless record after being terminated Adrian Hunter
2020-02-14 13:26 ` Adrian Hunter [this message]
2020-02-26 14:20 ` [tip: perf/urgent] perf intel-pt: Fix " tip-bot2 for Wei Li
2020-02-14 13:26 ` [PATCH V2 2/5] perf tools: intel-bts: fix " Adrian Hunter
2020-02-26 14:20 ` [tip: perf/urgent] perf intel-bts: Fix " tip-bot2 for Wei Li
2020-02-14 13:26 ` [PATCH V2 3/5] perf tools: cs-etm: fix " Adrian Hunter
2020-02-14 14:07 ` Adrian Hunter
2020-02-14 14:43 ` Leo Yan
2020-02-14 18:24 ` Mathieu Poirier
2020-02-26 14:20 ` [tip: perf/urgent] perf cs-etm: Fix " tip-bot2 for Wei Li
2020-02-14 13:26 ` [PATCH 4/5] perf tools: arm-spe: fix " Adrian Hunter
2020-02-26 14:20 ` [tip: perf/urgent] perf arm-spe: Fix " tip-bot2 for Adrian Hunter
2020-02-14 13:26 ` [PATCH 5/5] perf auxtrace: Add auxtrace_record__read_finish() Adrian Hunter
2020-02-14 14:08 ` Adrian Hunter
2020-02-14 14:48 ` Leo Yan
2020-02-17 8:23 ` [PATCH V2 " Adrian Hunter
2020-02-17 14:42 ` Arnaldo Carvalho de Melo
2020-02-26 14:20 ` [tip: perf/urgent] " tip-bot2 for Adrian Hunter
2020-02-14 18:27 ` [PATCH 5/5] " Mathieu Poirier
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=20200214132654.20395-2-adrian.hunter@intel.com \
--to=adrian.hunter@intel.com \
--cc=acme@kernel.org \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=liwei391@huawei.com \
--cc=tanxiaojun@huawei.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.