NothingOSS/android_kernel_msm-6.1_nothing_sm7635
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

io_uring/poll: serialize poll linked timer start with poll removal

Browse source 
Commit ef7dfac51d8ed961b742218f526bd589f3900a59 upstream.

We selectively grab the ctx->uring_lock for poll update/removal, but
we really should grab it from the start to fully synchronize with
linked timeouts. Normally this is indeed the case, but if requests
are forced async by the application, we don't fully cover removal
and timer disarm within the uring_lock.

Make this simpler by having consistent locking state for poll removal.

Cc: stable@vger.kernel.org # 6.1+
Reported-by: Querijn Voet <querijnqyn@gmail.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jens Axboe 2023-06-17 19:50:24 -06:00 • committed by Greg Kroah-Hartman
parent 2d80c85fa4
commit 24f473769e
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
io_uring/poll.c
View file

@ -993,8 +993,9 @@ int io_poll_remove(struct io_kiocb *req, unsigned int issue_flags)
struct io_hash_bucket *bucket; struct io_hash_bucket *bucket;
struct io_kiocb *preq; struct io_kiocb *preq;
int ret2, ret = 0; int ret2, ret = 0;
bool locked; bool locked = true;
io_ring_submit_lock(ctx, issue_flags);
preq = io_poll_find(ctx, true, &cd, &ctx->cancel_table, &bucket); preq = io_poll_find(ctx, true, &cd, &ctx->cancel_table, &bucket);
ret2 = io_poll_disarm(preq); ret2 = io_poll_disarm(preq);
if (bucket) if (bucket)
@ -1006,12 +1007,10 @@ int io_poll_remove(struct io_kiocb *req, unsigned int issue_flags)
goto out; goto out;
} }
io_ring_submit_lock(ctx, issue_flags);
preq = io_poll_find(ctx, true, &cd, &ctx->cancel_table_locked, &bucket); preq = io_poll_find(ctx, true, &cd, &ctx->cancel_table_locked, &bucket);
ret2 = io_poll_disarm(preq); ret2 = io_poll_disarm(preq);
if (bucket) if (bucket)
spin_unlock(&bucket->lock); spin_unlock(&bucket->lock);
io_ring_submit_unlock(ctx, issue_flags);
if (ret2) { if (ret2) {
ret = ret2; ret = ret2;
goto out; goto out;
@ -1035,7 +1034,7 @@ found:
if (poll_update->update_user_data) if (poll_update->update_user_data)
preq->cqe.user_data = poll_update->new_user_data; preq->cqe.user_data = poll_update->new_user_data;
ret2 = io_poll_add(preq, issue_flags); ret2 = io_poll_add(preq, issue_flags & ~IO_URING_F_UNLOCKED);
/* successfully updated, don't complete poll request */ /* successfully updated, don't complete poll request */
if (!ret2 || ret2 == -EIOCBQUEUED) if (!ret2 || ret2 == -EIOCBQUEUED)
goto out; goto out;
@ -1043,9 +1042,9 @@ found:
req_set_fail(preq); req_set_fail(preq);
io_req_set_res(preq, -ECANCELED, 0); io_req_set_res(preq, -ECANCELED, 0);
locked = !(issue_flags & IO_URING_F_UNLOCKED);
io_req_task_complete(preq, &locked); io_req_task_complete(preq, &locked);
out: out:
io_ring_submit_unlock(ctx, issue_flags);
if (ret < 0) { if (ret < 0) {
req_set_fail(req); req_set_fail(req);
return ret; return ret;