Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 28f95cbc authored by Jens Axboe's avatar Jens Axboe Committed by Jens Axboe
Browse files

cfq-iosched: remove the implicit queue kicking in slice expire 



We only really need it for a process going away, so move it to
those locations.

Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
parent 3c6bd2f8

block/cfq-iosched.c

+6 −6
Original line number Diff line number Diff line
@@ -693,9 +693,6 @@ __cfq_slice_expired(struct cfq_data *cfqd, struct cfq_queue *cfqq, 
	if (cfq_cfqq_wait_request(cfqq))

		del_timer(&cfqd->idle_slice_timer);



	if (!preempted && !cfq_cfqq_dispatched(cfqq))

		cfq_schedule_dispatch(cfqd);



	cfq_clear_cfqq_must_dispatch(cfqq);

	cfq_clear_cfqq_wait_request(cfqq);

	cfq_clear_cfqq_queue_new(cfqq);
@@ -1102,8 +1099,10 @@ static void cfq_put_queue(struct cfq_queue *cfqq) 
	BUG_ON(cfqq->allocated[READ] + cfqq->allocated[WRITE]);

	BUG_ON(cfq_cfqq_on_rr(cfqq));



	if (unlikely(cfqd->active_queue == cfqq))

	if (unlikely(cfqd->active_queue == cfqq)) {

		__cfq_slice_expired(cfqd, cfqq, 0, 0);

		cfq_schedule_dispatch(cfqd);

	}



	/*

	 * it's on the empty list and still hashed
@@ -1158,8 +1157,10 @@ static void cfq_free_io_context(struct io_context *ioc) 


static void cfq_exit_cfqq(struct cfq_data *cfqd, struct cfq_queue *cfqq)

{

	if (unlikely(cfqq == cfqd->active_queue))

	if (unlikely(cfqq == cfqd->active_queue)) {

		__cfq_slice_expired(cfqd, cfqq, 0, 0);

		cfq_schedule_dispatch(cfqd);

	}



	cfq_put_queue(cfqq);

}
@@ -1565,7 +1566,6 @@ cfq_update_idle_window(struct cfq_data *cfqd, struct cfq_queue *cfqq, 
		cfq_clear_cfqq_idle_window(cfqq);

}





/*

 * Check if new_cfqq should preempt the currently active queue. Return 0 for

 * no or if we aren't sure, a 1 will cause a preempt.