Commit 3671163b authored Nov 04, 2022 by Pavel Begunkov Committed by Jens Axboe Nov 21, 2022

io_uring: move kbuf put out of generic tw complete

There are multiple users of io_req_task_complete() including zc
notifications, but only read requests use selected buffers. As we
already have an rw specific tw function, move io_put_kbuf() in there.

Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/94374c7649aaefc3a17808dc4701f25ccd457e25.1667557923.git.asml.silence@gmail.com

Signed-off-by: Jens Axboe <axboe@kernel.dk>

parent e307e669

io_uring/io_uring.c

+0 −6

Original line number	Diff line number	Diff line
		@@ -1476,12 +1476,6 @@ static int io_iopoll_check(struct io_ring_ctx *ctx, long min)

		void io_req_task_complete(struct io_kiocb req, bool locked)
		{
		if (req->flags & (REQ_F_BUFFER_SELECTED\|REQ_F_BUFFER_RING)) {
		unsigned issue_flags = *locked ? 0 : IO_URING_F_UNLOCKED;

		req->cqe.flags \|= io_put_kbuf(req, issue_flags);
		}

		if (*locked)
		io_req_complete_defer(req);
		else

io_uring/rw.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -286,6 +286,12 @@ static inline int io_fixup_rw_res(struct io_kiocb *req, long res)
		static void io_req_rw_complete(struct io_kiocb req, bool locked)
		{
		io_req_io_end(req);

		if (req->flags & (REQ_F_BUFFER_SELECTED\|REQ_F_BUFFER_RING)) {
		unsigned issue_flags = *locked ? 0 : IO_URING_F_UNLOCKED;

		req->cqe.flags \|= io_put_kbuf(req, issue_flags);
		}
		io_req_task_complete(req, locked);
		}