diff options
author | Paolo Valente <paolo.valente@linaro.org> | 2020-02-03 11:40:59 +0100 |
---|---|---|
committer | Jens Axboe <axboe@kernel.dk> | 2020-02-03 06:58:15 -0700 |
commit | db37a34c563bf4692b36990ae89005c031385e52 (patch) | |
tree | cf3b9bf508cb90dc60cfed10d4c27600c218e556 /block/bfq-wf2q.c | |
parent | 4d8340d0d4d90e7ca367d18ec16c2fefa89a339c (diff) | |
download | linux-db37a34c563bf4692b36990ae89005c031385e52.tar.gz linux-db37a34c563bf4692b36990ae89005c031385e52.tar.bz2 linux-db37a34c563bf4692b36990ae89005c031385e52.zip |
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: Oleksandr Natalenko <oleksandr@natalenko.name>
Tested-by: Chris Evich <cevich@redhat.com>
Signed-off-by: Paolo Valente <paolo.valente@linaro.org>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/bfq-wf2q.c')
-rw-r--r-- | block/bfq-wf2q.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/block/bfq-wf2q.c b/block/bfq-wf2q.c index 26776bdbdf36..eb0e2a6daabe 100644 --- a/block/bfq-wf2q.c +++ b/block/bfq-wf2q.c @@ -533,7 +533,9 @@ static void bfq_get_entity(struct bfq_entity *entity) bfqq->ref++; bfq_log_bfqq(bfqq->bfqd, bfqq, "get_entity: %p %d", 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, entity->on_st_or_in_serv = false; st->wsum -= entity->weight; - if (bfqq && !is_in_service) + if (is_in_service) + return; + + if (bfqq) bfq_put_queue(bfqq); + else + bfqg_and_blkg_put(container_of(entity, struct bfq_group, + entity)); } /** |