block, bfq: support to track if bfqq has pending requests

If entity belongs to bfqq, then entity->in_groups_with_pending_reqs
is not used currently. This patch use it to track if bfqq has pending
requests through callers of weights_tree insertion and removal.

Signed-off-by: Yu Kuai <yukuai3@huawei.com>
Reviewed-by: Jan Kara <jack@suse.cz>
Acked-by: Paolo Valente <paolo.valente@linaro.org>
Link: https://lore.kernel.org/r/20220916071942.214222-2-yukuai1@huaweicloud.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c
index ccfadc6..71fadc7 100644 (file)
--- a/block/bfq-iosched.c
+++ b/block/bfq-iosched.c
@@ -6261,6 +6261,7 @@ static void bfq_completed_request(struct bfq_queue *bfqq, struct bfq_data *bfqd)
                 */
                bfqq->budget_timeout = jiffies;
 
+               bfq_del_bfqq_in_groups_with_pending_reqs(bfqq);
                bfq_weights_tree_remove(bfqd, bfqq);
        }
 

diff --git a/block/bfq-iosched.h b/block/bfq-iosched.h
index 71f7216..42c910f 100644 (file)
--- a/block/bfq-iosched.h
+++ b/block/bfq-iosched.h
@@ -1078,6 +1078,8 @@ void bfq_requeue_bfqq(struct bfq_data *bfqd, struct bfq_queue *bfqq,
                      bool expiration);
 void bfq_del_bfqq_busy(struct bfq_queue *bfqq, bool expiration);
 void bfq_add_bfqq_busy(struct bfq_queue *bfqq);
+void bfq_add_bfqq_in_groups_with_pending_reqs(struct bfq_queue *bfqq);
+void bfq_del_bfqq_in_groups_with_pending_reqs(struct bfq_queue *bfqq);
 
 /* --------------- end of interface of B-WF2Q+ ---------------- */
 

diff --git a/block/bfq-wf2q.c b/block/bfq-wf2q.c
index 8fc3da4..bd8f4ed 100644 (file)
--- a/block/bfq-wf2q.c
+++ b/block/bfq-wf2q.c
@@ -1646,6 +1646,22 @@ void bfq_requeue_bfqq(struct bfq_data *bfqd, struct bfq_queue *bfqq,
                                    bfqq == bfqd->in_service_queue, expiration);
 }
 
+void bfq_add_bfqq_in_groups_with_pending_reqs(struct bfq_queue *bfqq)
+{
+       struct bfq_entity *entity = &bfqq->entity;
+
+       if (!entity->in_groups_with_pending_reqs)
+               entity->in_groups_with_pending_reqs = true;
+}
+
+void bfq_del_bfqq_in_groups_with_pending_reqs(struct bfq_queue *bfqq)
+{
+       struct bfq_entity *entity = &bfqq->entity;
+
+       if (entity->in_groups_with_pending_reqs)
+               entity->in_groups_with_pending_reqs = false;
+}
+
 /*
  * Called when the bfqq no longer has requests pending, remove it from
  * the service tree. As a special case, it can be invoked during an
@@ -1668,8 +1684,10 @@ void bfq_del_bfqq_busy(struct bfq_queue *bfqq, bool expiration)
 
        bfq_deactivate_bfqq(bfqd, bfqq, true, expiration);
 
-       if (!bfqq->dispatched)
+       if (!bfqq->dispatched) {
+               bfq_del_bfqq_in_groups_with_pending_reqs(bfqq);
                bfq_weights_tree_remove(bfqd, bfqq);
+       }
 }
 
 /*
@@ -1686,10 +1704,12 @@ void bfq_add_bfqq_busy(struct bfq_queue *bfqq)
        bfq_mark_bfqq_busy(bfqq);
        bfqd->busy_queues[bfqq->ioprio_class - 1]++;
 
-       if (!bfqq->dispatched)
+       if (!bfqq->dispatched) {
+               bfq_add_bfqq_in_groups_with_pending_reqs(bfqq);
                if (bfqq->wr_coeff == 1)
                        bfq_weights_tree_add(bfqd, bfqq,
                                             &bfqd->queue_weights_tree);
+       }
 
        if (bfqq->wr_coeff > 1)
                bfqd->wr_busy_queues++;