Commit 5c766a90 authored by Pavel Begunkov's avatar Pavel Begunkov Committed by Jens Axboe
Browse files

io_uring: cleanup personalities under uring_lock 



personality_idr is usually synchronised by uring_lock, the exception
would be removing personalities in io_ring_ctx_wait_and_kill(), which
is legit as refs are killed by that point but still would be more
resilient to do it under the lock.

Signed-off-by: default avatarPavel Begunkov <asml.silence@gmail.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent dc2a6e9a

fs/io_uring.c

+1 −1
Original line number Diff line number Diff line
@@ -8867,6 +8867,7 @@ static void io_ring_ctx_wait_and_kill(struct io_ring_ctx *ctx) 
	ctx->cq_overflow_flushed = 1;

	if (ctx->rings)

		__io_cqring_overflow_flush(ctx, true, NULL, NULL);

	idr_for_each(&ctx->personality_idr, io_remove_personalities, ctx);

	mutex_unlock(&ctx->uring_lock);



	io_kill_timeouts(ctx, NULL, NULL);
@@ -8877,7 +8878,6 @@ static void io_ring_ctx_wait_and_kill(struct io_ring_ctx *ctx) 


	/* if we failed setting up the ctx, we might not have any rings */

	io_iopoll_try_reap_events(ctx);

	idr_for_each(&ctx->personality_idr, io_remove_personalities, ctx);



	/*

	 * Do this upfront, so we won't have a grace period where the ring