projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8d3d1c3
)
io_uring: remove double poll on poll update
author
Pavel Begunkov
<asml.silence@gmail.com>
Wed, 15 Dec 2021 22:08:44 +0000
(22:08 +0000)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Thu, 27 Jan 2022 10:03:48 +0000
(11:03 +0100)
[ Upstream commit
e840b4baf3cfb37e2ead4f649a45bb78178677ff
]
Before updating a poll request we should remove it from poll queues,
including the double poll entry.
Fixes:
b69de288e913
("io_uring: allow events and user_data update of running poll requests")
Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Link:
https://lore.kernel.org/r/ac39e7f80152613603b8a6cc29a2b6063ac2434f.1639605189.git.asml.silence@gmail.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Sasha Levin <sashal@kernel.org>
fs/io_uring.c
patch
|
blob
|
history
diff --git
a/fs/io_uring.c
b/fs/io_uring.c
index
0006fc7
..
ecffedd
100644
(file)
--- a/
fs/io_uring.c
+++ b/
fs/io_uring.c
@@
-5925,6
+5925,7
@@
static int io_poll_update(struct io_kiocb *req, unsigned int issue_flags)
* update those. For multishot, if we're racing with completion, just
* let completion re-add it.
*/
+ io_poll_remove_double(preq);
completing = !__io_poll_remove_one(preq, &preq->poll, false);
if (completing && (preq->poll.events & EPOLLONESHOT)) {
ret = -EALREADY;