Commit e795421e authored by Jan Kara's avatar Jan Kara Committed by Jens Axboe
Browse files

cfq-iosched: Don't group_idle if cfqq has big thinktime 



There is no point in idling on a cfq group if the only cfq queue that is
there has too big thinktime.

Signed-off-by: default avatarJan Kara <jack@suse.com>
Acked-by: default avatarTejun Heo <tj@kernel.org>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 36f90b0a

block/cfq-iosched.c

+8 −2
Original line number Original line Diff line number Diff line
@@ -2897,6 +2897,7 @@ static bool cfq_should_idle(struct cfq_data *cfqd, struct cfq_queue *cfqq) 
static void cfq_arm_slice_timer(struct cfq_data *cfqd)

static void cfq_arm_slice_timer(struct cfq_data *cfqd)

{

{

	struct cfq_queue *cfqq = cfqd->active_queue;

	struct cfq_queue *cfqq = cfqd->active_queue;

	struct cfq_rb_root *st = cfqq->service_tree;

	struct cfq_io_cq *cic;

	struct cfq_io_cq *cic;

	unsigned long sl, group_idle = 0;

	unsigned long sl, group_idle = 0;
@@ -2947,8 +2948,13 @@ static void cfq_arm_slice_timer(struct cfq_data *cfqd) 
		return;

		return;

	}

	}





	/* There are other queues in the group, don't do group idle */

	/*

	if (group_idle && cfqq->cfqg->nr_cfqq > 1)

	 * There are other queues in the group or this is the only group and

	 * it has too big thinktime, don't do group idle.

	 */

	if (group_idle &&

	    (cfqq->cfqg->nr_cfqq > 1 ||

	     cfq_io_thinktime_big(cfqd, &st->ttime, true)))

		return;

		return;





	cfq_mark_cfqq_wait_request(cfqq);

	cfq_mark_cfqq_wait_request(cfqq);