p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

block, bfq: turn put_queue into release_process_ref in __bfq_bic_change_cgroup 

A bfq_put_queue() may be invoked in __bfq_bic_change_cgroup(). The
goal of this put is to release a process reference to a bfq_queue. But
process-reference releases may trigger also some extra operation, and,
to this goal, are handled through bfq_release_process_ref(). So, turn
the invocation of bfq_put_queue() into an invocation of
bfq_release_process_ref().

Tested-by: cki-project@redhat.com
Signed-off-by: Paolo Valente <paolo.valente@linaro.org>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Paolo Valente 2020-03-21 10:45:19 +01:00 committed by Jens Axboe
parent fd1bb3ae54
commit c899773665
3 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
block/bfq-cgroup.c
View File

@ -714,10 +714,7 @@ static struct bfq_group *__bfq_bic_change_cgroup(struct bfq_data *bfqd,
if (entity->sched_data != &bfqg->sched_data) { if (entity->sched_data != &bfqg->sched_data) {
bic_set_bfqq(bic, NULL, 0); bic_set_bfqq(bic, NULL, 0);
bfq_log_bfqq(bfqd, async_bfqq, bfq_release_process_ref(bfqd, async_bfqq);
"bic_change_group: %p %d",
async_bfqq, async_bfqq->ref);
bfq_put_queue(async_bfqq);
} }
} }

2
block/bfq-iosched.c
View File

@ -2716,8 +2716,6 @@ static void bfq_bfqq_save_state(struct bfq_queue *bfqq)
} }
} }
static
void bfq_release_process_ref(struct bfq_data *bfqd, struct bfq_queue *bfqq) void bfq_release_process_ref(struct bfq_data *bfqd, struct bfq_queue *bfqq)
{ {
/* /*

1
block/bfq-iosched.h
View File

@ -955,6 +955,7 @@ void bfq_bfqq_expire(struct bfq_data *bfqd, struct bfq_queue *bfqq,
bool compensate, enum bfqq_expiration reason); bool compensate, enum bfqq_expiration reason);
void bfq_put_queue(struct bfq_queue *bfqq); void bfq_put_queue(struct bfq_queue *bfqq);
void bfq_end_wr_async_queues(struct bfq_data *bfqd, struct bfq_group *bfqg); void bfq_end_wr_async_queues(struct bfq_data *bfqd, struct bfq_group *bfqg);
void bfq_release_process_ref(struct bfq_data *bfqd, struct bfq_queue *bfqq);
void bfq_schedule_dispatch(struct bfq_data *bfqd); void bfq_schedule_dispatch(struct bfq_data *bfqd);
void bfq_put_async_queues(struct bfq_data *bfqd, struct bfq_group *bfqg); void bfq_put_async_queues(struct bfq_data *bfqd, struct bfq_group *bfqg);