mirror of
https://github.com/torvalds/linux.git
synced 2024-11-21 19:41:42 +00:00
io_uring: ensure overflow entries are dropped when ring is exiting
A previous consolidation cleanup missed handling the case where the ring is dying, and __io_cqring_overflow_flush() doesn't flush entries if the CQ ring is already full. This is fine for the normal CQE overflow flushing, but if the ring is going away, we need to flush everything, even if it means simply freeing the overflown entries. Fixes: 6c948ec44b29 ("io_uring: consolidate overflow flushing") Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
parent
4d0f4a5413
commit
686b56cbee
@ -674,7 +674,8 @@ static void __io_cqring_overflow_flush(struct io_ring_ctx *ctx, bool dying)
|
||||
|
||||
lockdep_assert_held(&ctx->uring_lock);
|
||||
|
||||
if (__io_cqring_events(ctx) == ctx->cq_entries)
|
||||
/* don't abort if we're dying, entries must get freed */
|
||||
if (!dying && __io_cqring_events(ctx) == ctx->cq_entries)
|
||||
return;
|
||||
|
||||
if (ctx->flags & IORING_SETUP_CQE32)
|
||||
|
Loading…
Reference in New Issue
Block a user