From: Jiri Olsa <jolsa@redhat.com>
To: Anand K Mistry <amistry@google.com>
Cc: linux-perf-users@vger.kernel.org,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Arnaldo Carvalho de Melo <acme@kernel.org>,
Ingo Molnar <mingo@redhat.com>,
Mark Rutland <mark.rutland@arm.com>,
Namhyung Kim <namhyung@kernel.org>,
Peter Zijlstra <peterz@infradead.org>,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] perf record: Use an eventfd to wakeup when done
Date: Tue, 12 May 2020 14:12:32 +0200 [thread overview]
Message-ID: <20200512121232.GB3150977@krava> (raw)
In-Reply-To: <20200512145930.1.I4d7421c6bbb1f83ea58419082481082e19097841@changeid>
On Tue, May 12, 2020 at 02:59:36PM +1000, Anand K Mistry wrote:
SNIP
> diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
> index 1ab349abe90469..099ecaa66732a2 100644
> --- a/tools/perf/builtin-record.c
> +++ b/tools/perf/builtin-record.c
> @@ -53,6 +53,7 @@
> #include <unistd.h>
> #include <sched.h>
> #include <signal.h>
> +#include <sys/eventfd.h>
> #include <sys/mman.h>
> #include <sys/wait.h>
> #include <sys/types.h>
> @@ -518,15 +519,28 @@ static int record__pushfn(struct mmap *map, void *to, void *bf, size_t size)
>
> static volatile int signr = -1;
> static volatile int child_finished;
> +static int done_fd = -1;
>
> static void sig_handler(int sig)
> {
> + u64 tmp = 1;
> if (sig == SIGCHLD)
> child_finished = 1;
> else
> signr = sig;
>
> done = 1;
> +
> + /*
> + * It is possible for this signal handler to run after done is checked
> + * in the main loop, but before the perf counter fds are polled. If this
> + * happens, the poll() will continue to wait even though done is set,
> + * and will only break out if either another signal is received, or the
> + * counters are ready for read. To ensure the poll() doesn't sleep when
> + * done is set, use an eventfd (done_fd) to wake up the poll().
> + */
> + if (write(done_fd, &tmp, sizeof(tmp)) < 0)
> + pr_err("failed to signal wakeup fd\n");
> }
>
> static void sigsegv_handler(int sig)
> @@ -1424,6 +1438,17 @@ static int __cmd_record(struct record *rec, int argc, const char **argv)
> int fd;
> float ratio = 0;
>
> + done_fd = eventfd(0, EFD_NONBLOCK);
> + if (done_fd < 0) {
> + pr_err("Failed to create wakeup eventfd, error: %m\n");
> + return -1;
> + }
> + err = evlist__add_pollfd(rec->evlist, done_fd);
> + if (err < 0) {
> + pr_err("Failed to add wakeup eventfd to poll list\n");
> + return -1;
> + }
sorry I did not notice before, but I think we also
need to close done_fd descriptor on the exit path
also please change subject to PATCHv3 for the next version
thanks,
jirka
> +
> atexit(record__sig_exit);
> signal(SIGCHLD, sig_handler);
> signal(SIGINT, sig_handler);
> --
> 2.26.2.645.ge9eca65c58-goog
>
next prev parent reply other threads:[~2020-05-12 12:12 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-08 4:56 [PATCH] perf record: Use an eventfd to wakeup when done Anand K Mistry
2020-05-11 11:28 ` Jiri Olsa
2020-05-12 4:59 ` Anand K Mistry
2020-05-12 12:12 ` Jiri Olsa [this message]
2020-05-12 14:12 ` Arnaldo Carvalho de Melo
2020-05-13 2:30 ` Anand K. Mistry
2020-05-13 2:20 ` [PATCH v3] " Anand K Mistry
2020-05-13 11:39 ` Jiri Olsa
2020-05-13 14:03 ` Arnaldo Carvalho de Melo
2020-05-20 15:47 ` Arnaldo Carvalho de Melo
2020-05-23 13:34 ` Andi Kleen
2020-05-25 1:43 ` Anand K. Mistry
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=20200512121232.GB3150977@krava \
--to=jolsa@redhat.com \
--cc=acme@kernel.org \
--cc=alexander.shishkin@linux.intel.com \
--cc=amistry@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.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;
as well as URLs for NNTP newsgroup(s).