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

io-wq: close cancel gap for hashed linked work 



After io_assign_current_work() of a linked work, it can be decided to
offloaded to another thread so doing io_wqe_enqueue(). However, until
next io_assign_current_work() it can be cancelled, that isn't handled.

Don't assign it, if it's not going to be executed.

Fixes: 60cf46ae ("io-wq: hash dependent work")
Signed-off-by: default avatarPavel Begunkov <asml.silence@gmail.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 9f5834c8

fs/io-wq.c

+7 −3
Original line number Diff line number Diff line
@@ -485,7 +485,7 @@ static void io_worker_handle_work(struct io_worker *worker) 
	struct io_wq *wq = wqe->wq;



	do {

		struct io_wq_work *work;

		struct io_wq_work *work, *assign_work;

		unsigned int hash;

get_next:

		/*
@@ -522,10 +522,14 @@ static void io_worker_handle_work(struct io_worker *worker) 
			hash = io_get_work_hash(work);

			work->func(&work);

			work = (old_work == work) ? NULL : work;

			io_assign_current_work(worker, work);



			assign_work = work;

			if (work && io_wq_is_hashed(work))

				assign_work = NULL;

			io_assign_current_work(worker, assign_work);

			wq->free_work(old_work);



			if (work && io_wq_is_hashed(work)) {

			if (work && !assign_work) {

				io_wqe_enqueue(wqe, work);

				work = NULL;

			}