From: tip-bot for Jiri Olsa <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: acme@redhat.com, mingo@kernel.org, jolsa@kernel.org,
a.p.zijlstra@chello.nl, peterz@infradead.org,
jean.pihet@linaro.org, acme@kernel.org, fweisbec@gmail.com,
dsahern@gmail.com, tglx@linutronix.de,
cjashfor@linux.vnet.ibm.com, hpa@zytor.com,
linux-kernel@vger.kernel.org, paulus@samba.org,
namhyung@kernel.org, adrian.hunter@intel.com
Subject: [tip:perf/core] perf: Fix perf_poll to return proper POLLHUP value
Date: Sun, 24 Aug 2014 07:59:26 -0700 [thread overview]
Message-ID: <tip-0ywfthh4lh65swe15f6w2x2q@git.kernel.org> (raw)
In-Reply-To: <20140811120102.GY9918@twins.programming.kicks-ass.net>
Commit-ID: 61b67684c4a4d04b30d9ed67aa2eadfa0089c590
Gitweb: http://git.kernel.org/tip/61b67684c4a4d04b30d9ed67aa2eadfa0089c590
Author: Jiri Olsa <jolsa@kernel.org>
AuthorDate: Wed, 13 Aug 2014 19:39:56 +0200
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Sun, 24 Aug 2014 08:10:55 -0300
perf: Fix perf_poll to return proper POLLHUP value
Currently perf_poll returns POLL_HUP in case of error, which is wrong,
because poll syscall expects POLLHUP. The POLL_HUP is meant to be used
for SIGIO state.
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Acked-by: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20140811120102.GY9918@twins.programming.kicks-ass.net
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jean Pihet <jean.pihet@linaro.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/n/tip-0ywfthh4lh65swe15f6w2x2q@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
kernel/events/core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/events/core.c b/kernel/events/core.c
index 2d7363a..4575dd6 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -3627,7 +3627,7 @@ static unsigned int perf_poll(struct file *file, poll_table *wait)
{
struct perf_event *event = file->private_data;
struct ring_buffer *rb;
- unsigned int events = POLL_HUP;
+ unsigned int events = POLLHUP;
poll_wait(file, &event->waitq, wait);
/*
next prev parent reply other threads:[~2014-08-24 15:02 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-11 8:49 [RFC 00/20] perf: Finish sampling commands when events are closed Jiri Olsa
2014-08-11 8:49 ` [PATCH 01/20] perf: Add PERF_EVENT_STATE_EXIT state for events with exited task Jiri Olsa
2014-08-11 12:01 ` Peter Zijlstra
2014-08-11 12:22 ` Jiri Olsa
2014-08-24 14:59 ` tip-bot for Jiri Olsa [this message]
2014-08-24 14:59 ` [tip:perf/core] " tip-bot for Jiri Olsa
2014-08-11 8:49 ` [PATCH 02/20] perf tools: Add poller object to handle polling globaly Jiri Olsa
2014-08-11 8:49 ` [PATCH 03/20] perf tests: Add poller object test Jiri Olsa
2014-08-11 8:49 ` [PATCH 04/20] perf tools: Add support to traverse xyarrays Jiri Olsa
2014-08-11 8:49 ` [PATCH 05/20] perf tools: Introduce perf_evsel__fd function Jiri Olsa
2014-08-11 8:50 ` [PATCH 06/20] perf tools: Add evlist/evsel poller object support Jiri Olsa
2014-08-11 8:50 ` [PATCH 07/20] perf record: Add support to see event's ERR and HUP poll errors Jiri Olsa
2014-08-11 8:50 ` [PATCH 08/20] perf tools: Add set_term_quiet_input helper function Jiri Olsa
2014-08-14 8:43 ` [tip:perf/core] perf tools: Introduce " tip-bot for Jiri Olsa
2014-08-11 8:50 ` [PATCH 09/20] perf tui browser: Add interface to terminate browser from uotside Jiri Olsa
2014-08-11 8:50 ` [PATCH 10/20] perf top: Add support to see event's ERR and HUP poll errors Jiri Olsa
2014-08-11 8:50 ` [PATCH 11/20] perf top: Join the display thread on exit Jiri Olsa
2014-08-14 8:43 ` [tip:perf/core] " tip-bot for Jiri Olsa
2014-08-11 8:50 ` [PATCH 12/20] perf top: Use set_term_quiet_input for terminal input Jiri Olsa
2014-08-11 8:50 ` [PATCH 13/20] perf top: Setup signals for terminal output Jiri Olsa
2014-08-14 8:43 ` [tip:perf/core] " tip-bot for Jiri Olsa
2014-08-11 8:50 ` [PATCH 14/20] perf top: Use poller object for display thread stdin Jiri Olsa
2014-08-11 8:50 ` [PATCH 15/20] perf kvm: Fix stdin handling for 'kvm stat live' command Jiri Olsa
2014-08-14 8:43 ` [tip:perf/core] " tip-bot for Jiri Olsa
2014-08-11 8:50 ` [PATCH 16/20] perf kvm: Add support to see event's ERR and HUP poll errors Jiri Olsa
2014-08-11 8:50 ` [PATCH 17/20] perf trace: " Jiri Olsa
2014-08-11 8:50 ` [PATCH 18/20] perf python: Use poller object for polling Jiri Olsa
2014-08-11 8:50 ` [PATCH 19/20] perf tests: " Jiri Olsa
2014-08-11 8:50 ` [PATCH 20/20] perf tools: Remove pollfd stuff out of evlist object Jiri Olsa
2014-08-11 20:12 ` [RFC 00/20] perf: Finish sampling commands when events are closed Arnaldo Carvalho de Melo
2014-08-11 20:28 ` Arnaldo Carvalho de Melo
2014-08-12 7:33 ` Jiri Olsa
2014-08-12 7:29 ` Jiri Olsa
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=tip-0ywfthh4lh65swe15f6w2x2q@git.kernel.org \
--to=tipbot@zytor.com \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@kernel.org \
--cc=acme@redhat.com \
--cc=adrian.hunter@intel.com \
--cc=cjashfor@linux.vnet.ibm.com \
--cc=dsahern@gmail.com \
--cc=fweisbec@gmail.com \
--cc=hpa@zytor.com \
--cc=jean.pihet@linaro.org \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
--cc=paulus@samba.org \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
/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