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

Commit 8a511ba5 authored by Paolo Valente's avatar Paolo Valente Committed by Jens Axboe
Browse files

block, bfq: readd missing reset of parent-entity service 



The received-service counter needs to be equal to 0 when an entity is
set in service. Unfortunately, commit "block, bfq: fix service being
wrongly set to zero in case of preemption" mistakenly removed the
resetting of this counter for the parent entities of the bfq_queue
being set in service. This commit fixes this issue by resetting
service for parent entities, directly on the expiration of the
in-service bfq_queue.

Fixes: 9fae8dd5 ("block, bfq: fix service being wrongly set to zero in case of preemption")
Signed-off-by: default avatarPaolo Valente <paolo.valente@linaro.org>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent df60f6e8

block/bfq-iosched.c

+21 −0
Original line number Original line Diff line number Diff line
@@ -3298,6 +3298,27 @@ void bfq_bfqq_expire(struct bfq_data *bfqd, 
		 */

		 */

	} else

	} else

		entity->service = 0;

		entity->service = 0;



	/*

	 * Reset the received-service counter for every parent entity.

	 * Differently from what happens with bfqq->entity.service,

	 * the resetting of this counter never needs to be postponed

	 * for parent entities. In fact, in case bfqq may have a

	 * chance to go on being served using the last, partially

	 * consumed budget, bfqq->entity.service needs to be kept,

	 * because if bfqq then actually goes on being served using

	 * the same budget, the last value of bfqq->entity.service is

	 * needed to properly decrement bfqq->entity.budget by the

	 * portion already consumed. In contrast, it is not necessary

	 * to keep entity->service for parent entities too, because

	 * the bubble up of the new value of bfqq->entity.budget will

	 * make sure that the budgets of parent entities are correct,

	 * even in case bfqq and thus parent entities go on receiving

	 * service with the same budget.

	 */

	entity = entity->parent;

	for_each_entity(entity)

		entity->service = 0;

}

}





/*

/*