lkml.org 
[lkml]   [2022]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.16 0360/1039] io_uring: remove double poll on poll update
    Date
    From: Pavel Begunkov <asml.silence@gmail.com>

    [ 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 | 1 +
    1 file changed, 1 insertion(+)

    diff --git a/fs/io_uring.c b/fs/io_uring.c
    index fb2a0cb4aaf83..72496f424c155 100644
    --- a/fs/io_uring.c
    +++ b/fs/io_uring.c
    @@ -5928,6 +5928,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;
    --
    2.34.1


    \
     
     \ /
      Last update: 2022-01-24 23:40    [W:2.459 / U:0.044 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site