diff options
| author | Jens Axboe <axboe@kernel.dk> | 2024-03-15 15:37:15 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2024-03-15 15:37:15 -0600 |
| commit | 30dab608c3cb99c2a05b76289fd05551703979ae (patch) | |
| tree | 5131364d2c6c083861bc1f081e8ba709dec8bdc2 /io_uring | |
| parent | 5e3afe580a9f5ca173a6bd55ffe10948796ef7e5 (diff) | |
| download | linux-30dab608c3cb99c2a05b76289fd05551703979ae.tar.gz | |
io_uring/futex: always remove futex entry for cancel all
We know the request is either being removed, or already in the process of
being removed through task_work, so we can delete it from our futex list
upfront. This is important for remove all conditions, as we otherwise
will find it multiple times and prevent cancelation progress.
Cc: stable@vger.kernel.org
Fixes: 194bb58c6090 ("io_uring: add support for futex wake and wait")
Fixes: 8f350194d5cf ("io_uring: add support for vectored futex waits")
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'io_uring')
| -rw-r--r-- | io_uring/futex.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/io_uring/futex.c b/io_uring/futex.c index 3c3575303c3d00..792a03df58deac 100644 --- a/io_uring/futex.c +++ b/io_uring/futex.c @@ -159,6 +159,7 @@ bool io_futex_remove_all(struct io_ring_ctx *ctx, struct task_struct *task, hlist_for_each_entry_safe(req, tmp, &ctx->futex_list, hash_node) { if (!io_match_task_safe(req, task, cancel_all)) continue; + hlist_del_init(&req->hash_node); __io_futex_cancel(ctx, req); found = true; } |