public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-18 22:14:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

io_uring/futex: convert to io_cancel_remove_all()

Browse source 
Use the generic helper for cancelations.

Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Jens Axboe 2025-02-05 12:51:26 -07:00
parent 1533376b13
commit e855b91384
1 changed files with 3 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
io_uring/futex.c
View file

@ -90,7 +90,7 @@ static bool io_futexv_claim(struct io_futex *iof)
return true; return true;
} }
static bool __io_futex_cancel(struct io_ring_ctx *ctx, struct io_kiocb *req) static bool __io_futex_cancel(struct io_kiocb *req)
{ {
/* futex wake already done or in progress */ /* futex wake already done or in progress */
if (req->opcode == IORING_OP_FUTEX_WAIT) { if (req->opcode == IORING_OP_FUTEX_WAIT) {
@ -128,7 +128,7 @@ int io_futex_cancel(struct io_ring_ctx *ctx, struct io_cancel_data *cd,
if (req->cqe.user_data != cd->data && if (req->cqe.user_data != cd->data &&
!(cd->flags & IORING_ASYNC_CANCEL_ANY)) !(cd->flags & IORING_ASYNC_CANCEL_ANY))
continue; continue;
if (__io_futex_cancel(ctx, req)) if (__io_futex_cancel(req))
nr++; nr++;
if (!(cd->flags & IORING_ASYNC_CANCEL_ALL)) if (!(cd->flags & IORING_ASYNC_CANCEL_ALL))
break; break;
@ -144,21 +144,7 @@ int io_futex_cancel(struct io_ring_ctx *ctx, struct io_cancel_data *cd,
bool io_futex_remove_all(struct io_ring_ctx *ctx, struct io_uring_task *tctx, bool io_futex_remove_all(struct io_ring_ctx *ctx, struct io_uring_task *tctx,
bool cancel_all) bool cancel_all)
{ {
struct hlist_node *tmp; return io_cancel_remove_all(ctx, tctx, &ctx->futex_list, cancel_all, __io_futex_cancel);
struct io_kiocb *req;
bool found = false;
lockdep_assert_held(&ctx->uring_lock);
hlist_for_each_entry_safe(req, tmp, &ctx->futex_list, hash_node) {
if (!io_match_task_safe(req, tctx, cancel_all))
continue;
hlist_del_init(&req->hash_node);
__io_futex_cancel(ctx, req);
found = true;
}
return found;
} }
int io_futex_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) int io_futex_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)