Skip to content

Commit

Permalink
cfq-iosched: fix async oom queue handling
Browse files Browse the repository at this point in the history
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>
Signed-off-by: Pranav Vashi <neobuddy89@gmail.com>
  • Loading branch information
htejun authored and khusika committed Jun 15, 2018
1 parent cd51318 commit b46954c
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion block/cfq-iosched.c
Expand Up @@ -3690,7 +3690,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
*/
if (!is_sync) {
if (!is_sync && cfqq != &cfqd->oom_cfqq) {
cfqq->ref++;
*async_cfqq = cfqq;
}
Expand Down

0 comments on commit b46954c

Please sign in to comment.