block, bfq: only do counting of pending-request for BFQ_GROUP_IOSCHED

The 'bfqd->num_groups_with_pending_reqs' is used when
CONFIG_BFQ_GROUP_IOSCHED is enabled, so let the variables and processes
take effect when CONFIG_BFQ_GROUP_IOSCHED is enabled.

Cc: Yu Kuai <yukuai3@huawei.com>
Signed-off-by: Yuwei Guan <Yuwei.Guan@zeekrlife.com>
Reviewed-by: Jan Kara <jack@suse.cz>
Reviewed-by: Yu Kuai <yukuai3@huawei.com>
Link: https://lore.kernel.org/r/20221110112622.389332-1-Yuwei.Guan@zeekrlife.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c
index dc576b90ddfe78f82546f86b63ed6660ecec431a..16f43bbc575a0aa167bfc2268057dda90cb85e51 100644 (file)
--- a/block/bfq-iosched.c
+++ b/block/bfq-iosched.c
@@ -7063,7 +7063,9 @@ static int bfq_init_queue(struct request_queue *q, struct elevator_type *e)
        bfqd->idle_slice_timer.function = bfq_idle_slice_timer;
 
        bfqd->queue_weights_tree = RB_ROOT_CACHED;
+#ifdef CONFIG_BFQ_GROUP_IOSCHED
        bfqd->num_groups_with_pending_reqs = 0;
+#endif
 
        INIT_LIST_HEAD(&bfqd->active_list);
        INIT_LIST_HEAD(&bfqd->idle_list);

diff --git a/block/bfq-iosched.h b/block/bfq-iosched.h
index 9fa89577322d4a7a1cc5de4616d6843f0b7066f4..41aa151ccc223457621abb30e24ec8a02701346b 100644 (file)
--- a/block/bfq-iosched.h
+++ b/block/bfq-iosched.h
@@ -197,8 +197,10 @@ struct bfq_entity {
        /* flag, set to request a weight, ioprio or ioprio_class change  */
        int prio_changed;
 
+#ifdef CONFIG_BFQ_GROUP_IOSCHED
        /* flag, set if the entity is counted in groups_with_pending_reqs */
        bool in_groups_with_pending_reqs;
+#endif
 
        /* last child queue of entity created (for non-leaf entities) */
        struct bfq_queue *last_bfqq_created;
@@ -491,6 +493,7 @@ struct bfq_data {
         */
        struct rb_root_cached queue_weights_tree;
 
+#ifdef CONFIG_BFQ_GROUP_IOSCHED
        /*
         * Number of groups with at least one process that
         * has at least one request waiting for completion. Note that
@@ -538,6 +541,7 @@ struct bfq_data {
         * with no request waiting for completion.
         */
        unsigned int num_groups_with_pending_reqs;
+#endif
 
        /*
         * Per-class (RT, BE, IDLE) number of bfq_queues containing

diff --git a/block/bfq-wf2q.c b/block/bfq-wf2q.c
index b02b53658ed467836cd6c788ebbc62ab27015d62..ea4c3d757fdd1755adfd850b06e1d44ac37b8a09 100644 (file)
--- a/block/bfq-wf2q.c
+++ b/block/bfq-wf2q.c
@@ -1612,28 +1612,28 @@ void bfq_requeue_bfqq(struct bfq_data *bfqd, struct bfq_queue *bfqq,
 
 void bfq_add_bfqq_in_groups_with_pending_reqs(struct bfq_queue *bfqq)
 {
+#ifdef CONFIG_BFQ_GROUP_IOSCHED
        struct bfq_entity *entity = &bfqq->entity;
 
        if (!entity->in_groups_with_pending_reqs) {
                entity->in_groups_with_pending_reqs = true;
-#ifdef CONFIG_BFQ_GROUP_IOSCHED
                if (!(bfqq_group(bfqq)->num_queues_with_pending_reqs++))
                        bfqq->bfqd->num_groups_with_pending_reqs++;
-#endif
        }
+#endif
 }
 
 void bfq_del_bfqq_in_groups_with_pending_reqs(struct bfq_queue *bfqq)
 {
+#ifdef CONFIG_BFQ_GROUP_IOSCHED
        struct bfq_entity *entity = &bfqq->entity;
 
        if (entity->in_groups_with_pending_reqs) {
                entity->in_groups_with_pending_reqs = false;
-#ifdef CONFIG_BFQ_GROUP_IOSCHED
                if (!(--bfqq_group(bfqq)->num_queues_with_pending_reqs))
                        bfqq->bfqd->num_groups_with_pending_reqs--;
-#endif
        }
+#endif
 }
 
 /*