Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-09-21 23:43:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

io-wq: close cancel gap for hashed linked work

Browse Source 
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: 60cf46ae60 ("io-wq: hash dependent work")
Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Pavel Begunkov 2020-03-22 19:14:26 +03:00 committed by Jens Axboe
parent 9f5834c868
commit f2cf11492b
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fs/io-wq.c
View File

@ -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 @@ get_next:
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;
}