Commit 7e94cf46 authored by Pavel Begunkov's avatar Pavel Begunkov Committed by Wen Zhiwei
Browse files

io_uring/rw: avoid punting to io-wq directly 

stable inclusion
from stable-v6.6.68
commit 4cba44122663687a129439baa94aff11328c7624
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IBMDV1

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=4cba44122663687a129439baa94aff11328c7624



--------------------------------

Commit 6e6b8c62120a22acd8cb759304e4cd2e3215d488 upstream.

kiocb_done() should care to specifically redirecting requests to io-wq.
Remove the hopping to tw to then queue an io-wq, return -EAGAIN and let
the core code io_uring handle offloading.

Signed-off-by: default avatarPavel Begunkov <asml.silence@gmail.com>
Tested-by: default avatarMing Lei <ming.lei@redhat.com>
Link: https://lore.kernel.org/r/413564e550fe23744a970e1783dfa566291b0e6f.1710799188.git.asml.silence@gmail.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
(cherry picked from commit 6e6b8c62120a22acd8cb759304e4cd2e3215d488)
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarWen Zhiwei <wenzhiwei@kylinos.cn>
parent 3a712808

io_uring/io_uring.c

+4 −4
Original line number Diff line number Diff line
@@ -492,7 +492,7 @@ static void io_prep_async_link(struct io_kiocb *req) 
	}

}



void io_queue_iowq(struct io_kiocb *req, struct io_tw_state *ts_dont_use)

static void io_queue_iowq(struct io_kiocb *req)

{

	struct io_kiocb *link = io_prep_linked_timeout(req);

	struct io_uring_task *tctx = req->task->io_uring;
@@ -1479,7 +1479,7 @@ void io_req_task_submit(struct io_kiocb *req, struct io_tw_state *ts) 
	if (unlikely(req->task->flags & PF_EXITING))

		io_req_defer_failed(req, -EFAULT);

	else if (req->flags & REQ_F_FORCE_ASYNC)

		io_queue_iowq(req, ts);

		io_queue_iowq(req);

	else

		io_queue_sqe(req);

}
@@ -2044,7 +2044,7 @@ static void io_queue_async(struct io_kiocb *req, int ret) 
		break;

	case IO_APOLL_ABORTED:

		io_kbuf_recycle(req, 0);

		io_queue_iowq(req, NULL);

		io_queue_iowq(req);

		break;

	case IO_APOLL_OK:

		break;
@@ -2093,7 +2093,7 @@ static void io_queue_sqe_fallback(struct io_kiocb *req) 
		if (unlikely(req->ctx->drain_active))

			io_drain_req(req);

		else

			io_queue_iowq(req, NULL);

			io_queue_iowq(req);

	}

}

io_uring/io_uring.h

+0 −1
Original line number Diff line number Diff line
@@ -63,7 +63,6 @@ struct file *io_file_get_fixed(struct io_kiocb *req, int fd, 
void __io_req_task_work_add(struct io_kiocb *req, unsigned flags);

bool io_alloc_async_data(struct io_kiocb *req);

void io_req_task_queue(struct io_kiocb *req);

void io_queue_iowq(struct io_kiocb *req, struct io_tw_state *ts_dont_use);

void io_req_task_complete(struct io_kiocb *req, struct io_tw_state *ts);

void io_req_task_queue_fail(struct io_kiocb *req, int ret);

void io_req_task_submit(struct io_kiocb *req, struct io_tw_state *ts);

io_uring/rw.c

+1 −7
Original line number Diff line number Diff line
@@ -168,12 +168,6 @@ static inline loff_t *io_kiocb_update_pos(struct io_kiocb *req) 
	return NULL;

}



static void io_req_task_queue_reissue(struct io_kiocb *req)

{

	req->io_task_work.func = io_queue_iowq;

	io_req_task_work_add(req);

}



#ifdef CONFIG_BLOCK

static bool io_resubmit_prep(struct io_kiocb *req)

{
@@ -359,7 +353,7 @@ static int kiocb_done(struct io_kiocb *req, ssize_t ret, 
	if (req->flags & REQ_F_REISSUE) {

		req->flags &= ~REQ_F_REISSUE;

		if (io_resubmit_prep(req))

			io_req_task_queue_reissue(req);

			return -EAGAIN;

		else

			io_req_task_queue_fail(req, final_ret);

	}