Commit db37a34c authored by Paolo Valente's avatar Paolo Valente Committed by Jens Axboe

block, bfq: get a ref to a group when adding it to a service tree

BFQ schedules generic entities, which may represent either bfq_queues
or groups of bfq_queues. When an entity is inserted into a service
tree, a reference must be taken, to make sure that the entity does not
disappear while still referred in the tree. Unfortunately, such a
reference is mistakenly taken only if the entity represents a
bfq_queue. This commit takes a reference also in case the entity
represents a group.
Tested-by: default avatarOleksandr Natalenko <oleksandr@natalenko.name>
Tested-by: default avatarChris Evich <cevich@redhat.com>
Signed-off-by: default avatarPaolo Valente <paolo.valente@linaro.org>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 4d8340d0
...@@ -332,7 +332,7 @@ static void bfqg_put(struct bfq_group *bfqg) ...@@ -332,7 +332,7 @@ static void bfqg_put(struct bfq_group *bfqg)
kfree(bfqg); kfree(bfqg);
} }
static void bfqg_and_blkg_get(struct bfq_group *bfqg) void bfqg_and_blkg_get(struct bfq_group *bfqg)
{ {
/* see comments in bfq_bic_update_cgroup for why refcounting bfqg */ /* see comments in bfq_bic_update_cgroup for why refcounting bfqg */
bfqg_get(bfqg); bfqg_get(bfqg);
......
...@@ -985,6 +985,7 @@ struct bfq_group *bfq_find_set_group(struct bfq_data *bfqd, ...@@ -985,6 +985,7 @@ struct bfq_group *bfq_find_set_group(struct bfq_data *bfqd,
struct blkcg_gq *bfqg_to_blkg(struct bfq_group *bfqg); struct blkcg_gq *bfqg_to_blkg(struct bfq_group *bfqg);
struct bfq_group *bfqq_group(struct bfq_queue *bfqq); struct bfq_group *bfqq_group(struct bfq_queue *bfqq);
struct bfq_group *bfq_create_group_hierarchy(struct bfq_data *bfqd, int node); struct bfq_group *bfq_create_group_hierarchy(struct bfq_data *bfqd, int node);
void bfqg_and_blkg_get(struct bfq_group *bfqg);
void bfqg_and_blkg_put(struct bfq_group *bfqg); void bfqg_and_blkg_put(struct bfq_group *bfqg);
#ifdef CONFIG_BFQ_GROUP_IOSCHED #ifdef CONFIG_BFQ_GROUP_IOSCHED
......
...@@ -533,7 +533,9 @@ static void bfq_get_entity(struct bfq_entity *entity) ...@@ -533,7 +533,9 @@ static void bfq_get_entity(struct bfq_entity *entity)
bfqq->ref++; bfqq->ref++;
bfq_log_bfqq(bfqq->bfqd, bfqq, "get_entity: %p %d", bfq_log_bfqq(bfqq->bfqd, bfqq, "get_entity: %p %d",
bfqq, bfqq->ref); bfqq, bfqq->ref);
} } else
bfqg_and_blkg_get(container_of(entity, struct bfq_group,
entity));
} }
/** /**
...@@ -647,8 +649,14 @@ static void bfq_forget_entity(struct bfq_service_tree *st, ...@@ -647,8 +649,14 @@ static void bfq_forget_entity(struct bfq_service_tree *st,
entity->on_st_or_in_serv = false; entity->on_st_or_in_serv = false;
st->wsum -= entity->weight; st->wsum -= entity->weight;
if (bfqq && !is_in_service) if (is_in_service)
return;
if (bfqq)
bfq_put_queue(bfqq); bfq_put_queue(bfqq);
else
bfqg_and_blkg_put(container_of(entity, struct bfq_group,
entity));
} }
/** /**
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment