projects
/
platform
/
kernel
/
linux-starfive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f09fb7f
)
io_uring: use user visible tail in io_uring_poll()
author
Pavel Begunkov
<asml.silence@gmail.com>
Mon, 23 Jan 2023 14:37:13 +0000
(14:37 +0000)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Fri, 10 Mar 2023 08:34:03 +0000
(09:34 +0100)
commit
c10bb64684813a326174c3eebcafb3ee5af52ca3
upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
io_uring/io_uring.c
patch
|
blob
|
history
diff --git
a/io_uring/io_uring.c
b/io_uring/io_uring.c
index
862e05e
..
dc5a8c3
100644
(file)
--- a/
io_uring/io_uring.c
+++ b/
io_uring/io_uring.c
@@
-2653,7
+2653,7
@@
static __poll_t io_uring_poll(struct file *file, poll_table *wait)
* pushs 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;