Commit bfe30bfd authored by Jens Axboe's avatar Jens Axboe
Browse files

io_uring: mark the need to lock/unlock the ring as unlikely 



Any of the fast paths will already have this locked, this helper only
exists to deal with io-wq invoking request issue where we do not have
the ctx->uring_lock held already. This means that any common or fast
path will already have this locked, mark it as such.

Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 95041b93

io_uring/io_uring.h

+2 −2
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ static inline void io_ring_submit_unlock(struct io_ring_ctx *ctx, 
					 unsigned issue_flags)

{

	lockdep_assert_held(&ctx->uring_lock);

	if (issue_flags & IO_URING_F_UNLOCKED)

	if (unlikely(issue_flags & IO_URING_F_UNLOCKED))

		mutex_unlock(&ctx->uring_lock);

}
@@ -221,7 +221,7 @@ static inline void io_ring_submit_lock(struct io_ring_ctx *ctx, 
	 * The only exception is when we've detached the request and issue it

	 * from an async worker thread, grab the lock for that case.

	 */

	if (issue_flags & IO_URING_F_UNLOCKED)

	if (unlikely(issue_flags & IO_URING_F_UNLOCKED))

		mutex_lock(&ctx->uring_lock);

	lockdep_assert_held(&ctx->uring_lock);

}