summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPavel Begunkov <asml.silence@gmail.com>2023-01-23 17:37:13 +0300
committerJens Axboe <axboe@kernel.dk>2023-01-30 01:17:41 +0300
commitc10bb64684813a326174c3eebcafb3ee5af52ca3 (patch)
treecbddc7fbefd26342f9ec9ba77a1c8c9ba3c8a03e
parentf499254474a83bf60191c86de82c1fec1d8eb9f9 (diff)
downloadlinux-c10bb64684813a326174c3eebcafb3ee5af52ca3.tar.xz
io_uring: use user visible tail in io_uring_poll()
We return POLLIN from io_uring_poll() depending on whether there are CQEs for the userspace, and so we should use the user visible tail pointer instead of a transient cached value. Cc: stable@vger.kernel.org Signed-off-by: Pavel Begunkov <asml.silence@gmail.com> Link: https://lore.kernel.org/r/228ffcbf30ba98856f66ffdb9a6a60ead1dd96c0.1674484266.git.asml.silence@gmail.com Signed-off-by: Jens Axboe <axboe@kernel.dk>
-rw-r--r--io_uring/io_uring.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c
index 4958725e0b97..1681be25cf58 100644
--- a/io_uring/io_uring.c
+++ b/io_uring/io_uring.c
@@ -2886,7 +2886,7 @@ static __poll_t io_uring_poll(struct file *file, poll_table *wait)
* pushes them to do the flush.
*/
- if (io_cqring_events(ctx) || io_has_work(ctx))
+ if (__io_cqring_events_user(ctx) || io_has_work(ctx))
mask |= EPOLLIN | EPOLLRDNORM;
return mask;