[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <174219764114.14745.8810597138506735404.tip-bot2@tip-bot2>
Date: Mon, 17 Mar 2025 07:47:19 -0000
From: "tip-bot2 for Tao Chen" <tip-bot2@...utronix.de>
To: linux-tip-commits@...r.kernel.org
Cc: Tao Chen <chen.dylane@...ux.dev>, Ingo Molnar <mingo@...nel.org>,
Peter Zijlstra <peterz@...radead.org>,
Arnaldo Carvalho de Melo <acme@...hat.com>, "H. Peter Anvin" <hpa@...or.com>,
Linus Torvalds <torvalds@...ux-foundation.org>, x86@...nel.org,
linux-kernel@...r.kernel.org
Subject:
[tip: perf/core] perf/ring_buffer: Allow the EPOLLRDNORM flag for poll
The following commit has been merged into the perf/core branch of tip:
Commit-ID: c96fff391c095c11dc87dab35be72dee7d217cde
Gitweb: https://git.kernel.org/tip/c96fff391c095c11dc87dab35be72dee7d217cde
Author: Tao Chen <chen.dylane@...ux.dev>
AuthorDate: Fri, 14 Mar 2025 11:00:36 +08:00
Committer: Ingo Molnar <mingo@...nel.org>
CommitterDate: Mon, 17 Mar 2025 08:31:04 +01:00
perf/ring_buffer: Allow the EPOLLRDNORM flag for poll
The poll man page says POLLRDNORM is equivalent to POLLIN. For poll(),
it seems that if user sets pollfd with POLLRDNORM in userspace, perf_poll
will not return until timeout even if perf_output_wakeup called,
whereas POLLIN returns.
Fixes: 76369139ceb9 ("perf: Split up buffer handling from core code")
Signed-off-by: Tao Chen <chen.dylane@...ux.dev>
Signed-off-by: Ingo Molnar <mingo@...nel.org>
Cc: Peter Zijlstra <peterz@...radead.org>
Cc: Arnaldo Carvalho de Melo <acme@...hat.com>
Cc: "H. Peter Anvin" <hpa@...or.com>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
Link: https://lore.kernel.org/r/20250314030036.2543180-1-chen.dylane@linux.dev
---
kernel/events/ring_buffer.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/events/ring_buffer.c b/kernel/events/ring_buffer.c
index 59a52b1..5130b11 100644
--- a/kernel/events/ring_buffer.c
+++ b/kernel/events/ring_buffer.c
@@ -19,7 +19,7 @@
static void perf_output_wakeup(struct perf_output_handle *handle)
{
- atomic_set(&handle->rb->poll, EPOLLIN);
+ atomic_set(&handle->rb->poll, EPOLLIN | EPOLLRDNORM);
handle->event->pending_wakeup = 1;
Powered by blists - more mailing lists