Commit 9fb8cb49 authored by Pavel Begunkov's avatar Pavel Begunkov Committed by Jens Axboe
Browse files

io_uring: refactor provide/remove buffer locking 



Always complete request holding the mutex instead of doing that strange
dancing with conditional ordering.

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

fs/io_uring.c

+6 −17
Original line number Diff line number Diff line
@@ -3966,14 +3966,9 @@ static int io_remove_buffers(struct io_kiocb *req, unsigned int issue_flags) 
	if (ret < 0)

		req_set_fail_links(req);



	/* need to hold the lock to complete IOPOLL requests */

	if (ctx->flags & IORING_SETUP_IOPOLL) {

	/* complete before unlock, IOPOLL may need the lock */

	__io_req_complete(req, issue_flags, ret, 0);

	io_ring_submit_unlock(ctx, !force_nonblock);

	} else {

		io_ring_submit_unlock(ctx, !force_nonblock);

		__io_req_complete(req, issue_flags, ret, 0);

	}

	return 0;

}
@@ -4055,15 +4050,9 @@ static int io_provide_buffers(struct io_kiocb *req, unsigned int issue_flags) 
	}

	if (ret < 0)

		req_set_fail_links(req);



	/* need to hold the lock to complete IOPOLL requests */

	if (ctx->flags & IORING_SETUP_IOPOLL) {

	/* complete before unlock, IOPOLL may need the lock */

	__io_req_complete(req, issue_flags, ret, 0);

	io_ring_submit_unlock(ctx, !force_nonblock);

	} else {

		io_ring_submit_unlock(ctx, !force_nonblock);

		__io_req_complete(req, issue_flags, ret, 0);

	}

	return 0;

}