block, bfq: save also weight-raised service on queue merging

To prevent weight-raising information from being lost on bfq_queue merging,
also the amount of service that a bfq_queue receives must be saved and
restored when the bfq_queue is merged and split, respectively.

Tested-by: Jan Kara <jack@suse.cz>
Signed-off-by: Paolo Valente <paolo.valente@linaro.org>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c
index 170aa0ccc1214ef5bef714fc050c1062fc29bdab..5d48cba07cb5088c2a147303c239d3c4de83b60c 100644 (file)
--- a/block/bfq-iosched.c
+++ b/block/bfq-iosched.c
@@ -1029,6 +1029,7 @@ bfq_bfqq_resume_state(struct bfq_queue *bfqq, struct bfq_data *bfqd,
        bfqq->io_start_time = bic->saved_io_start_time;
        bfqq->tot_idle_time = bic->saved_tot_idle_time;
        bfqq->wr_coeff = bic->saved_wr_coeff;
+       bfqq->service_from_wr = bic->saved_service_from_wr;
        bfqq->wr_start_at_switch_to_srt = bic->saved_wr_start_at_switch_to_srt;
        bfqq->last_wr_start_finish = bic->saved_last_wr_start_finish;
        bfqq->wr_cur_max_time = bic->saved_wr_cur_max_time;
@@ -2775,6 +2776,7 @@ static void bfq_bfqq_save_state(struct bfq_queue *bfqq)
                bic->saved_wr_coeff = bfqq->wr_coeff;
                bic->saved_wr_start_at_switch_to_srt =
                        bfqq->wr_start_at_switch_to_srt;
+               bic->saved_service_from_wr = bfqq->service_from_wr;
                bic->saved_last_wr_start_finish = bfqq->last_wr_start_finish;
                bic->saved_wr_cur_max_time = bfqq->wr_cur_max_time;
        }

diff --git a/block/bfq-iosched.h b/block/bfq-iosched.h
index c913b06016b3bb858496859775482337d17b6c81..d15299d59f89dc86c6e0937db2eff899d5c24528 100644 (file)
--- a/block/bfq-iosched.h
+++ b/block/bfq-iosched.h
@@ -440,6 +440,7 @@ struct bfq_io_cq {
         */
        unsigned long saved_wr_coeff;
        unsigned long saved_last_wr_start_finish;
+       unsigned long saved_service_from_wr;
        unsigned long saved_wr_start_at_switch_to_srt;
        unsigned int saved_wr_cur_max_time;
        struct bfq_ttime saved_ttime;