From: Pavel Begunkov Date: Mon, 23 Jan 2023 14:37:13 +0000 (+0000) Subject: io_uring: use user visible tail in io_uring_poll() X-Git-Tag: v6.1.16~232 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=c981a035dff031925855c0195e66e157d3ea1e76;p=users%2Fdwmw2%2Flinux.git io_uring: use user visible tail in io_uring_poll() 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 Link: https://lore.kernel.org/r/228ffcbf30ba98856f66ffdb9a6a60ead1dd96c0.1674484266.git.asml.silence@gmail.com Signed-off-by: Jens Axboe Signed-off-by: Greg Kroah-Hartman --- diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c index 862e05e6691de..dc5a8c31d7035 100644 --- 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;