lkml.org 
[lkml]   [2022]   [Sep]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3 3/5] block, bfq: don't disable wbt if CONFIG_BFQ_GROUP_IOSCHED is disabled
    Date
    wbt and bfq should work just fine if CONFIG_BFQ_GROUP_IOSCHED is disabled.

    Signed-off-by: Yu Kuai <yukuai3@huawei.com>
    ---
    block/bfq-iosched.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c
    index 7ea427817f7f..fec52968fe07 100644
    --- a/block/bfq-iosched.c
    +++ b/block/bfq-iosched.c
    @@ -7037,6 +7037,7 @@ static void bfq_exit_queue(struct elevator_queue *e)

    #ifdef CONFIG_BFQ_GROUP_IOSCHED
    blkcg_deactivate_policy(bfqd->queue, &blkcg_policy_bfq);
    + wbt_enable_default(bfqd->queue);
    #else
    spin_lock_irq(&bfqd->lock);
    bfq_put_async_queues(bfqd, bfqd->root_group);
    @@ -7045,7 +7046,6 @@ static void bfq_exit_queue(struct elevator_queue *e)
    #endif

    blk_stat_disable_accounting(bfqd->queue);
    - wbt_enable_default(bfqd->queue);

    kfree(bfqd);
    }
    @@ -7190,7 +7190,9 @@ static int bfq_init_queue(struct request_queue *q, struct elevator_type *e)
    /* We dispatch from request queue wide instead of hw queue */
    blk_queue_flag_set(QUEUE_FLAG_SQ_SCHED, q);

    +#ifdef CONFIG_BFQ_GROUP_IOSCHED
    wbt_disable_default(q);
    +#endif
    blk_stat_enable_accounting(q);

    return 0;
    --
    2.31.1
    \
     
     \ /
      Last update: 2022-09-22 13:25    [W:7.726 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site