Prepare to decrease 'num_groups_with_pending_reqs' earlier.
Signed-off-by: Yu Kuai <yukuai3@xxxxxxxxxx>
---
block/bfq-cgroup.c | 1 +
block/bfq-iosched.c | 21 +++++++++++++++++++++
block/bfq-iosched.h | 1 +
3 files changed, 23 insertions(+)
diff --git a/block/bfq-cgroup.c b/block/bfq-cgroup.c
index 9c36deda4ed4..d6f7e96ec852 100644
--- a/block/bfq-cgroup.c
+++ b/block/bfq-cgroup.c
@@ -557,6 +557,7 @@ static void bfq_pd_init(struct blkg_policy_data *pd)
*/
bfqg->bfqd = bfqd;
bfqg->active_entities = 0;
+ bfqg->num_entities_with_pending_reqs = 0;
bfqg->rq_pos_tree = RB_ROOT;
}
diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c
index 63e4e13db92f..e3c31db4bffb 100644
--- a/block/bfq-iosched.c
+++ b/block/bfq-iosched.c
@@ -825,6 +825,16 @@ void bfq_weights_tree_add(struct bfq_data *bfqd, struct bfq_queue *bfqq,
inc_counter:
bfqq->weight_counter->num_active++;
bfqq->ref++;
+
+#ifdef CONFIG_BFQ_GROUP_IOSCHED
+ if (!entity->in_groups_with_pending_reqs) {
+ struct bfq_group *bfqg =
+ container_of(entity->parent, struct bfq_group, entity);
+
+ entity->in_groups_with_pending_reqs = true;
+ bfqg->num_entities_with_pending_reqs++;
+ }
+#endif
}
/*
@@ -841,6 +851,17 @@ void __bfq_weights_tree_remove(struct bfq_data *bfqd,
return;
bfqq->weight_counter->num_active--;
+
+#ifdef CONFIG_BFQ_GROUP_IOSCHED
+ if (bfqq->entity.in_groups_with_pending_reqs) {
+ struct bfq_group *bfqg = container_of(bfqq->entity.parent,
+ struct bfq_group, entity);
+
+ bfqq->entity.in_groups_with_pending_reqs = false;
+ bfqg->num_entities_with_pending_reqs--;
+ }
+#endif
+
if (bfqq->weight_counter->num_active > 0)
goto reset_entity_pointer;
diff --git a/block/bfq-iosched.h b/block/bfq-iosched.h
index 515eb2604a37..df08bff89a70 100644
--- a/block/bfq-iosched.h
+++ b/block/bfq-iosched.h
@@ -937,6 +937,7 @@ struct bfq_group {
struct bfq_entity *my_entity;
int active_entities;
+ int num_entities_with_pending_reqs;
struct rb_root rq_pos_tree;
--
2.31.1
