Commit 95e5d6f6 authored Aug 18, 2015 by Tejun Heo Committed by Jens Axboe Aug 18, 2015

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>

parent 4ebc1c61

block/cfq-iosched.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -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;
	}		}