OSDN Git Service

io_uring: fix drain with rsrc CQEs
authorPavel Begunkov <asml.silence@gmail.com>
Tue, 27 Apr 2021 15:13:51 +0000 (16:13 +0100)
committerJens Axboe <axboe@kernel.dk>
Thu, 29 Apr 2021 19:26:18 +0000 (13:26 -0600)
Resource emitted CQEs are not bound to requests, so fix up counters used
for DRAIN/defer logic.

Fixes: b60c8dce33895 ("io_uring: preparation for rsrc tagging")
Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/2b32f5f0a40d5928c3466d028f936e167f0654be.1619536280.git.asml.silence@gmail.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
fs/io_uring.c

index 360f813..b0706f0 100644 (file)
@@ -7539,6 +7539,7 @@ static void __io_rsrc_put_work(struct io_rsrc_node *ref_node)
                        io_ring_submit_lock(ctx, lock_ring);
                        spin_lock_irqsave(&ctx->completion_lock, flags);
                        io_cqring_fill_event(ctx, prsrc->tag, 0, 0);
+                       ctx->cq_extra++;
                        io_commit_cqring(ctx);
                        spin_unlock_irqrestore(&ctx->completion_lock, flags);
                        io_cqring_ev_posted(ctx);