From: Adrian Hunter <adrian.hunter@intel.com>
To: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>, Namhyung Kim <namhyung@kernel.org>,
Ian Rogers <irogers@google.com>, Andi Kleen <ak@linux.intel.com>,
Alexey Bayduraev <alexey.v.bayduraev@linux.intel.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH 2/5] perf record: Fix done_fd wakeup event
Date: Wed, 24 Aug 2022 10:28:11 +0300 [thread overview]
Message-ID: <20220824072814.16422-3-adrian.hunter@intel.com> (raw)
In-Reply-To: <20220824072814.16422-1-adrian.hunter@intel.com>
evlist__add_wakeup_eventfd() calls perf_evlist__add_pollfd() to add a
non-perf-event to the evlist pollfds. Since commit 415ccb58f68a
("perf record: Introduce thread specific data array") that doesn't work
because evlist pollfs is not polled and done_fd is not duplicated into
thread-data.
Patch "perf record: Fix way of handling non-perf-event pollfds" added a new
approach that ensures file descriptors like done_fd are handled correctly
by flagging them as fdarray_flag__non_perf_event.
Fix by flagging done_fd as fdarray_flag__non_perf_event.
Example:
Before:
$ sleep 3 & perf record -vv -p $!
...
thread_data[0x55f44bd34140]: pollfd[0] <- event_fd=5
thread_data[0x55f44bd34140]: pollfd[1] <- event_fd=6
thread_data[0x55f44bd34140]: pollfd[2] <- event_fd=7
thread_data[0x55f44bd34140]: pollfd[3] <- event_fd=8
thread_data[0x55f44bd34140]: pollfd[4] <- event_fd=9
thread_data[0x55f44bd34140]: pollfd[5] <- event_fd=10
thread_data[0x55f44bd34140]: pollfd[6] <- event_fd=11
thread_data[0x55f44bd34140]: pollfd[7] <- event_fd=12
...
After:
$ sleep 3 & perf record -vv -p $!
...
thread_data[0x55a8ded89140]: pollfd[0] <- event_fd=5
thread_data[0x55a8ded89140]: pollfd[1] <- event_fd=6
thread_data[0x55a8ded89140]: pollfd[2] <- event_fd=7
thread_data[0x55a8ded89140]: pollfd[3] <- event_fd=8
thread_data[0x55a8ded89140]: pollfd[4] <- event_fd=9
thread_data[0x55a8ded89140]: pollfd[5] <- event_fd=10
thread_data[0x55a8ded89140]: pollfd[6] <- event_fd=11
thread_data[0x55a8ded89140]: pollfd[7] <- event_fd=12
thread_data[0x55a8ded89140]: pollfd[8] <- non_perf_event fd=4
...
This patch depends on "perf record: Fix way of handling non-perf-event
pollfds".
Fixes: 415ccb58f68a ("perf record: Introduce thread specific data array")
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
---
tools/perf/util/evlist.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
index 48167f3941a6..0b2222d05577 100644
--- a/tools/perf/util/evlist.c
+++ b/tools/perf/util/evlist.c
@@ -608,7 +608,8 @@ int evlist__filter_pollfd(struct evlist *evlist, short revents_and_mask)
int evlist__add_wakeup_eventfd(struct evlist *evlist, int fd)
{
return perf_evlist__add_pollfd(&evlist->core, fd, NULL, POLLIN,
- fdarray_flag__nonfilterable);
+ fdarray_flag__nonfilterable |
+ fdarray_flag__non_perf_event);
}
#endif
--
2.25.1
next prev parent reply other threads:[~2022-08-24 7:28 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-24 7:28 [PATCH 0/5] perf record: Allow multiple recording time ranges Adrian Hunter
2022-08-24 7:28 ` [PATCH 1/5] perf record: Fix way of handling non-perf-event pollfds Adrian Hunter
2022-08-24 15:40 ` Ian Rogers
2022-08-24 7:28 ` Adrian Hunter [this message]
2022-08-24 15:41 ` [PATCH 2/5] perf record: Fix done_fd wakeup event Ian Rogers
2022-08-24 7:28 ` [PATCH 3/5] perf record: Change evlist->ctl_fd to use fdarray_flag__non_perf_event Adrian Hunter
2022-08-24 15:42 ` Ian Rogers
2022-08-24 7:28 ` [PATCH 4/5] perf evlist: Add evlist__{en/dis}able_non_dummy() Adrian Hunter
2022-08-24 15:45 ` Ian Rogers
2022-08-24 7:28 ` [PATCH 5/5] perf record: Allow multiple recording time ranges Adrian Hunter
2022-08-24 15:52 ` Ian Rogers
2022-08-26 6:38 ` Adrian Hunter
2022-08-24 16:56 ` [PATCH 0/5] " Andi Kleen
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=20220824072814.16422-3-adrian.hunter@intel.com \
--to=adrian.hunter@intel.com \
--cc=acme@kernel.org \
--cc=ak@linux.intel.com \
--cc=alexey.v.bayduraev@linux.intel.com \
--cc=irogers@google.com \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=namhyung@kernel.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox