mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-13 06:08:07 +00:00
cfq-iosched: fix async oom queue handling
Async cfqq's (cfq_queue's) are shared across cfq_data. When cfq_get_queue() obtains a new queue from cfq_find_alloc_queue(), it stashes the pointer in cfq_data and reuses it from then on; however, the function doesn't consider that cfq_find_alloc_queue() may return the oom_cfqq under memory pressure and installs the returned queue unconditionally. If the oom_cfqq is installed as an async cfqq, cfq_set_request() will continue calling cfq_get_queue() hoping to replace it with a proper queue; however, cfq_get_queue() will keep returning the cached queue for the slot - the oom_cfqq. Fix it by skipping caching if the queue is the oom one. Signed-off-by: Tejun Heo <tj@kernel.org> Acked-by: Jeff Moyer <jmoyer@redhat.com> Cc: Vivek Goyal <vgoyal@redhat.com> Cc: Arianna Avanzini <avanzini.arianna@gmail.com> Signed-off-by: Jens Axboe <axboe@fb.com>
This commit is contained in:
parent
4ebc1c61d6
commit
95e5d6f626
1 changed files with 1 additions and 1 deletions
|
@ -3751,7 +3751,7 @@ cfq_get_queue(struct cfq_data *cfqd, bool is_sync, struct cfq_io_cq *cic,
|
||||||
/*
|
/*
|
||||||
* pin the queue now that it's allocated, scheduler exit will prune it
|
* pin the queue now that it's allocated, scheduler exit will prune it
|
||||||
*/
|
*/
|
||||||
if (!is_sync) {
|
if (!is_sync && cfqq != &cfqd->oom_cfqq) {
|
||||||
cfqq->ref++;
|
cfqq->ref++;
|
||||||
*async_cfqq = cfqq;
|
*async_cfqq = cfqq;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue