diff options
| author | Pavel Begunkov <asml.silence@gmail.com> | 2020-03-22 19:14:26 +0300 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2020-03-22 20:33:58 +0300 |
| commit | f2cf11492b8b30d89b2fbf525c9ea5e8c4ccc842 (patch) | |
| tree | cc06c48c1ef5efaacc512ea8465b63afa9858516 | |
| parent | 9f5834c868e901b00f1bfe4d0052b5906b4a2b7f (diff) | |
| download | linux-f2cf11492b8b30d89b2fbf525c9ea5e8c4ccc842.tar.xz | |
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: 60cf46ae6054 ("io-wq: hash dependent work")
Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
| -rw-r--r-- | fs/io-wq.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/fs/io-wq.c b/fs/io-wq.c index 9541df2729de..b3fb61ec0870 100644 --- a/fs/io-wq.c +++ b/fs/io-wq.c @@ -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; } |