iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

io_uring: clean up io_kill_linked_timeout() locking

Browse Source 
Avoid jumping through hoops to silence unused variable warnings, and
also fix sparse rightfully complaining about the locking context:

fs/io_uring.c:1593:39: warning: context imbalance in 'io_kill_linked_timeout' - unexpected unlock

Provide the functional helper as __io_kill_linked_timeout(), and have
separate the locking from it.

Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Jens Axboe 2020-06-30 08:43:15 -06:00
parent cbdcb4357c
commit ab0b6451db
1 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
fs/io_uring.c
View File

@ -1569,28 +1569,38 @@ static bool io_link_cancel_timeout(struct io_kiocb *req)
return false; return false;
} }
static void io_kill_linked_timeout(struct io_kiocb *req) static bool __io_kill_linked_timeout(struct io_kiocb *req)
{ {
struct io_ring_ctx *ctx = req->ctx;
struct io_kiocb *link; struct io_kiocb *link;
bool wake_ev = false; bool wake_ev;
unsigned long flags = 0; /* false positive warning */
if (!(req->flags & REQ_F_COMP_LOCKED))
spin_lock_irqsave(&ctx->completion_lock, flags);
if (list_empty(&req->link_list)) if (list_empty(&req->link_list))
goto out; return false;
link = list_first_entry(&req->link_list, struct io_kiocb, link_list); link = list_first_entry(&req->link_list, struct io_kiocb, link_list);
if (link->opcode != IORING_OP_LINK_TIMEOUT) if (link->opcode != IORING_OP_LINK_TIMEOUT)
goto out; return false;
list_del_init(&link->link_list); list_del_init(&link->link_list);
wake_ev = io_link_cancel_timeout(link); wake_ev = io_link_cancel_timeout(link);
req->flags &= ~REQ_F_LINK_TIMEOUT; req->flags &= ~REQ_F_LINK_TIMEOUT;
out: return wake_ev;
if (!(req->flags & REQ_F_COMP_LOCKED)) }
static void io_kill_linked_timeout(struct io_kiocb *req)
{
struct io_ring_ctx *ctx = req->ctx;
bool wake_ev;
if (!(req->flags & REQ_F_COMP_LOCKED)) {
unsigned long flags;
spin_lock_irqsave(&ctx->completion_lock, flags);
wake_ev = __io_kill_linked_timeout(req);
spin_unlock_irqrestore(&ctx->completion_lock, flags); spin_unlock_irqrestore(&ctx->completion_lock, flags);
} else {
wake_ev = __io_kill_linked_timeout(req);
}
if (wake_ev) if (wake_ev)
io_cqring_ev_posted(ctx); io_cqring_ev_posted(ctx);
} }